cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into staging-next

Browse source
This commit is contained in:
Martin Weinelt 2022-07-26 13:48:04 +02:00
commit d5f29c9f6a
21 changed files with 82 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/editors/neovim/wrapper.nix
View file

@ -45,7 +45,7 @@ let
finalMakeWrapperArgs =
[ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ]
++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ]
++ optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ]
++ optionals wrapRc [ "--add-flags" "--clean" "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ]
;
in
assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env.";

10
pkgs/applications/file-managers/joshuto/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "joshuto";
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "kamiyaa";
repo = pname;
rev = version;
sha256 = "sha256-RbA7MM/3u2LJG6QD5f15E/XoLwHMkPasx0ht4PqV/jc=";
rev = "v${version}";
sha256 = "sha256-sSrXBPZe9R8s+MzWA7cRlaRCyf/4z2qb6DrUCgvKQh8=";
};
cargoSha256 = "sha256-vhTfAoAwDJ9BjhgUEkV2H+KAetJR1YqwaZ7suF6yMXA=";
cargoSha256 = "sha256-e4asmP/wTnX6/xrK6lAgCkRlGRFniveEiL5GRXVzcZg=";
buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration Foundation ];
@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec {
description = "Ranger-like terminal file manager written in Rust";
homepage = "https://github.com/kamiyaa/joshuto";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ figsoda ];
maintainers = with maintainers; [ figsoda totoroot ];
};
}

4
pkgs/applications/networking/flexget/default.nix
View file

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.3.21";
version = "3.3.22";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
hash = "sha256-0XpToyy5Q3d2IpEMaeyhTri4xCBrI3Kmy5lMTqnAqC0=";
hash = "sha256-VDMcOiuEOTzyogkdpVogikrme2Q6drpb40PqDgDtr7Q=";
};
postPatch = ''

23
pkgs/applications/networking/instant-messengers/feishu/default.nix
View file

