From e1ed913a9ffa7c9cc28067885ad0f70af50b7b4c Mon Sep 17 00:00:00 2001 From: Bill Huang Date: Sat, 9 Jul 2022 16:41:20 -0700 Subject: [PATCH 01/21] feishu: fix the missing maintainer --- .../networking/instant-messengers/feishu/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index 4dfd048b1b8a..dd55b126f258 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -169,5 +169,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 ]; }; } From 4ec68389db085461debb5739600d009d22b4cf77 Mon Sep 17 00:00:00 2001 From: Bill Huang Date: Sat, 9 Jul 2022 16:42:03 -0700 Subject: [PATCH 02/21] feishu: misc updates also wrap vulcan handle edge case --- .../instant-messengers/feishu/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index dd55b126f258..9a6cf2d03580 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -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; { From a65d1a3b892b7e80df0f0e3deccc89d9d8a45fc5 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Sun, 24 Jul 2022 22:15:21 +0200 Subject: [PATCH 03/21] joshuto: add totoroot as maintainer --- pkgs/applications/file-managers/joshuto/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/file-managers/joshuto/default.nix b/pkgs/applications/file-managers/joshuto/default.nix index 024334aca506..ad4baecb7ef4 100644 --- a/pkgs/applications/file-managers/joshuto/default.nix +++ b/pkgs/applications/file-managers/joshuto/default.nix @@ -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 ]; }; } From 4583d688d70df9cd8e5eb966a573c3c97cb6e05c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Jul 2022 09:40:15 +0200 Subject: [PATCH 04/21] gau: 2.1.1 -> 2.1.2 --- pkgs/tools/security/gau/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix index 29a0aadd1561..48f9d7bbbf22 100644 --- a/pkgs/tools/security/gau/default.nix +++ b/pkgs/tools/security/gau/default.nix @@ -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="; From 15b2d330fd999640a68653cbd83a9a4005228f0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Jul 2022 00:11:10 +0000 Subject: [PATCH 05/21] python310Packages.types-requests: 2.28.3 -> 2.28.4 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index a42ce6a71d79..0c337486ed4c 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -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 = [ From 285575ffa7bcdb3ff897b8a52058191035f4ae94 Mon Sep 17 00:00:00 2001 From: Craftman7 Date: Mon, 25 Jul 2022 20:26:12 -0700 Subject: [PATCH 06/21] postman: add Crafter as maintainer --- pkgs/development/web/postman/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index a5d3676e439b..b33ea7e40990 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -9,7 +9,7 @@ let 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 From 02cdd56bc565848fdfda4fc29c4f48854a8658e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Jul 2022 03:43:34 +0000 Subject: [PATCH 07/21] python310Packages.pex: 2.1.100 -> 2.1.101 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 55a596e7ecb8..1324038242f7 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -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 = [ From 1ffbd4e7379a75890116404407a057071262a9f4 Mon Sep 17 00:00:00 2001 From: Craftman7 Date: Mon, 25 Jul 2022 20:50:39 -0700 Subject: [PATCH 08/21] postman: 9.14.0 -> 9.22.2 --- pkgs/development/web/postman/darwin.nix | 4 ++-- pkgs/development/web/postman/default.nix | 2 +- pkgs/development/web/postman/linux.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/postman/darwin.nix b/pkgs/development/web/postman/darwin.nix index fcc4b03689f4..01e989bc2061 100644 --- a/pkgs/development/web/postman/darwin.nix +++ b/pkgs/development/web/postman/darwin.nix @@ -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}"); diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index b33ea7e40990..e4524e75cb92 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -2,7 +2,7 @@ let pname = "postman"; - version = "9.14.0"; + version = "9.22.2"; meta = with lib; { homepage = "https://www.getpostman.com"; description = "API Development Environment"; diff --git a/pkgs/development/web/postman/linux.nix b/pkgs/development/web/postman/linux.nix index 39c82c2b34ed..daf1c7afdeb6 100644 --- a/pkgs/development/web/postman/linux.nix +++ b/pkgs/development/web/postman/linux.nix @@ -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"; }; From 15551162c53100184937169cd2bb6685af3e5cec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Jul 2022 03:58:19 +0000 Subject: [PATCH 09/21] flexget: 3.3.21 -> 3.3.22 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 3f27dd59b7bb..cc62a7f7070e 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -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 = '' From 5fb6003f504523c298a7d74cbd80b6acc93bbdd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Jul 2022 05:24:04 +0000 Subject: [PATCH 10/21] python310Packages.fastcore: 1.5.6 -> 1.5.9 --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index f3377a5cd7be..99f2e12ae9ad 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -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 = [ From 8bf1e7edb32097550e43df469aabcc3e9849fed4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Jul 2022 09:07:25 +0200 Subject: [PATCH 11/21] hakrawler: 2.0 -> 2.1 --- pkgs/tools/security/hakrawler/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/hakrawler/default.nix b/pkgs/tools/security/hakrawler/default.nix index 0e2174e50ae5..a2b62f9b270a 100644 --- a/pkgs/tools/security/hakrawler/default.nix +++ b/pkgs/tools/security/hakrawler/default.nix @@ -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"; From ae06ec9b28047534ae7a7755b18709d9d376f688 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Jul 2022 09:23:58 +0200 Subject: [PATCH 12/21] python310Packages.parts: 1.4.0 -> 1.5.1 --- pkgs/development/python-modules/parts/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/parts/default.nix b/pkgs/development/python-modules/parts/default.nix index 0b2d246056f0..b1c520ded322 100644 --- a/pkgs/development/python-modules/parts/default.nix +++ b/pkgs/development/python-modules/parts/default.nix @@ -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 ]; From 5c7881bf827ce9f81f4ea20c8908c2eee8af5593 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Jul 2022 18:20:23 +0200 Subject: [PATCH 13/21] python310Packages.pydeps: 1.10.18 -> 1.10.22 --- pkgs/development/python-modules/pydeps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index cc2b726a64a9..3325155b947d 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -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 = [ From 9f9fc392ca1643f18a66485680dc535c32868b4c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Jul 2022 18:22:50 +0200 Subject: [PATCH 14/21] pip-audit: 2.4.1 -> 2.4.2 --- pkgs/development/tools/pip-audit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index 9b8ebf07197c..59caaf882d4c 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -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 From 1da61bc1a4b44b5483686396398f2db35a982115 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Sun, 24 Jul 2022 22:11:27 +0200 Subject: [PATCH 15/21] joshuto: 0.9.3 -> 0.9.4 --- pkgs/applications/file-managers/joshuto/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/file-managers/joshuto/default.nix b/pkgs/applications/file-managers/joshuto/default.nix index ad4baecb7ef4..bcc521556b38 100644 --- a/pkgs/applications/file-managers/joshuto/default.nix +++ b/pkgs/applications/file-managers/joshuto/default.nix @@ -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 ]; From ce49cb7792a7ffd65ef352dda1110a4e4a204eac Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 26 Jul 2022 09:50:50 +0100 Subject: [PATCH 16/21] neovim: pass the --clean flag to only use wrapped rc --- pkgs/applications/editors/neovim/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 2a0d60ce5a79..4fa666bc787e 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -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."; From d7ee40d4ecdf9f0c753bde74435a1a19f8b2ea60 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 26 Jul 2022 18:33:43 +0800 Subject: [PATCH 17/21] cargo-edit: 0.9.0 -> 0.10.2 --- pkgs/development/tools/rust/cargo-edit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 53f7d581b346..ab180c670ffa 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -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 ]; From 5f323b1b187db8545ce94aaae18a13f6024bdd1f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 26 Jul 2022 21:03:34 +1000 Subject: [PATCH 18/21] gh: 2.14.2 -> 2.14.3 https://github.com/cli/cli/releases/tag/v2.14.3 --- .../git-and-tools/gh/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index e8bde3283250..e7e756a243c7 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -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; { From ee31754de3a7473d54efe78e2b461072aa237f78 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 13 Jul 2022 09:56:05 +0200 Subject: [PATCH 19/21] python310Packages.hydra: 1.1.1 -> 1.2.0 --- pkgs/development/python-modules/hydra/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/hydra/default.nix b/pkgs/development/python-modules/hydra/default.nix index 362b0c51d0cc..d6abf0a1ea2a 100644 --- a/pkgs/development/python-modules/hydra/default.nix +++ b/pkgs/development/python-modules/hydra/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, antlr4-python3-runtime +, antlr4_9-python3-runtime , buildPythonPackage , fetchFromGitHub , importlib-resources @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "hydra"; - version = "1.1.1"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "facebookresearch"; repo = pname; rev = "v${version}"; - sha256 = "sha256:1svzysrjg47gb6lxx66fzd8wbhpbbsppprpbqssf5aqvhxgay3qk"; + sha256 = "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 From 4d4f2ba156e1086186439fbb7c7b4531c03c23d0 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 13 Jul 2022 10:05:24 +0200 Subject: [PATCH 20/21] python310Packages.antlr4_9-python3-runtime: init at 4.9 --- .../python-modules/antlr4-python3-runtime/default.nix | 10 ++++++---- pkgs/top-level/python-packages.nix | 8 ++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix index d0e8d4fab439..1ab91cacbcc3 100644 --- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix +++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix @@ -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"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10ee4cadea0b..468f80eaba13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { }; From b48aef72e3aea93a6ade39475579b2fd285a64f6 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 13 Jul 2022 10:08:40 +0200 Subject: [PATCH 21/21] python310Packages.omegaconf: 2.1.1 -> 2.2.2 --- pkgs/development/python-modules/omegaconf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index 14fc824f5cd8..b4c7cfc2ac7f 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -1,9 +1,9 @@ { 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"; - version = "2.1.1"; + version = "2.2.2"; disabled = pythonOlder "3.6"; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "omry"; repo = pname; rev = "v${version}"; - sha256 = "0hh6pk4q6nb94bz9rwa6cysf3nj50rmqkjh34pqkh28nzg44afjw"; + sha256 = "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