From a878acdf0ec9a6af606525b11af79a76a5a7ed74 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 27 Mar 2024 23:56:35 +0100 Subject: [PATCH 01/46] python311Packages.torch: 2.2.1 -> 2.2.2 Changelog: https://github.com/pytorch/pytorch/releases/tag/v2.2.2 --- pkgs/development/python-modules/torch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 620b8a3581e4..3bd019375046 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -130,7 +130,7 @@ let in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "2.2.1"; + version = "2.2.2"; pyproject = true; disabled = pythonOlder "3.8.0"; @@ -148,7 +148,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-6z8G5nMbGHbpA+xfmOR726h9E4N9NoEtaFgcYE0DuUE="; + hash = "sha256-la9wL9pOlgrSfq5V8aRKXt3hjW+Er/6484m0oUujlzk="; }; patches = lib.optionals cudaSupport [ From 46ad2b23f58e6e3429862c8dc857c9a06c230a0c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 27 Mar 2024 23:56:43 +0100 Subject: [PATCH 02/46] python311Packages.torch-bin: 2.2.1 -> 2.2.2 Changelog: https://github.com/pytorch/pytorch/releases/tag/v2.2.2 --- pkgs/development/python-modules/torch/bin.nix | 2 +- .../python-modules/torch/binary-hashes.nix | 98 +++++++++---------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index bc0e36ba553c..d92767b87d4b 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -25,7 +25,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.2.1"; + version = "2.2.2"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index 0fd4a5b36e4d..8cd3bccc121c 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -6,86 +6,86 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "2.2.1" = { + "2.2.2" = { x86_64-linux-38 = { - name = "torch-2.2.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-OIDrgRsT+PGl/DKC5FVnS5qfpnOrJW8GOOK09JUlFsM="; + name = "torch-2.2.2-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.2%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-wXi+srsB93NgF3e8SBx2Ub5bHxic8YDwwKzqwHiaqaU="; }; x86_64-linux-39 = { - name = "torch-2.2.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-HLN5h0E455jAK0GWLdnU7AsGOoykWlEJfzJmFUd8m9A="; + name = "torch-2.2.2-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.2%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-EU6TlYZ+6GAWZWLYzB8oCSJfnil4PdXnIXXZqaeoUFw="; }; x86_64-linux-310 = { - name = "torch-2.2.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-Gt9DDwH/ZJyEisAheF4YAHsHFP3eaOTmW9DGQL8/uOE="; + name = "torch-2.2.2-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.2%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-yt5P1sjOfYJtvPq9ZfHVOw7goFjbjBgJ1lv9YFG1VTA="; }; x86_64-linux-311 = { - name = "torch-2.2.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-I7souoAPJanTPVF2i/X976AiDLxc2aF/ItKkJig1lGg="; + name = "torch-2.2.2-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.2%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-TJTk0aItcKu9/3Ft7Jm6Xv+UtDQP+nO0+2KflA27inU="; }; x86_64-darwin-38 = { - name = "torch-2.2.1-cp38-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp38-none-macosx_10_9_x86_64.whl"; - hash = "sha256-YXaFhegqmdxcQZM759ucoGf6451F/r1RA8yKBNUkSRg="; + name = "torch-2.2.2-cp38-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp38-none-macosx_10_9_x86_64.whl"; + hash = "sha256-gVF29iyPN8z7shCBwHaaiLG6pptxaRGapCtl7l8QTi0="; }; x86_64-darwin-39 = { - name = "torch-2.2.1-cp39-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp39-none-macosx_10_9_x86_64.whl"; - hash = "sha256-o6OqT5rSqLjnLBqElA2MWd1O7SkbyytgOta1hJgwYvU="; + name = "torch-2.2.2-cp39-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp39-none-macosx_10_9_x86_64.whl"; + hash = "sha256-8TdigY3CgP7KfjD2CZWhe6jR0asz/vttB/0sj/FXHqo="; }; x86_64-darwin-310 = { - name = "torch-2.2.1-cp310-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp310-none-macosx_10_9_x86_64.whl"; - hash = "sha256-531ee2Cn4cI0XGSC/4dvNqDwQ+a+Mu9Y2sQWxKoOOyg="; + name = "torch-2.2.2-cp310-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp310-none-macosx_10_9_x86_64.whl"; + hash = "sha256-5nfE102wz8KxCSPeG95XXZgculRQXdwIKwUI2WQRmFA="; }; x86_64-darwin-311 = { - name = "torch-2.2.1-cp311-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp311-none-macosx_10_9_x86_64.whl"; - hash = "sha256-lkeM9Oc3ADBZee0cp2tTVTbUYvMDAqNe3Rzu4MPYB9M="; + name = "torch-2.2.2-cp311-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp311-none-macosx_10_9_x86_64.whl"; + hash = "sha256-QwDLu00EKMUbXBlBkBaQGNW4GP2fb6/Ci76P2E3tF0A="; }; aarch64-darwin-38 = { - name = "torch-2.2.1-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-fX1aq00JspIgKXkbacgDq6HAWcYP9lYj8ddFgMFHvUw="; + name = "torch-2.2.2-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-7RTSpDZEIEkDg9JveQCj99XFDDLlzf3d3/+Dd22eD9Q="; }; aarch64-darwin-39 = { - name = "torch-2.2.1-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-uQZpsWKYTjAvvQXJwnDveW5GeQOUTs76dFe6vpYRYH4="; + name = "torch-2.2.2-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-/q2//ddjTP40Xqh9fuQDGzAPnHZFIFkOA0idZYtpMds="; }; aarch64-darwin-310 = { - name = "torch-2.2.1-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-Ur3sHiLQg4L9mNttK/F6KU0P1TJgz9ZPuHRDSSy6xrQ="; + name = "torch-2.2.2-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-tSDRTS8oEK1dp1i+oQyveXjvNkNWW8APkN6JLgDXeSU="; }; aarch64-darwin-311 = { - name = "torch-2.2.1-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-zNmEmw3TcKmBPd3kenf0OciqzOAi5LoL+TZRc9WAgJY="; + name = "torch-2.2.2-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-gipYlnXLqKzwRX1qTltspEGtO0w6RKHLyPizGueWRF4="; }; aarch64-linux-38 = { - name = "torch-2.2.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-y4ThL9QAXHh/zkDto96sBCmPWQY0iRBixM2yzywUIiE="; + name = "torch-2.2.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-mJTc3W71tbYDzYzqPjcR+eJ3CC/3sPFLFSb90ay4JSE="; }; aarch64-linux-39 = { - name = "torch-2.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-7g90adoiGNyHlIV1DaF6JF3DaRbi+cX8CDbkz1cq0H0="; + name = "torch-2.2.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-1dhev9E/fNA+UGMlP4R57RpXBSZBZtXdH8abS5YjGyA="; }; aarch64-linux-310 = { - name = "torch-2.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-8BgwAuGJeNWYw+6JGcLmSCAsf+u5CIFRVshmxSTEo1k="; + name = "torch-2.2.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-OiwHUhgIHvnHv4xVxwbyNtrrt1PaQd5JispxYyVzgL0="; }; aarch64-linux-311 = { - name = "torch-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-fyaXQWtneZbuHzCyZ2qKlN3b44ijXDYdyG6RW9pHt9o="; + name = "torch-2.2.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-WUgt9dxA2uEF5z9I3Sk/TMxndkCCLCzjQnOjh1SZA64="; }; }; } From fe826e91f85522d28b23c809dac8d1323980ddde Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 27 Mar 2024 23:57:07 +0100 Subject: [PATCH 03/46] python311Packages.torchaudio: 2.2.1 -> 2.2.2 Diff: https://github.com/pytorch/audio/compare/refs/tags/v2.2.1...v2.2.2 Changelog: https://github.com/pytorch/audio/releases/tag/v2.2.2 --- pkgs/development/python-modules/torchaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index 73aec87cca61..3ca33cc36b65 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.2.1"; + version = "2.2.2"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "audio"; rev = "refs/tags/v${version}"; - hash = "sha256-ejgxWVIkusGi7zwg3nyAHHdjEPrFaS1TN7nN+PpSgOE="; + hash = "sha256-rW4xLUFTpGpUeMnTBdrI/2OjgZX1ihK0EfcVK6snmpk="; }; patches = [ From 940adc0c5544b10a15c7d924427ebeac0fd58162 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 27 Mar 2024 23:59:49 +0100 Subject: [PATCH 04/46] python311Packages.torchaudio-bin: 2.2.1 -> 2.2.2 Diff: https://github.com/pytorch/audio/compare/refs/tags/v2.2.1...v2.2.2 Changelog: https://github.com/pytorch/audio/releases/tag/v2.2.2 --- .../python-modules/torchaudio/bin.nix | 2 +- .../torchaudio/binary-hashes.nix | 98 +++++++++---------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 863fdc920a48..dc69195b693a 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.2.1"; + version = "2.2.2"; format = "wheel"; src = diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index eda82094c511..a15dffc4856a 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -6,86 +6,86 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "2.2.1" = { + "2.2.2" = { x86_64-linux-38 = { - name = "torchaudio-2.2.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-XU/trqM3W8hQ+9kI6G1b+GAbp9eCPFId6+jY3lwiZYg="; + name = "torchaudio-2.2.2-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.2%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-KPwkn2+sVuS9GbZdk7f6lSJ956D1WLY2YS7k3qE3tog="; }; x86_64-linux-39 = { - name = "torchaudio-2.2.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-LQScsJsPn+EE0goKRwIW/Fzo+SW9SYVuZYDi2Vn1syg="; + name = "torchaudio-2.2.2-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.2%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-YzzBeuAiMH0HPyZhvK/z9Q2bPW99MukXMFRCAybiDRs="; }; x86_64-linux-310 = { - name = "torchaudio-2.2.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-I/YjZCniv2drgg6OciGh1YqvkIv/K6JmWqhS33GpeWE="; + name = "torchaudio-2.2.2-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.2%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-/eGFVNhP0AR1iPC87QPXcPZVPxeFGjtEE3kWShPJmwc="; }; x86_64-linux-311 = { - name = "torchaudio-2.2.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-YJACsObf9ED81qY9FcA8PTdOIU56iqYcLvSlKLpkTDk="; + name = "torchaudio-2.2.2-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.2%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-DgdNBcIlizAU3aAu7wB60Xq0TP0B2XgMmpFOXZcqwAs="; }; x86_64-darwin-38 = { - name = "torchaudio-2.2.1-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp38-cp38-macosx_10_13_x86_64.whl"; - hash = "sha256-ge+I12k+O5kAfR7nQv2Buakjmey/iOt+1plJRDAF/7o="; + name = "torchaudio-2.2.2-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp38-cp38-macosx_10_13_x86_64.whl"; + hash = "sha256-jOTfBlqUmRHStngqpME2h++t6iP/x8em8V9+euXIlSQ="; }; x86_64-darwin-39 = { - name = "torchaudio-2.2.1-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp39-cp39-macosx_10_13_x86_64.whl"; - hash = "sha256-Azn+eO2cKfcEKWdhsouwVbU1BiX/UDrXgXBDl5NOa1g="; + name = "torchaudio-2.2.2-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp39-cp39-macosx_10_13_x86_64.whl"; + hash = "sha256-23CxOocaSUh72QQr8EsS90rtd7GofS++to0J2bZLxSg="; }; x86_64-darwin-310 = { - name = "torchaudio-2.2.1-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp310-cp310-macosx_10_13_x86_64.whl"; - hash = "sha256-WA7v12SgGmTVtqomDAxHl0vmppZIktVAKac7F/RhH80="; + name = "torchaudio-2.2.2-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp310-cp310-macosx_10_13_x86_64.whl"; + hash = "sha256-sdWCAdEI6F2z41uEMZ8ziE9h8yfDjq2GkTIYyMGsw90="; }; x86_64-darwin-311 = { - name = "torchaudio-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp311-cp311-macosx_10_13_x86_64.whl"; - hash = "sha256-J0y4R0vB5Wt2jvNH0xiGYcWp1eaOLfVvwK/xHMc8kWo="; + name = "torchaudio-2.2.2-cp311-cp311-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp311-cp311-macosx_10_13_x86_64.whl"; + hash = "sha256-8agaUYo+hsAEEl64kfxDPOj7I0MpW11hLQ83sk4THv0="; }; aarch64-darwin-38 = { - name = "torchaudio-2.2.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-9Ien0xd65q8BZ1CFDuk3iOiAIYoaMQvGx2kB4hL5HNM="; + name = "torchaudio-2.2.2-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-s7ir4msGfpxKbj26FWuR16hSR+iN2nC3xDhZ9VuXjdw="; }; aarch64-darwin-39 = { - name = "torchaudio-2.2.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-aLHZ+P/psm7wToDYKuLcL3Sxoetkw+itIbUlgCs7x6w="; + name = "torchaudio-2.2.2-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-S3ioShib89pLlmN1zr3sxYSk3F9g4L3nIdc0Ae1crUU="; }; aarch64-darwin-310 = { - name = "torchaudio-2.2.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-itVcIGmye74Y4UeDogLj8/gIL+nlkoFDa6eX7bD8lNU="; + name = "torchaudio-2.2.2-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-pSDhTqC6idncJ5IutGCfnqxcAcJ5gw4PIWucngF9Q4s="; }; aarch64-darwin-311 = { - name = "torchaudio-2.2.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-HmLCexdnLMK92WY2geUzAA+cCYTmoPPUVfcFG8AFuwI="; + name = "torchaudio-2.2.2-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-AUgvyFEX+F7kT4qo6cEbHAIjJhc+B0h4ntQrIZECk38="; }; aarch64-linux-38 = { - name = "torchaudio-2.2.1-cp38-cp38-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-pEYrPyFPYLa4944SpM8Skcm8NT3u1wmsPf3tvtUTp6M="; + name = "torchaudio-2.2.2-cp38-cp38-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp38-cp38-linux_aarch64.whl"; + hash = "sha256-T3VqbmZ92IQb8hoH6tPv7ap6J9VYUnecJm9vKhBkyZQ="; }; aarch64-linux-39 = { - name = "torchaudio-2.2.1-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-yy2girt7aNx7AQV0ixpzbdMzKfhBN0AT7ALFTgS+3yk="; + name = "torchaudio-2.2.2-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-cj9OV7XQwSA1fKYM1VtObPrIRbwOzMtLQXpEqk68Ums="; }; aarch64-linux-310 = { - name = "torchaudio-2.2.1-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-uRa3dkaYupMZqjslUZE5iS3oZl2EQ4lpusXh2FeMahE="; + name = "torchaudio-2.2.2-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-sPOOfTVIkU14qvwn/wD3cBsaUL/N3FiWX1RfySzNSmY="; }; aarch64-linux-311 = { - name = "torchaudio-2.2.1-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-ILKWXbT4QwIWNvU9P6sQdcP4lZxFDGR2KRJNJMfmy7A="; + name = "torchaudio-2.2.2-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-CgOki21V0X1I9Bmn8dDUAY1IoEx2WFwWqbXmkoH5L5Q="; }; }; } From 56a86116cb6b1ed3565d41f38cb0bc40e801d8da Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 28 Mar 2024 00:00:02 +0100 Subject: [PATCH 05/46] python311Packages.torchvision: 0.17.1 -> 0.17.2 Diff: https://github.com/pytorch/vision/compare/refs/tags/v0.17.1...v0.17.2 --- pkgs/development/python-modules/torchvision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index a8e90f7211c4..496a8c08710b 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -17,7 +17,7 @@ let inherit (cudaPackages) backendStdenv; pname = "torchvision"; - version = "0.17.1"; + version = "0.17.2"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-K2irwwf6qgyfZqJH1NUasDmBSA4mH2Rclx7A7zP4kiQ="; + hash = "sha256-Y7TkdbdrdiXQO2pBkUePCLw1EYQjsAqkV2OTMzxbU78="; }; nativeBuildInputs = [ From 91b6d8b4b3375d7315976d5c9dc1650d4d98c29b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 28 Mar 2024 00:02:35 +0100 Subject: [PATCH 06/46] python311Packages.torchvision-bin: 0.17.1 -> 0.17.2 Diff: https://github.com/pytorch/vision/compare/refs/tags/v0.17.1...v0.17.2 --- .../python-modules/torchvision/bin.nix | 2 +- .../torchvision/binary-hashes.nix | 74 +++++++++---------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index e1bc7295cb2d..70026bb363df 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -16,7 +16,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.17.1"; + version = "0.17.2"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index d7cb16d01b61..3a5654b18ca7 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,66 +6,66 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.17.1" = { + "0.17.2" = { x86_64-linux-38 = { - name = "torchvision-0.17.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-oCRjQQZPPBdtqKpuMvATD2ACOAyQruqOMccY3ixUZOE="; + name = "torchvision-0.17.2-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.2%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-3450y7tN4KYPEc18KNggEWAnzTlJiT+XxVtvEjJr168="; }; x86_64-linux-39 = { - name = "torchvision-0.17.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-WsK2vDCcNDud6KklczHPcVtm+qm1kiep8HDZ4BJS5go="; + name = "torchvision-0.17.2-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.2%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-839ZLjEovz2ZloraWhKPEY+a7R2rYJ4nKscjEUb8aEM="; }; x86_64-linux-310 = { - name = "torchvision-0.17.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-J69HkV9udiwdROWOgIjSKsl0RWaPn3k1JAMrK69PNL0="; + name = "torchvision-0.17.2-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.2%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-wPMlY1+INPpV5pq2EHX7K7y7RTlamFu6HbN4sVYnEEs="; }; x86_64-linux-311 = { - name = "torchvision-0.17.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-bYKfOZSQQCWyiXHMxhvWbt2VKATyEipuEENQuOkXL08="; + name = "torchvision-0.17.2-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.2%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-BZ+GocjSsnayZshKj1qSzIQm1DwqLCSNxzwUCrOoIvM="; }; x86_64-darwin-38 = { - name = "torchvision-0.17.1-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp38-cp38-macosx_10_13_x86_64.whl"; - hash = "sha256-JiEJcGX6HIJ4heK1IQLoOaNUG5M7epDg+jxCw94bw88="; + name = "torchvision-0.17.2-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp38-cp38-macosx_10_13_x86_64.whl"; + hash = "sha256-uDqsjXj0iYEUbVghaNdbbJR8+wp2k/duIZ8ZJvbllaM="; }; x86_64-darwin-39 = { - name = "torchvision-0.17.1-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp39-cp39-macosx_10_13_x86_64.whl"; - hash = "sha256-WCmacks3uJPHzk0LMuoUgMMORnzBFBZ5ZLRfYBP2wtM="; + name = "torchvision-0.17.2-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp39-cp39-macosx_10_13_x86_64.whl"; + hash = "sha256-SGi7+lV1jIEH5poOfdXne4kFYDXNOLdnrVuYzbccDw0="; }; x86_64-darwin-310 = { - name = "torchvision-0.17.1-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp310-cp310-macosx_10_13_x86_64.whl"; - hash = "sha256-BkGIgCErZuRehV3Tn1Nuf9SLTmsDShHdn+niOEr7Uew="; + name = "torchvision-0.17.2-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp310-cp310-macosx_10_13_x86_64.whl"; + hash = "sha256-HykQ/jwhrWh1snINRvrYNbLkszbpVT0xyjZNJMkLHU8="; }; x86_64-darwin-311 = { - name = "torchvision-0.17.1-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp311-cp311-macosx_10_13_x86_64.whl"; - hash = "sha256-6izNv1l04L8n/WZEozsZywcAKXzzl7sEaediwRxsQQU="; + name = "torchvision-0.17.2-cp311-cp311-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp311-cp311-macosx_10_13_x86_64.whl"; + hash = "sha256-m4PlXufQoXBPUrnArIc4jnptHZimveews1+atU172lQ="; }; aarch64-darwin-38 = { - name = "torchvision-0.17.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-XOdkZq8rWjBXOTnK4ebmLikxbOs+50gJEALzEqsJEvY="; + name = "torchvision-0.17.2-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-Hs5AVX4SLXmXWGCgBap+Kp4ubDUKA+eKAOwUUAgzEv0="; }; aarch64-darwin-39 = { - name = "torchvision-0.17.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-ihsX+xWLK4gfLIeW/hg5piTknV/QeqYfba5gukgZQho="; + name = "torchvision-0.17.2-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-79bQ3QZo4V0Bos/63HQGhDOzLLz1aS4MSqFfxcslDOc="; }; aarch64-darwin-310 = { - name = "torchvision-0.17.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-M9ZdDH/cs/e8HdjtMOo81+BYe0rRsQS1Z3yBkai62fE="; + name = "torchvision-0.17.2-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-7MHFA/qKVPurd34Gp8IoAyuKt47+vzWyi8jyL1RPUfE="; }; aarch64-darwin-311 = { - name = "torchvision-0.17.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-kQbjLJ8ecK+oFyzxsGTPnCmY2N/wdp7GnVN7ICCe5D0="; + name = "torchvision-0.17.2-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-4DEAShvEMsmAp71kL2wYmj78MW5CP8MLVWmDcWak4o0="; }; }; } From 110961b41048c56a318e9b107e4545be980d9e4d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 5 Apr 2024 04:20:00 +0000 Subject: [PATCH 07/46] piv-agent: init at 0.21.0 --- pkgs/by-name/pi/piv-agent/package.nix | 41 +++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/pi/piv-agent/package.nix diff --git a/pkgs/by-name/pi/piv-agent/package.nix b/pkgs/by-name/pi/piv-agent/package.nix new file mode 100644 index 000000000000..283edba53678 --- /dev/null +++ b/pkgs/by-name/pi/piv-agent/package.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, buildGoModule +, darwin +, fetchFromGitHub +, pcsclite +, pkg-config +}: + +buildGoModule rec { + pname = "piv-agent"; + version = "0.21.0"; + + src = fetchFromGitHub { + owner = "smlx"; + repo = "piv-agent"; + rev = "v${version}"; + hash = "sha256-aukcnubhB8kbAl22eeFKzLPvVcYdgcEQ1gy3n6KWG00="; + }; + + vendorHash = "sha256-1d6EKEvo4XNDXRtbdnKkqyF9y0LPPHWKu9X/wYnbmas="; + + subPackages = [ "cmd/piv-agent" ]; + + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.shortCommit=${src.rev}" ]; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + + buildInputs = + if stdenv.isDarwin + then [ darwin.apple_sdk.frameworks.PCSC ] + else [ pcsclite ]; + + meta = with lib; { + description = "An SSH and GPG agent which you can use with your PIV hardware security device (e.g. a Yubikey)"; + homepage = "https://github.com/smlx/piv-agent"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + mainProgram = "piv-agent"; + }; +} From 73142ffe160957ebc3c942cede0359de69eea4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= Date: Sun, 31 Mar 2024 22:44:16 +0200 Subject: [PATCH 08/46] rPackages.diffHic: add deps --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 994b6349a616..2f77d969e85b 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -605,6 +605,7 @@ let s2 = [ pkgs.openssl.dev ]; ArrayExpressHTS = with pkgs; [ zlib.dev curl.dev which ]; bbl = with pkgs; [ gsl ]; + diffHic = with pkgs; [ xz.dev bzip2.dev ]; writexl = with pkgs; [ zlib.dev ]; xslt = with pkgs; [ libxslt libxml2 ]; qpdf = with pkgs; [ libjpeg.dev zlib.dev ]; From 00161565e25b0c0982eacffdedc6cded6217ee8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= Date: Sun, 7 Apr 2024 00:22:12 +0200 Subject: [PATCH 09/46] rPackages.deepSNV: fix build --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 994b6349a616..89a220e8c91b 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -546,6 +546,7 @@ let bayesWatch = [ pkgs.boost.dev ]; clustermq = [ pkgs.pkg-config ]; coga = [ pkgs.gsl.dev ]; + deepSNV = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; gpg = [ pkgs.gpgme ]; webp = [ pkgs.libwebp ]; RMark = [ pkgs.which ]; From de2b0339b3fa26d11565a6f96a7cc5a367d8734b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= Date: Sun, 7 Apr 2024 00:43:12 +0200 Subject: [PATCH 10/46] rPackages.Rfastp: fix build --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 994b6349a616..7fadf4d112c7 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -625,6 +625,7 @@ let PopGenome = [ pkgs.zlib.dev ]; QuasR = with pkgs; [ zlib.dev xz.dev bzip2.dev ]; Rbowtie2 = [ pkgs.zlib.dev ]; + Rfastp = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; maftools = with pkgs; [ zlib.dev bzip2 xz.dev ]; Rmmquant = [ pkgs.zlib.dev ]; SICtools = with pkgs; [ zlib.dev ncurses.dev ]; From 611a6545449fdaa7eaf5e90ba9604fac03d7c4ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= Date: Sun, 7 Apr 2024 00:58:30 +0200 Subject: [PATCH 11/46] rPackages.scPipe: fix build --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 994b6349a616..bad9a4ccd9ea 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -647,7 +647,7 @@ let rhdf5filters = with pkgs; [ zlib.dev bzip2.dev ]; symengine = with pkgs; [ mpfr symengine flint ]; rtk = [ pkgs.zlib.dev ]; - scPipe = [ pkgs.zlib.dev ]; + scPipe = with pkgs; [ bzip2.dev xz.dev zlib.dev ]; seqTools = [ pkgs.zlib.dev ]; seqbias = [ pkgs.zlib.dev ]; sparkwarc = [ pkgs.zlib.dev ]; From 9186b1a49589f43826f4aac2c0d06239e44bf633 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Apr 2024 01:42:22 +0000 Subject: [PATCH 12/46] phinger-cursors: 1.1 -> 2.0 --- pkgs/data/icons/phinger-cursors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/phinger-cursors/default.nix b/pkgs/data/icons/phinger-cursors/default.nix index 82742723806f..26b729b268c9 100644 --- a/pkgs/data/icons/phinger-cursors/default.nix +++ b/pkgs/data/icons/phinger-cursors/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "phinger-cursors"; - version = "1.1"; + version = "2.0"; src = fetchurl { url = "https://github.com/phisch/phinger-cursors/releases/download/v${version}/phinger-cursors-variants.tar.bz2"; - sha256 = "sha256-II+1x+rcjGRRVB8GYkVwkKVHNHcNaBKRb6C613901oc="; + sha256 = "sha256-A12BGtc0+wDqeSGN4lbUe5G3Pv4IsQB4TkvWHnDU6bE="; }; sourceRoot = "."; From 9bc7c1d25429b95412aa5e73bc8059bf0127f36d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Apr 2024 15:11:37 +0000 Subject: [PATCH 13/46] python311Packages.orbax-checkpoint: 0.5.7 -> 0.5.9 --- pkgs/development/python-modules/orbax-checkpoint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index 37ecfccc6d70..c0c7c25388da 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.5.7"; + version = "0.5.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "orbax_checkpoint"; inherit version; - hash = "sha256-3hRUm4mSIKT0RUU5Z8GsLXFluBUlM0JYd0YAXwOpgTs="; + hash = "sha256-H96IkUM3IxV79uddNBCU0dq+0dvPx8/Ps4HeCItGi2A="; }; nativeBuildInputs = [ From 62e853a2656ffffb58364b311aac665b428efd74 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 Apr 2024 20:01:05 +0200 Subject: [PATCH 14/46] python312Packages.orbax-checkpoint: refactor --- pkgs/development/python-modules/orbax-checkpoint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index c0c7c25388da..45caec099223 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { hash = "sha256-H96IkUM3IxV79uddNBCU0dq+0dvPx8/Ps4HeCItGi2A="; }; - nativeBuildInputs = [ + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ absl-py cached-property etils From bebdac46ff83a90a6cd5583ee2e442a915432d28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 Apr 2024 20:01:32 +0200 Subject: [PATCH 15/46] python312Packages.orbax-checkpoint: format with nixfmt --- .../orbax-checkpoint/default.nix | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index 45caec099223..aa5a5572dec9 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -1,23 +1,24 @@ -{ lib -, absl-py -, buildPythonPackage -, cached-property -, etils -, fetchPypi -, flit-core -, importlib-resources -, jax -, jaxlib -, msgpack -, nest-asyncio -, numpy -, protobuf -, pytest-xdist -, pytestCheckHook -, pythonOlder -, pyyaml -, tensorstore -, typing-extensions +{ + lib, + absl-py, + buildPythonPackage, + cached-property, + etils, + fetchPypi, + flit-core, + importlib-resources, + jax, + jaxlib, + msgpack, + nest-asyncio, + numpy, + protobuf, + pytest-xdist, + pytestCheckHook, + pythonOlder, + pyyaml, + tensorstore, + typing-extensions, }: buildPythonPackage rec { @@ -33,9 +34,7 @@ buildPythonPackage rec { hash = "sha256-H96IkUM3IxV79uddNBCU0dq+0dvPx8/Ps4HeCItGi2A="; }; - build-system = [ - flit-core - ]; + build-system = [ flit-core ]; dependencies = [ absl-py From 5b11e74a01fd5c112150170bab271f6d9c63ce89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= Date: Sun, 7 Apr 2024 22:51:06 +0200 Subject: [PATCH 16/46] rPackages.multiMiR: fix loading test error --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 994b6349a616..4414ba77fbd3 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -948,6 +948,7 @@ let "Rmpi" # tries to run MPI processes "pbdMPI" # tries to run MPI processes "data_table" # fails to rename shared library before check + "multiMiR" # tries to connect to DB ]; # Packages which cannot be installed due to lack of dependencies or other reasons. From fa04bf2432ed9d66b0c7d5baab14932ac6c0bc9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= Date: Sun, 7 Apr 2024 23:26:59 +0200 Subject: [PATCH 17/46] rPackages.Rarr: fix build --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 994b6349a616..76b40ea7da83 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -624,6 +624,7 @@ let HiCDCPlus = [ pkgs.zlib.dev ]; PopGenome = [ pkgs.zlib.dev ]; QuasR = with pkgs; [ zlib.dev xz.dev bzip2.dev ]; + Rarr = [ pkgs.zlib.dev ]; Rbowtie2 = [ pkgs.zlib.dev ]; maftools = with pkgs; [ zlib.dev bzip2 xz.dev ]; Rmmquant = [ pkgs.zlib.dev ]; From 2942a15fdc034939db09fd72a23a0a024c276d74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 7 Apr 2024 16:06:27 -0700 Subject: [PATCH 18/46] rapidfuzz-cpp: 3.0.3 -> 3.0.4 Diff: https://github.com/rapidfuzz/rapidfuzz-cpp/compare/v3.0.3...v3.0.4 Changelog: https://github.com/rapidfuzz/rapidfuzz-cpp/blob/v3.0.4/CHANGELOG.md --- pkgs/development/libraries/rapidfuzz-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index c073d06fd0dd..0a2967d0fcb1 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "rapidfuzz"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-6Df0X/gkS0i1RWv1uh0Hcn/lrLlIHeRp/+vfUmQ2EmI="; + hash = "sha256-urMdK+6ORHRgisppb700jaQpxLXAvXVjd8WDN7Zky3A="; }; nativeBuildInputs = [ From 26307aa932786a6141d9a034b4f0e3c4bd070298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 7 Apr 2024 16:03:13 -0700 Subject: [PATCH 19/46] python311Packages.rapidfuzz: 3.7.0 -> 3.8.1 Diff: https://github.com/maxbachmann/RapidFuzz/compare/refs/tags/v3.7.0...v3.8.1 Changelog: https://github.com/maxbachmann/RapidFuzz/blob/refs/tags/v3.8.1/CHANGELOG.rst --- pkgs/development/python-modules/rapidfuzz/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 5a1a6296b48d..6caf19c721ab 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,16 +18,16 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.7.0"; + version = "3.8.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-BwU9Ti35Dsaa+kT78h3lsjw4sI1RQdhukTPTeJDyBw0="; + hash = "sha256-ljuqezL/Iu4VQelPi7KApBknDrWzikX7FD5iw5NcOL4="; }; postPatch = '' @@ -35,7 +35,7 @@ buildPythonPackage rec { --replace-fail "Cython >=3.0.9, <3.1.0" "Cython" ''; - nativeBuildInputs = [ + build-system = [ cmake cython_3 ninja From 347bdce1c43c191b013caac6ba49bd626c16ca7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Apr 2024 11:37:04 +0000 Subject: [PATCH 20/46] offat: 0.16.0 -> 0.17.0 --- pkgs/by-name/of/offat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix index e9942dbeb0c4..b74095834b61 100644 --- a/pkgs/by-name/of/offat/package.nix +++ b/pkgs/by-name/of/offat/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "offat"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; src = fetchFromGitHub { owner = "OWASP"; repo = "OFFAT"; rev = "refs/tags/v${version}"; - hash = "sha256-ald+hanICvY0jTgL7GtIMiArLWazykaJAJSfzPKE4/I="; + hash = "sha256-tSLlMgvKIDlzHL71gH1OznKI5jEyUoJUy9d9Z8tNXjk="; }; sourceRoot = "${src.name}/src"; From 1db839666181d9b60663d9524c4b48f0e87e68d7 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 8 Apr 2024 09:37:29 -0500 Subject: [PATCH 21/46] yabai: 7.0.4 -> 7.1.0 --- pkgs/os-specific/darwin/yabai/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index b7bc24c8ef46..150db493198f 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.0.4"; + version = "7.1.0"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -85,14 +85,14 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-eOgdCW3BEB9vn9lui7Ib6uWl5MSAnHh3ztqHCWshCv8="; + hash = "sha256-88Sh2nizAQ0a0cnlnrkhb5x3VjHa372HhjHlmNjGdQ4="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-yj7ISrBzVIDGsDQ1D+vDm9PapsZmi5fk1m3cGuzBR7w="; + hash = "sha256-5iC1U6tyUYFLjOfnIxCrjCjj2deUZ/rvsJN4jlrr2Tc="; }; }; From 013748c4b8a855345143c1226043e243fb21f68f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Apr 2024 17:23:31 +0000 Subject: [PATCH 22/46] pyprland: 2.1.4 -> 2.2.3 --- pkgs/by-name/py/pyprland/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 7c5cc114f767..c5681e11db54 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.1.4"; + version = "2.2.3"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = "refs/tags/${version}"; - hash = "sha256-vko8SY5d537bKnpVeJWM3D4WeYCXAvF6tCzlFjKIZRU="; + hash = "sha256-WGLcrmKHti5Hu2Ed4/G1UgYGXPyGYHmkPK/yo4gdMNM="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; From b5daf9320e85f195a95e77a823a7d0cb319b8452 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 00:18:24 +0000 Subject: [PATCH 23/46] allure: 2.27.0 -> 2.28.0 --- pkgs/development/tools/allure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix index 82c05637c10a..ddae95298e47 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -2,7 +2,7 @@ let pname = "allure"; - version = "2.27.0"; + version = "2.28.0"; in stdenv.mkDerivation rec { inherit pname version; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-gasOVDCNxuZlyeDbloV6iL6DAInHPEXHAvnfUfoj+gA="; + sha256 = "sha256-n+wmmY2936PQkHuS9DS7f51n3Eko/OM7nHHFbi85+Lk="; }; dontConfigure = true; dontBuild = true; From f3ac3b7f59fb2c13faea3d488705d300c954ccc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 00:20:53 +0000 Subject: [PATCH 24/46] aaaaxy: 1.5.42 -> 1.5.54 --- pkgs/by-name/aa/aaaaxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix index 3145758f50d6..386b8d62388a 100644 --- a/pkgs/by-name/aa/aaaaxy/package.nix +++ b/pkgs/by-name/aa/aaaaxy/package.nix @@ -20,17 +20,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.5.42"; + version = "1.5.54"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-RfjEr0oOtLcrHKQj1dYbykRbHoGoi0o7D3hjVG3siIQ="; + hash = "sha256-FBla+KvUoUdCG0nM4falMJBq8NI75zqo/YSZy0bPFrE="; fetchSubmodules = true; }; - vendorHash = "sha256-q/nDfh+A2eJDAaSWN4Xsgxp76AKsYIX7PNn/psBPmg0="; + vendorHash = "sha256-rE1YXDpiGnAUdmAaOHehyM38SPBqNvSRHhtXIUwRYVs="; buildInputs = [ alsa-lib From 1300357c0f77a91788a6fda65f82c76c495bcc42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 03:47:10 +0000 Subject: [PATCH 25/46] lubelogger: 1.2.9 -> 1.3.0 --- pkgs/by-name/lu/lubelogger/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix index 72bef4a340af..e7526a74b671 100644 --- a/pkgs/by-name/lu/lubelogger/package.nix +++ b/pkgs/by-name/lu/lubelogger/package.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "lubelogger"; - version = "1.2.9"; + version = "1.3.0"; src = fetchFromGitHub { owner = "hargata"; repo = "lubelog"; rev = "v${version}"; - hash = "sha256-bzCPoWgI7JA5dEYKl2m1ZzNPXxNRAzZz1lFa7fVCkNw="; + hash = "sha256-L2iimh1weZ2f1mh42ahJVZLnemY3kFGK19jLyhcktjI="; }; projectFile = "CarCareTracker.sln"; From 24115d03314b2545e081bf8412df7203321fadee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 11:14:45 +0200 Subject: [PATCH 26/46] offat: format with nixfmt --- pkgs/by-name/of/offat/package.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix index b74095834b61..145ab32a1bbf 100644 --- a/pkgs/by-name/of/offat/package.nix +++ b/pkgs/by-name/of/offat/package.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -17,9 +18,7 @@ python3.pkgs.buildPythonApplication rec { sourceRoot = "${src.name}/src"; - build-system = with python3.pkgs; [ - poetry-core - ]; + build-system = with python3.pkgs; [ poetry-core ]; dependencies = with python3.pkgs; [ aiohttp @@ -45,9 +44,7 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "offat" - ]; + pythonImportsCheck = [ "offat" ]; meta = with lib; { description = "Tool to test APIs for prevalent vulnerabilities"; From 107fb70390c8cb7f3a723a5d056df75327a75943 Mon Sep 17 00:00:00 2001 From: dramforever Date: Tue, 9 Apr 2024 23:28:40 +0800 Subject: [PATCH 27/46] systemd: Fix build on MIPS Enable the existing patch for isMips. --- pkgs/os-specific/linux/systemd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index d07150493fc3..edd11143ad60 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -225,7 +225,7 @@ stdenv.mkDerivation (finalAttrs: { ./0017-meson.build-do-not-create-systemdstatedir.patch ] ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [ ./0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch - ] ++ lib.optional (stdenv.hostPlatform.isPower || stdenv.hostPlatform.isRiscV) [ + ] ++ lib.optional (stdenv.hostPlatform.isPower || stdenv.hostPlatform.isRiscV || stdenv.hostPlatform.isMips) [ # Fixed upstream and included in the main and stable branches. Can be dropped # when bumping to >= v255.5. # https://github.com/systemd/systemd/issues/30448 From 4afc9675a9d86152a647d4b3ff40cf3298d9c606 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 16:05:48 +0000 Subject: [PATCH 28/46] python312Packages.molecule: 24.2.0 -> 24.2.1 --- pkgs/development/python-modules/molecule/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index 309a3cdcfadf..7cdcb59f95e5 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "molecule"; - version = "24.2.0"; + version = "24.2.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-R8mCp9Bdt4Rtp3/nFZ3rlG8myvsuOI/HGBK+AImkF3Y="; + hash = "sha256-g1IrqpuRVg6phic8qxScORVpdunWEkVxciYyCTWtVuQ="; }; nativeBuildInputs = [ From 97450273085fe430f796c63f6b6f1e64feea445a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 19:36:41 +0200 Subject: [PATCH 29/46] python312Packages.molecule: refactor --- .../python-modules/molecule/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index 7cdcb59f95e5..bf6dc0448800 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -1,28 +1,30 @@ { lib -, buildPythonPackage -, fetchPypi -, testers , ansible-compat , ansible-core +, buildPythonPackage , click-help-colors , enrich +, fetchPypi , jsonschema , molecule -, withPlugins ? true, molecule-plugins , packaging , pluggy +, pythonOlder , rich , setuptools , setuptools-scm -, yamllint +, testers , wcmatch -, wheel +, withPlugins ? true, molecule-plugins +, yamllint }: buildPythonPackage rec { pname = "molecule"; version = "24.2.1"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; @@ -32,7 +34,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-scm - wheel ]; propagatedBuildInputs = [ @@ -63,9 +64,10 @@ buildPythonPackage rec { meta = with lib; { description = "Molecule aids in the development and testing of Ansible roles"; - mainProgram = "molecule"; homepage = "https://github.com/ansible-community/molecule"; - maintainers = with maintainers; [ dawidd6 ]; + changelog = "https://github.com/ansible/molecule/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ dawidd6 ]; + mainProgram = "molecule"; }; } From d030ba37a4cc5be86f096a1abf55631f4379c615 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 19:37:40 +0200 Subject: [PATCH 30/46] python312Packages.molecule: format with nixfmt --- .../python-modules/molecule/default.nix | 56 ++++++++++--------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index bf6dc0448800..170d0bd2f741 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -1,22 +1,24 @@ -{ lib -, ansible-compat -, ansible-core -, buildPythonPackage -, click-help-colors -, enrich -, fetchPypi -, jsonschema -, molecule -, packaging -, pluggy -, pythonOlder -, rich -, setuptools -, setuptools-scm -, testers -, wcmatch -, withPlugins ? true, molecule-plugins -, yamllint +{ + lib, + ansible-compat, + ansible-core, + buildPythonPackage, + click-help-colors, + enrich, + fetchPypi, + jsonschema, + molecule, + packaging, + pluggy, + pythonOlder, + rich, + setuptools, + setuptools-scm, + testers, + wcmatch, + withPlugins ? true, + molecule-plugins, + yamllint, }: buildPythonPackage rec { @@ -54,13 +56,15 @@ buildPythonPackage rec { # tests can't be easily run without installing things from ansible-galaxy doCheck = false; - passthru.tests.version = (testers.testVersion { - package = molecule; - command = "PY_COLORS=0 ${pname} --version"; - }).overrideAttrs (old: { - # workaround the error: Permission denied: '/homeless-shelter' - HOME = "$(mktemp -d)"; - }); + passthru.tests.version = + (testers.testVersion { + package = molecule; + command = "PY_COLORS=0 ${pname} --version"; + }).overrideAttrs + (old: { + # workaround the error: Permission denied: '/homeless-shelter' + HOME = "$(mktemp -d)"; + }); meta = with lib; { description = "Molecule aids in the development and testing of Ansible roles"; From 9b23333630408ee3d01979773f571b84df58f2b2 Mon Sep 17 00:00:00 2001 From: Frederick Schwalbe Date: Tue, 9 Apr 2024 20:31:48 +0200 Subject: [PATCH 31/46] pferd: 3.5.0 -> 3.5.1 --- pkgs/tools/misc/pferd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/tools/misc/pferd/default.nix index af343a19d969..5875035955ec 100644 --- a/pkgs/tools/misc/pferd/default.nix +++ b/pkgs/tools/misc/pferd/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.5.0"; + version = "3.5.1"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; rev = "refs/tags/v${version}"; - sha256 = "sha256-iGMqKRM/8pnnew/U1r7Od9Giyn9z4BxVGO85nw3FI9Y="; + sha256 = "sha256-NNQ7yB0JPVDSWMNxkpvEK/meLa3Db78qxUDDTJa6YgM="; }; nativeBuildInputs = with python3Packages; [ From 3da2cf5201821196f1fa1ebfeb18794b9db80ea0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 22:57:32 +0200 Subject: [PATCH 32/46] python311Packages.archinfo: 9.2.97 -> 9.2.98 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.97...v9.2.98 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 2b335fb37160..97ef74e2bcb4 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.97"; + version = "9.2.98"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-X8rMTQvNolYjSPyXbP2i5MYTPEvQlwoUQmXeEW56wQs="; + hash = "sha256-EdVGm4453XxGrq2D1v5JzSZyroRNzluZ5/r74YAt5zU="; }; build-system = [ From 9c8521432ebbb7e0f19887008c786a29611ac173 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 22:57:34 +0200 Subject: [PATCH 33/46] python311Packages.ailment: 9.2.97 -> 9.2.98 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.97...v9.2.98 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index f379322c502c..ac1080abb4f8 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.97"; + version = "9.2.98"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-R6OBc7qK4zP0t8m26V17he8Oy39eSK8/Dm84ScnBy3s="; + hash = "sha256-ue780bhPpxv7Bnx9PX+HdQt3gcDSvTvK0FLPMopXQRY="; }; build-system = [ From 1507840f1f90554c90f9b3ca9929a65000f95e85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 22:57:37 +0200 Subject: [PATCH 34/46] python311Packages.pyvex: 9.2.97 -> 9.2.98 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 659db729aadd..3a166921591b 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.97"; + version = "9.2.98"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-GIBsWtj8nLuzGX/C6Ioe8mSfKg3QXtEJf3+d5h9M02c="; + hash = "sha256-+X4G5jLG7c75XIItNlQLF5YV0XUQwdA6JyF1IGBfiE0="; }; build-system = [ From 91b458ad5ba4e74c963874db62595db0131abb7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 22:57:40 +0200 Subject: [PATCH 35/46] python311Packages.claripy: 9.2.97 -> 9.2.98 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.97...v9.2.98 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 5f0cec61b1ed..190a0f5afd3e 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.97"; + version = "9.2.98"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-ZSDG1KmVi0kZX4WmrYIyd5+zRR/rjrugm8UjFlI5pfU="; + hash = "sha256-qGkVGRDVX8YMWgvRAqKM9Pxjv9uqu4UNSDtvhzVVeSU="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From 3c9f185697a33acb52b865dd8a82a60fd707a61f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 22:57:43 +0200 Subject: [PATCH 36/46] python311Packages.angr: 9.2.97 -> 9.2.98 Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.97...v9.2.98 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 688c988fb2f1..1f7a3d275c38 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.97"; + version = "9.2.98"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-eJkxflAQFI/sEL4JMlMe+kClnaVSxtoOrPg8HQpH78g="; + hash = "sha256-9NLQtwakM041yNY/mb9WbSGC1Q8AHHkiqqjf5bZUOlI="; }; pythonRelaxDeps = [ From 7c4922897ec3ec93a9ffdeb05d9751637d164f14 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 23:01:50 +0200 Subject: [PATCH 37/46] python311Packages.cle: 9.2.97 -> 9.2.98 Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.97...v9.2.98 --- pkgs/development/python-modules/cle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 543c14407476..a6dd38f55743 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -17,14 +17,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.97"; + version = "9.2.98"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-FiPEqfNaAXI+xSWE+So//Uwz9k3bANHQ++nRSPKkddM="; + hash = "sha256-hnYMAgEnDHXg1jUrzhLWuun+Gv+2xnd4Da6OC9IGa2Q="; }; in @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-tain1I7Td+0v7n+px3mQnz7reKZUbGYDWfKnDhvmU8I="; + hash = "sha256-6gJKhyjKBgtSwGk5lqkaQVxe0ZC5WHVIYQMeREfz9A0="; }; build-system = [ From 8849930598beb4472597c133cd31812f96768a00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 23:13:27 +0200 Subject: [PATCH 38/46] python311Packages.ailment: format with nixfmt --- .../python-modules/ailment/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index ac1080abb4f8..c01ea491bcd3 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pyvex -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pyvex, + setuptools, }: buildPythonPackage rec { @@ -20,20 +21,14 @@ buildPythonPackage rec { hash = "sha256-ue780bhPpxv7Bnx9PX+HdQt3gcDSvTvK0FLPMopXQRY="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - pyvex - ]; + dependencies = [ pyvex ]; # Tests depend on angr (possibly a circular dependency) doCheck = false; - pythonImportsCheck = [ - "ailment" - ]; + pythonImportsCheck = [ "ailment" ]; meta = with lib; { description = "The angr Intermediate Language"; From 376df0333ec979a2735856e1429c4d2fb01b6b89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 23:14:20 +0200 Subject: [PATCH 39/46] python311Packages.angr: format with nixfmt --- .../python-modules/angr/default.nix | 77 +++++++++---------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 1f7a3d275c38..5b2d7bd54684 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -1,37 +1,38 @@ -{ lib -, stdenv -, ailment -, archinfo -, buildPythonPackage -, cachetools -, capstone -, cffi -, claripy -, cle -, cppheaderparser -, dpkt -, fetchFromGitHub -, gitpython -, itanium-demangler -, mulpyplexer -, nampa -, networkx -, progressbar2 -, protobuf -, psutil -, pycparser -, pyformlang -, pythonOlder -, pythonRelaxDepsHook -, pyvex -, rich -, rpyc -, setuptools -, sortedcontainers -, sqlalchemy -, sympy -, unicorn -, unique-log-filter +{ + lib, + stdenv, + ailment, + archinfo, + buildPythonPackage, + cachetools, + capstone, + cffi, + claripy, + cle, + cppheaderparser, + dpkt, + fetchFromGitHub, + gitpython, + itanium-demangler, + mulpyplexer, + nampa, + networkx, + progressbar2, + protobuf, + psutil, + pycparser, + pyformlang, + pythonOlder, + pythonRelaxDepsHook, + pyvex, + rich, + rpyc, + setuptools, + sortedcontainers, + sqlalchemy, + sympy, + unicorn, + unique-log-filter, }: buildPythonPackage rec { @@ -48,9 +49,7 @@ buildPythonPackage rec { hash = "sha256-9NLQtwakM041yNY/mb9WbSGC1Q8AHHkiqqjf5bZUOlI="; }; - pythonRelaxDeps = [ - "capstone" - ]; + pythonRelaxDeps = [ "capstone" ]; build-system = [ pythonRelaxDepsHook @@ -88,9 +87,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - AngrDB = [ - sqlalchemy - ]; + AngrDB = [ sqlalchemy ]; }; setupPyBuildFlags = lib.optionals stdenv.isLinux [ From d3606244daa0628b7721b4560f56f4c8917635a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 23:14:51 +0200 Subject: [PATCH 40/46] python311Packages.archinfo: format with nixfmt --- .../python-modules/archinfo/default.nix | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 97ef74e2bcb4..391884310aff 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -1,10 +1,11 @@ -{ lib -, backports-strenum -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + backports-strenum, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -21,21 +22,13 @@ buildPythonPackage rec { hash = "sha256-EdVGm4453XxGrq2D1v5JzSZyroRNzluZ5/r74YAt5zU="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = lib.optionals (pythonOlder "3.11") [ - backports-strenum - ]; + dependencies = lib.optionals (pythonOlder "3.11") [ backports-strenum ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "archinfo" - ]; + pythonImportsCheck = [ "archinfo" ]; meta = with lib; { description = "Classes with architecture-specific information"; From d7361d9da92767eb2717767e19fb92edb047301b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 23:15:47 +0200 Subject: [PATCH 41/46] python311Packages.claripy: format with nixfmt --- .../python-modules/claripy/default.nix | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 190a0f5afd3e..0da9d861642f 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, cachetools -, decorator -, fetchFromGitHub -, pysmt -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, setuptools -, z3-solver +{ + lib, + buildPythonPackage, + cachetools, + decorator, + fetchFromGitHub, + pysmt, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + setuptools, + z3-solver, }: buildPythonPackage rec { @@ -26,9 +27,7 @@ buildPythonPackage rec { }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail - pythonRemoveDeps = [ - "z3-solver" - ]; + pythonRemoveDeps = [ "z3-solver" ]; build-system = [ pythonRelaxDepsHook @@ -42,13 +41,9 @@ buildPythonPackage rec { z3-solver ] ++ z3-solver.requiredPythonModules; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "claripy" - ]; + pythonImportsCheck = [ "claripy" ]; meta = with lib; { description = "Python abstraction layer for constraint solvers"; From 2dd22d5265225f34af0bff9cc175ff43b2f71806 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 23:16:32 +0200 Subject: [PATCH 42/46] python311Packages.cle: format with nixfmt --- .../python-modules/cle/default.nix | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index a6dd38f55743..a2dda712f417 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -1,18 +1,19 @@ -{ lib -, archinfo -, buildPythonPackage -, cffi -, fetchFromGitHub -, minidump -, pefile -, pyelftools -, pynose -, pytestCheckHook -, pythonOlder -, pyvex -, pyxbe -, setuptools -, sortedcontainers +{ + lib, + archinfo, + buildPythonPackage, + cffi, + fetchFromGitHub, + minidump, + pefile, + pyelftools, + pynose, + pytestCheckHook, + pythonOlder, + pyvex, + pyxbe, + setuptools, + sortedcontainers, }: let @@ -26,7 +27,6 @@ let rev = "refs/tags/v${version}"; hash = "sha256-hnYMAgEnDHXg1jUrzhLWuun+Gv+2xnd4Da6OC9IGa2Q="; }; - in buildPythonPackage rec { pname = "cle"; @@ -42,9 +42,7 @@ buildPythonPackage rec { hash = "sha256-6gJKhyjKBgtSwGk5lqkaQVxe0ZC5WHVIYQMeREfz9A0="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ archinfo @@ -82,9 +80,7 @@ buildPythonPackage rec { "test_remote_file_map" ]; - pythonImportsCheck = [ - "cle" - ]; + pythonImportsCheck = [ "cle" ]; meta = with lib; { description = "Python loader for many binary formats"; From d037ae232e2b79745dd3ce5f1bcb3c2c69de2620 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 23:17:11 +0200 Subject: [PATCH 43/46] python311Packages.angrop: format with nixfmt --- .../python-modules/angrop/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index b491ef83fe5f..939517887e40 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -1,11 +1,12 @@ -{ lib -, angr -, buildPythonPackage -, fetchFromGitHub -, progressbar -, pythonOlder -, setuptools -, tqdm +{ + lib, + angr, + buildPythonPackage, + fetchFromGitHub, + progressbar, + pythonOlder, + setuptools, + tqdm, }: buildPythonPackage rec { @@ -22,9 +23,7 @@ buildPythonPackage rec { hash = "sha256-T07Y23UDp9eL2DK5gakV8kPNGsXf+4EofZJDSW/JS1Q="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ angr @@ -36,9 +35,7 @@ buildPythonPackage rec { # cle is executing the tests with the angr binaries already and is a requirement of angr doCheck = false; - pythonImportsCheck = [ - "angrop" - ]; + pythonImportsCheck = [ "angrop" ]; meta = with lib; { description = "ROP gadget finder and chain builder"; From 4463210731e1f561c033227c33baba5fc81fe3d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 22:22:46 +0000 Subject: [PATCH 44/46] python311Packages.trimesh: 4.2.4 -> 4.3.0 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 0cbed38ff735..3ac3baf1525a 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.2.4"; + version = "4.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ausgFjhYe0b/hd+szti4GpMil3NF6/yuXSajy/1JZXY="; + hash = "sha256-kUXi26NhFGS3liGaGHfm0HTRWXlnaIa80lxgLQ/0FyM="; }; nativeBuildInputs = [ setuptools ]; From 76b199e34be37ca7c807c6bd19872a9de0efc15b Mon Sep 17 00:00:00 2001 From: Mitchell Skaggs Date: Tue, 9 Apr 2024 17:53:35 -0500 Subject: [PATCH 45/46] electron: exclude patch of removed tests (#302544) Closes https://github.com/NixOS/nixpkgs/issues/302457 --- pkgs/development/tools/electron/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 9881c26f659e..a29de512404d 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -127,7 +127,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { for patch in $(cat $patch_dir/.patches) do echo applying in $repo: $patch - git apply -p1 --directory=$repo --exclude='src/third_party/blink/web_tests/*' $patch_dir/$patch + git apply -p1 --directory=$repo --exclude='src/third_party/blink/web_tests/*' --exclude='src/content/test/data/*' $patch_dir/$patch done done ) From a9a37884b41e989c8f125c4588f306e677cb8e33 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 20 Mar 2024 10:18:13 +0100 Subject: [PATCH 46/46] fernglas: init at 0.2.1 --- pkgs/by-name/fe/fernglas/package.nix | 72 ++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 pkgs/by-name/fe/fernglas/package.nix diff --git a/pkgs/by-name/fe/fernglas/package.nix b/pkgs/by-name/fe/fernglas/package.nix new file mode 100644 index 000000000000..3de973612857 --- /dev/null +++ b/pkgs/by-name/fe/fernglas/package.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, fetchYarnDeps +, prefetch-yarn-deps +, python3 +, jq +, yarn +, nodejs-slim +}: + +rustPlatform.buildRustPackage rec { + pname = "fernglas"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "wobcom"; + repo = "fernglas"; + rev = "fernglas-${version}"; + hash = "sha256-0wj5AS8RLVr+S/QWWxCsMvmVjmXUWGfR9kPaZimJEss="; + }; + + nativeBuildInputs = [ yarn nodejs-slim prefetch-yarn-deps python3 jq ]; + + nlnog_communities = fetchFromGitHub { + owner = "NLNOG"; + repo = "lg.ring.nlnog.net"; + rev = "20f9a9f3da8b1bc9d7046e88c62df4b41b4efb99"; + hash = "sha256-FlbOBX/+/LLmoqMJLvu59XuHYmiohIhDc1VjkZu4Wzo="; + }; + + cargoHash = "sha256-ls9HvwtbpOwzQbi/+9IbgXurZp0LjQKGZcDuLZlX+Vk="; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/frontend/yarn.lock"; + hash = "sha256-/ubCAs4C5nG8xNC77jTH+cJVNgddSxqGGPEVLDH/Cdo="; + }; + + cargoBuildFlags = lib.optionals (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isStatic) [ + "--features" "mimalloc" + ] ++ [ + "--features" "embed-static" + ]; + + preBuild = '' + python3 contrib/print_communities.py $nlnog_communities/communities | jq . > src/communities.json + + pushd frontend + + export HOME=$TMPDIR + yarn config --offline set yarn-offline-mirror $offlineCache + fixup-yarn-lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/ + + FERNGLAS_VERSION=${version} FERNGLAS_COMMIT=${src.rev} node_modules/.bin/webpack + cp -r dist/ ../static + + popd + ''; + + meta = with lib; { + description = "Looking glass for your network using BGP and BMP as data source"; + homepage = "https://wobcom.github.io/fernglas/"; + changelog = "https://github.com/wobcom/fernglas/releases/tag/fernglas-${version}"; + license = licenses.eupl12; + platforms = platforms.linux; + maintainers = teams.wdz.members; + mainProgram = "fernglas"; + }; +}