@ -1,4 +1,5 @@
{ alsa-lib
{ addOpenGLRunpath
, alsa-lib
, at-spi2-atk
, at-spi2-core
, atk
@ -54,6 +55,9 @@
, wayland
, wrapGAppsHook
, xdg-utils
# for custom command line arguments, e.g. "--use-gl=desktop"
, commandLineArgs ? ""
}:
stdenv.mkDerivation rec {
@ -146,14 +150,19 @@ stdenv.mkDerivation rec {
mkdir -p $out
mv usr/share $out/
mv opt/ $out/
chmod -R g-w $out
substituteInPlace $out/share/applications/bytedance-feishu.desktop \
--replace /usr/bin/bytedance-feishu-stable $out/opt/bytedance/feishu/bytedance-feishu
wrapProgram $out/opt/bytedance/feishu/feishu \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix LD_LIBRARY_PATH : ${rpath}:$out/opt/bytedance/feishu
# Wrap feishu and vulcan
# Feishu is the main executable, vulcan is the builtin browser
for executable in $out/opt/bytedance/feishu/{feishu,vulcan/vulcan}; do
wrapProgram $executable \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix LD_LIBRARY_PATH : ${rpath}:$out/opt/bytedance/feishu:${addOpenGLRunpath.driverLink}/share \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \
${lib.optionalString (commandLineArgs!="") "--add-flags ${lib.escapeShellArg commandLineArgs}"}
done
mkdir -p $out/share/icons/hicolor
base="$out/opt/bytedance/feishu"
@ -161,6 +170,9 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps
ln -s $base/product_logo_$size.png $out/share/icons/hicolor/''${size}x''${size}/apps/bytedance-feishu.png
done
mkdir -p $out/bin
ln -s $out/opt/bytedance/feishu/bytedance-feishu $out/bin/bytedance-feishu
'';
meta = with lib; {
@ -169,5 +181,6 @@ stdenv.mkDerivation rec {
downloadPage = "https://www.feishu.cn/en/#en_home_download_block";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ billhuang ];
};
}

16
pkgs/applications/version-management/git-and-tools/gh/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "2.14.2";
version = "2.14.3";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-/0cX1GSzrmTFsRA1L5pCNHMO5cb5RFx4DsInBEn3emw=";
sha256 = "sha256-03XB88Z3v0a9Wi1xF+TaVsiRml6JAdEOeKuMxAbybw4=";
};
vendorSha256 = "sha256-yhUP6BaR2xloy3/g7pKhn5ljwTEm8XwPaOiZCIfIM7E=";
vendorSha256 = "sha256-HCOSc6GevbvNuC1zgzaCSfewF13SY1sBV+grsSF1+Fk=";
nativeBuildInputs = [ installShellFiles ];
@ -32,14 +32,14 @@ buildGoModule rec {
install -Dm755 bin/gh -t $out/bin
installManPage share/man/*/*.[1-9]
for shell in bash fish zsh; do
$out/bin/gh completion -s $shell > gh.$shell
installShellCompletion gh.$shell
done
installShellCompletion --cmd gh \
--bash <($out/bin/gh completion -s bash) \
--fish <($out/bin/gh completion -s fish) \
--zsh <($out/bin/gh completion -s zsh)
runHook postInstall
'';
# fails with `unable to find git executable in PATH`
# most tests require network access
doCheck = false;
meta = with lib; {

10
pkgs/development/python-modules/antlr4-python3-runtime/default.nix
View file

@ -1,11 +1,13 @@
{ lib, buildPythonPackage, isPy3k, python
, antlr4
}:
{ lib
, buildPythonPackage
, isPy3k
, python
, antlr4 }:
buildPythonPackage rec {
pname = "antlr4-python3-runtime";
inherit (antlr4.runtime.cpp) version src;
disabled = !isPy3k;
disabled = python.pythonOlder "3.6";
sourceRoot = "source/runtime/Python3";

4
pkgs/development/python-modules/fastcore/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "fastcore";
version = "1.5.6";
version = "1.5.9";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "fastai";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-j0jxyvx4KIqlrUJDqtUwKlahB8jq18FrgQhti15BaTA=";
sha256 = "sha256-8sRFTiGHhrVLOOa6sZMzUVOaMuzeDCCsaq6BSeQvkuo=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/hydra/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv
, lib
, antlr4-python3-runtime
, antlr4_9-python3-runtime
, buildPythonPackage
, fetchFromGitHub
, importlib-resources
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "facebookresearch";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-4r0ZWW9SGl35Oupf0ejwL/s6Nas6RoSN2egiBrvFZIA=";
hash = "sha256-4r0ZWW9SGl35Oupf0ejwL/s6Nas6RoSN2egiBrvFZIA=";
};
nativeBuildInputs = [
@ -29,7 +29,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
antlr4-python3-runtime
antlr4_9-python3-runtime
omegaconf
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources

6
pkgs/development/python-modules/omegaconf/default.nix
View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, pytest-mock, pytestCheckHook
, pyyaml, pythonOlder, jre_minimal, antlr4-python3-runtime }:
, pyyaml, pythonOlder, jre_minimal, antlr4_9-python3-runtime }:
buildPythonPackage rec {
pname = "omegaconf";
@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "omry";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-bUJ80sa2ot2JSkt29eFwSiKL6R1X1+VVeE9dFIy4Mg0=";
hash = "sha256-bUJ80sa2ot2JSkt29eFwSiKL6R1X1+VVeE9dFIy4Mg0=";
};
postPatch = ''
@ -20,7 +20,7 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook pytest-mock ];
nativeBuildInputs = [ jre_minimal ];
propagatedBuildInputs = [ antlr4-python3-runtime pyyaml ];
propagatedBuildInputs = [ antlr4_9-python3-runtime pyyaml ];
disabledTestPaths = [ "tests/test_pydev_resolver_plugin.py" ]; # needs pydevd - not in Nixpkgs

8
pkgs/development/python-modules/parts/default.nix
View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "parts";
version = "1.4.0";
format = "setuptools";
version = "1.5.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Qs6+3dWG5sjSmeQiL/Q2evn5TImEX0Yk/nCIe5uIMp4=";
hash = "sha256-H6nyn2TY1Ga65CyhxOSlgcDTTC1UJi8I/4damM6I7fM=";
};
# Project has no tests
@ -24,7 +24,7 @@ buildPythonPackage rec {
];
meta = with lib; {
description = "Python library for common list functions related to partitioning lists";
description = "Library for common list functions related to partitioning lists";
homepage = "https://github.com/lapets/parts";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];

4
pkgs/development/python-modules/pex/default.nix
View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pex";
version = "2.1.100";
version = "2.1.101";
format = "flit";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-CEYoP55w/Zq7RI1u8sbY9vjqDjT9jSIzDuoRIMmxlfY=";
hash = "sha256-2WbyrJ+/MsaUGnmPqANfdFRqBWForD7zX8pyEx5g4ak=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/pydeps/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pydeps";
version = "1.10.18";
version = "1.10.22";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "thebjorn";
repo = pname;
rev = "v${version}";
hash = "sha256-AKpaGXUaKCVk1C8GqtWayZEU2xbz3eqbUenjZCtsAUY=";
hash = "sha256-PA+TpPAuzyAQSlD08ZgmZAKgVEGoIUw/zq4QdTmU8HE=";
};
buildInputs = [

4
pkgs/development/python-modules/types-requests/default.nix
View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.28.3";
version = "2.28.4";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-+56mkxF2aWf56RhhIR7HRJ9khAJbdm6nCWicDbsp17o=";
sha256 = "sha256-G5vt1g54nbYrc6Sl5fWnjDEG5TWtafq6l7C72x6ja48=";
};
propagatedBuildInputs = [

5
pkgs/development/tools/pip-audit/default.nix
View file

@ -25,14 +25,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "pip-audit";
version = "2.4.1";
version = "2.4.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "trailofbits";
repo = pname;
rev = "v${version}";
hash = "sha256-Uko8ZtVMu9a/WrgSREFY3c8O+psE6cWpyHKVrOTJOJE=";
hash = "sha256-GH7dP2/0j2bXqw1qssyzMSV/YtYImbT7VSn/x97idiU=";
};
nativeBuildInputs = [
@ -46,6 +46,7 @@ buildPythonApplication rec {
lockfile
packaging
pip-api
pip-requirements-parser
progress
resolvelib
rich

6
pkgs/development/tools/rust/cargo-edit/default.nix
View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-edit";
version = "0.9.0";
version = "0.10.2";
src = fetchFromGitHub {
owner = "killercup";
repo = pname;
rev = "v${version}";
hash = "sha256-4N45IBDlIVbZbZgdX2DBmjolFHwzPjHVyWGadhR1FFw=";
hash = "sha256-r4QJkQAtbjivbvr/k7UpbGx+hkzauRxw4bke7lAcmEM=";
};
cargoSha256 = "sha256-o7NDw7P6Flut0ZFnDUdVCmuUzW2P+KXyfu0gApTEx60=";
cargoSha256 = "sha256-qNtWH8rvOUP7OjMVrzeDdoqAoTYOmqrjsuOJkD6NQ/I=";
nativeBuildInputs = [ pkg-config ];

4
pkgs/development/web/postman/darwin.nix
View file

@ -11,12 +11,12 @@ let
dist = {
aarch64-darwin = {
arch = "arm64";
sha256 = "sha256-EtTf17LS18zC3JMbSoyZGGHuIcwGN3Q15XOhVqeh7C4=";
sha256 = "ddeb3c14cebc26bae01b338a8480aea26025bb033d85d33070ad22a401e52fee";
};
x86_64-darwin = {
arch = "64";
sha256 = "sha256-kTgbqGPgOn5dyjL/IMl3hg2+VUfB+jpPJsqXof8UL+c=";
sha256 = "c5b249c9262efae5df9f4ccbc39b39e443a82876485174c2007c8dccc0b02f4b";
};
}.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");

4
pkgs/development/web/postman/default.nix
View file

@ -2,14 +2,14 @@
let
pname = "postman";
version = "9.14.0";
version = "9.22.2";
meta = with lib; {
homepage = "https://www.getpostman.com";
description = "API Development Environment";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.postman;
platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ];
maintainers = with maintainers; [ johnrichardrinehart evanjs tricktron ];
maintainers = with maintainers; [ johnrichardrinehart evanjs tricktron Crafter ];
};
in

2
pkgs/development/web/postman/linux.nix
View file

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dl.pstmn.io/download/version/${version}/linux64";
sha256 = "sha256-pA3gT4xoIWhajY03JzVgHK5KyTx1uH6gyasuLTdt6cM=";
sha256 = "cfb85d7ae366ee1487ce1b2dab1c19ffa25c214af5c083a09447ed488493b115";
name = "${pname}.tar.gz";
};

4
pkgs/tools/security/gau/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gau";
version = "2.1.1";
version = "2.1.2";
src = fetchFromGitHub {
owner = "lc";
repo = pname;
rev = "v${version}";
sha256 = "sha256-jIMBvRnY1Z/cLwBnWGp1fsx6oLri1qiknLj+r9B4GHc=";
sha256 = "sha256-z8JmMMob12wRTdpFoVbRHTDwet9AMXet49lHEDVVAnw=";
};
vendorSha256 = "sha256-HQATUCzYvhhlqe4HhNu9H4CqmY2IGLNJ9ydt3/igSmQ=";

10
pkgs/tools/security/hakrawler/default.nix
View file

@ -1,20 +1,20 @@
{ buildGoModule
{ lib
, buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "hakrawler";
version = "2.0";
version = "2.1";
src = fetchFromGitHub {
owner = "hakluke";
repo = "hakrawler";
rev = version;
sha256 = "sha256-g0hJGRPLgnWAeB25iIw/JRANrYowfRtAniDD/yAQWYk=";
hash = "sha256-ZJG5KlIlzaztG27NoSlILj0I94cm2xZq28qx1ebrSmc=";
};
vendorSha256 = "sha256-VmMNUNThRP1jEAjZeJC4q1IvnQEDqoOM+7a0AnABQnU=";
vendorSha256 = "sha256-NzgFwPvuEZ2/Ks5dZNRJjzzCNPRGelQP/A6eZltqkmM=";
meta = with lib; {
description = "Web crawler for the discovery of endpoints and assets";

8
pkgs/top-level/python-packages.nix
View file

@ -559,9 +559,13 @@ in {
ansiwrap = callPackage ../development/python-modules/ansiwrap { };
antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {
inherit (pkgs) antlr4;
antlr4_8-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {
antlr4 = pkgs.antlr4_8;
};
antlr4_9-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {
antlr4 = pkgs.antlr4_9;
};
antlr4-python3-runtime = self.antlr4_8-python3-runtime;
anyascii = callPackage ../development/python-modules/anyascii { };