From df83a721daa094fc6b15b24e94965821ebd01bec Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Tue, 9 Jul 2024 23:37:56 +0800 Subject: [PATCH 001/124] xonsh: fix wrapper --- nixos/modules/programs/xonsh.nix | 2 +- pkgs/by-name/xo/xonsh/package.nix | 130 ++++------------------------ pkgs/by-name/xo/xonsh/unwrapped.nix | 124 ++++++++++++++++++++++++++ pkgs/by-name/xo/xonsh/wrapper.nix | 25 ------ pkgs/top-level/python-packages.nix | 4 +- 5 files changed, 144 insertions(+), 141 deletions(-) create mode 100644 pkgs/by-name/xo/xonsh/unwrapped.nix delete mode 100644 pkgs/by-name/xo/xonsh/wrapper.nix diff --git a/nixos/modules/programs/xonsh.nix b/nixos/modules/programs/xonsh.nix index 6bf18d4ebd89..86bdb4088845 100644 --- a/nixos/modules/programs/xonsh.nix +++ b/nixos/modules/programs/xonsh.nix @@ -23,7 +23,7 @@ in }; package = lib.mkPackageOption pkgs "xonsh" { - example = "xonsh.wrapper.override { extraPackages = ps: [ ps.requests ]; }"; + example = "pkgs.xonsh.override { extraPackages = ps: [ ps.requests ]; }"; }; config = lib.mkOption { diff --git a/pkgs/by-name/xo/xonsh/package.nix b/pkgs/by-name/xo/xonsh/package.nix index 60b96dd67f24..2cf2b9241ca4 100644 --- a/pkgs/by-name/xo/xonsh/package.nix +++ b/pkgs/by-name/xo/xonsh/package.nix @@ -1,118 +1,24 @@ { lib, - callPackage, - coreutils, - fetchFromGitHub, - git, - gitUpdater, - glibcLocales, - python3Packages, + python3, + runCommand, + # configurable options + extraPackages ? (ps: [ ]), }: let - - argset = { - pname = "xonsh"; - version = "0.17.0"; - pyproject = true; - - # PyPI package ships incomplete tests - src = fetchFromGitHub { - owner = "xonsh"; - repo = "xonsh"; - rev = "refs/tags/${argset.version}"; - hash = "sha256-9sRY9aetWWXzCFfgdHCBCia48THIJcMxsYMnFR6Xa8A="; - }; - - nativeBuildInputs = with python3Packages; [ - setuptools - wheel - ]; - - propagatedBuildInputs = (with python3Packages; [ - ply - prompt-toolkit - pygments - ]); - - nativeCheckInputs = [ - git - glibcLocales - ] ++ (with python3Packages; [ - pip - pyte - pytest-mock - pytest-subprocess - pytestCheckHook - requests - ]); - - disabledTests = [ - # fails on sandbox - "test_colorize_file" - "test_loading_correctly" - "test_no_command_path_completion" - "test_bsd_man_page_completions" - "test_xonsh_activator" - # fails on non-interactive shells - "test_capture_always" - "test_casting" - "test_command_pipeline_capture" - "test_dirty_working_directory" - "test_man_completion" - "test_vc_get_branch" - "test_bash_and_is_alias_is_only_functional_alias" - "test_spec_modifier_alias_output_format" - # flaky tests - "test_script" - "test_alias_stability" - "test_alias_stability_exception" - "test_complete_import" - "test_subproc_output_format" - ]; - - disabledTestPaths = [ - # fails on sandbox - "tests/completers/test_command_completers.py" - "tests/test_ptk_highlight.py" - "tests/test_ptk_shell.py" - # fails on non-interactive shells - "tests/prompt/test_gitstatus.py" - "tests/completers/test_bash_completer.py" - ]; - - env.LC_ALL = "en_US.UTF-8"; - - postPatch = '' - sed -ie 's|/bin/ls|${lib.getExe' coreutils "ls"}|' tests/test_execer.py - sed -ie 's|SHELL=xonsh|SHELL=$out/bin/xonsh|' tests/test_integrations.py - - for script in tests/test_integrations.py scripts/xon.sh $(find -name "*.xsh"); do - sed -ie 's|/usr/bin/env|${lib.getExe' coreutils "env"}|' $script - done - patchShebangs . - ''; - - preCheck = '' - export HOME=$TMPDIR - export PATH=$out/bin:$PATH - ''; - - passthru = { - shellPath = "/bin/xonsh"; - python = python3Packages.python; # To the wrapper - wrapper = callPackage ./wrapper.nix { }; - updateScript = gitUpdater { }; - }; - - meta = { - homepage = "https://xon.sh/"; - description = "A Python-ish, BASHwards-compatible shell"; - changelog = "https://github.com/xonsh/xonsh/raw/main/CHANGELOG.rst"; - license = with lib.licenses; [ bsd3 ]; - mainProgram = "xonsh"; - maintainers = with lib.maintainers; [ samlukeyes123 ]; - }; - }; + pythonEnv = python3.withPackages + (ps: [ ps.xonsh ] ++ extraPackages ps); + xonsh = python3.pkgs.xonsh; in -python3Packages.buildPythonApplication argset +runCommand + "xonsh-${xonsh.version}" + { + inherit (xonsh) pname version meta passthru; + } + '' + mkdir -p $out/bin + for bin in ${lib.getBin xonsh}/bin/*; do + ln -s ${pythonEnv}/bin/$(basename "$bin") $out/bin/ + done + '' diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix new file mode 100644 index 000000000000..5d2ec15cc403 --- /dev/null +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -0,0 +1,124 @@ +{ + lib, + coreutils, + fetchFromGitHub, + git, + gitUpdater, + glibcLocales, + pythonPackages, +}: + +let + + argset = { + pname = "xonsh"; + version = "0.17.0"; + pyproject = true; + + # PyPI package ships incomplete tests + src = fetchFromGitHub { + owner = "xonsh"; + repo = "xonsh"; + rev = "refs/tags/${argset.version}"; + hash = "sha256-9sRY9aetWWXzCFfgdHCBCia48THIJcMxsYMnFR6Xa8A="; + }; + + nativeBuildInputs = with pythonPackages; [ + setuptools + wheel + ]; + + propagatedBuildInputs = (with pythonPackages; [ + ply + prompt-toolkit + pygments + ]); + + nativeCheckInputs = [ + git + glibcLocales + ] ++ (with pythonPackages; [ + pip + pyte + pytest-mock + pytest-subprocess + pytestCheckHook + requests + ]); + + disabledTests = [ + # fails on sandbox + "test_colorize_file" + "test_loading_correctly" + "test_no_command_path_completion" + "test_bsd_man_page_completions" + "test_xonsh_activator" + + # fails on non-interactive shells + "test_capture_always" + "test_casting" + "test_command_pipeline_capture" + "test_dirty_working_directory" + "test_man_completion" + "test_vc_get_branch" + "test_bash_and_is_alias_is_only_functional_alias" + + # flaky tests + "test_script" + "test_alias_stability" + "test_alias_stability_exception" + "test_complete_import" + "test_subproc_output_format" + + # https://github.com/xonsh/xonsh/issues/5569 + "test_spec_modifier_alias_output_format" + ]; + + disabledTestPaths = [ + # fails on sandbox + "tests/completers/test_command_completers.py" + "tests/test_ptk_highlight.py" + "tests/test_ptk_shell.py" + # fails on non-interactive shells + "tests/prompt/test_gitstatus.py" + "tests/completers/test_bash_completer.py" + ]; + + # https://github.com/NixOS/nixpkgs/issues/248978 + dontWrapPythonPrograms = true; + + env.LC_ALL = "en_US.UTF-8"; + + postPatch = '' + sed -ie 's|/bin/ls|${lib.getExe' coreutils "ls"}|' tests/test_execer.py + sed -ie 's|SHELL=xonsh|SHELL=$out/bin/xonsh|' tests/test_integrations.py + + for script in tests/test_integrations.py scripts/xon.sh $(find -name "*.xsh"); do + sed -ie 's|/usr/bin/env|${lib.getExe' coreutils "env"}|' $script + done + patchShebangs . + ''; + + preCheck = '' + export HOME=$TMPDIR + export PATH=$out/bin:$PATH + ''; + + passthru = { + shellPath = "/bin/xonsh"; + python = pythonPackages.python; # To the wrapper + wrapper = throw "The top-level xonsh package is now wrapped. Use it directly."; + updateScript = gitUpdater { }; + }; + + meta = { + homepage = "https://xon.sh/"; + description = "A Python-ish, BASHwards-compatible shell"; + changelog = "https://github.com/xonsh/xonsh/raw/main/CHANGELOG.rst"; + license = with lib.licenses; [ bsd3 ]; + mainProgram = "xonsh"; + maintainers = with lib.maintainers; [ samlukeyes123 ]; + }; + }; +in +pythonPackages.buildPythonPackage argset diff --git a/pkgs/by-name/xo/xonsh/wrapper.nix b/pkgs/by-name/xo/xonsh/wrapper.nix deleted file mode 100644 index 1b9637f04dd6..000000000000 --- a/pkgs/by-name/xo/xonsh/wrapper.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - runCommand, - xonsh, - # configurable options - extraPackages ? (ps: [ ]), -}: - -let - inherit (xonsh.passthru) python; - - pythonEnv = python.withPackages - (ps: [ (ps.toPythonModule xonsh) ] ++ extraPackages ps); -in -runCommand - "xonsh-wrapped-${xonsh.version}" - { - inherit (xonsh) pname version meta passthru; - } - '' - mkdir -p $out/bin - for bin in ${lib.getBin xonsh}/bin/*; do - ln -s ${pythonEnv}/bin/$(basename "$bin") $out/bin/ - done - '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39b8b28be828..930f9f58f207 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17351,9 +17351,7 @@ self: super: with self; { xnd = callPackage ../development/python-modules/xnd { }; - xonsh = toPythonModule (pkgs.xonsh.override { - python3Packages = self; - }); + xonsh = callPackage ../by-name/xo/xonsh/unwrapped.nix { }; xpath-expressions = callPackage ../development/python-modules/xpath-expressions { }; From 52e3f9dbf40d7b0c4bfebee96ad021101dde45bc Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Sat, 20 Jul 2024 02:20:47 +0800 Subject: [PATCH 002/124] xonsh: remove indefinite article from meta.description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> --- pkgs/by-name/xo/xonsh/unwrapped.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index 5d2ec15cc403..76c90af0a8f4 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -113,7 +113,7 @@ let meta = { homepage = "https://xon.sh/"; - description = "A Python-ish, BASHwards-compatible shell"; + description = "Python-ish, BASHwards-compatible shell"; changelog = "https://github.com/xonsh/xonsh/raw/main/CHANGELOG.rst"; license = with lib.licenses; [ bsd3 ]; mainProgram = "xonsh"; From 66c027584373426c3d8707ec4933485ab4043289 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 19 Jul 2024 21:24:37 +0200 Subject: [PATCH 003/124] openstack-config: remove hardcoded default password for the root account --- nixos/modules/virtualisation/openstack-config.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/virtualisation/openstack-config.nix b/nixos/modules/virtualisation/openstack-config.nix index 0ef7a3b50106..e522f5218a75 100644 --- a/nixos/modules/virtualisation/openstack-config.nix +++ b/nixos/modules/virtualisation/openstack-config.nix @@ -63,8 +63,6 @@ in settings.PasswordAuthentication = mkDefault false; }; - users.users.root.initialPassword = "foobar"; - # Enable the serial console on tty1 systemd.services."serial-getty@tty1".enable = true; From a30c3615d340295be7f9f4bb0017f05c67db2725 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 06:29:33 +0000 Subject: [PATCH 004/124] inxi: 3.3.34-1 -> 3.3.35-1 --- pkgs/tools/system/inxi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 18a4f88bf56a..d32f7304ff08 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -22,14 +22,14 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.3.34-1"; + version = "3.3.35-1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "smxi"; repo = "inxi"; rev = version; - hash = "sha256-CAZxQmESCBQ2kpDAbUIkky/eY8KLBsfCJvhOiZjV6Po="; + hash = "sha256-wWG/fs+tZIiFI+dcqfwXeh9RxT2zJDiAZoizhAAu60Q="; }; nativeBuildInputs = [ makeWrapper ]; From 4eb01e33819c7a9429b30d6c634b122683b4414f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 6 Aug 2024 18:09:44 +0200 Subject: [PATCH 005/124] python312Packages.django_5: 5.0.7 -> 5.0.8 https://docs.djangoproject.com/en/5.0/releases/5.0.8/ https://www.djangoproject.com/weblog/2024/aug/06/security-releases/ Fixes: CVE-2024-41989, CVE-2024-41990, CVE-2024-41991, CVE-2024-42005 --- pkgs/development/python-modules/django/5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index 2c5cd89b5cb4..b44571368f7d 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "django"; - version = "5.0.7"; + version = "5.0.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-g2Y8kcfYUjykZ7Y6JEsNW/jw6chMLLYpQlgdTFt7HmM="; + hash = "sha256-mH8o1f3UMuKEHwfXK2ck1GVj/T50F+7IgTsnXJn7aHU="; }; patches = From f4035cfe5878d699e668ebd79c1adbaaf44a8673 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Aug 2024 05:50:03 +0000 Subject: [PATCH 006/124] stackql: 0.5.699 -> 0.5.708 --- pkgs/by-name/st/stackql/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix index 4c13281ea436..5e359c398c36 100644 --- a/pkgs/by-name/st/stackql/package.nix +++ b/pkgs/by-name/st/stackql/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "stackql"; - version = "0.5.699"; + version = "0.5.708"; src = fetchFromGitHub { owner = "stackql"; repo = "stackql"; rev = "v${version}"; - hash = "sha256-nObrqCStZI80pgzZOvumgK5Osycf5Uj5ESETpWkqBx0="; + hash = "sha256-hk6YbTYdGPYDAhqYNYvGUcdiEa/07SYkfCHCcckyZ10="; }; - vendorHash = "sha256-dFrJS7qd5N2Vmm6GOhRcCltbvUh0aTJTfqnxRHMmMJo="; + vendorHash = "sha256-6T756bvSED919n9GvwbfM4YXyGlOZKM3khEXnpcrhlI="; ldflags = [ "-s" From c87320cec746754b7cef39b8337a9d18dd680df9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 8 Aug 2024 21:53:36 +0100 Subject: [PATCH 007/124] libei: 1.2.1 -> 1.3.0 Changes: https://gitlab.freedesktop.org/libinput/libei/-/releases/1.3.0 --- pkgs/development/libraries/libei/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libei/default.nix b/pkgs/development/libraries/libei/default.nix index 5ce873879064..c2529e66c0bb 100644 --- a/pkgs/development/libraries/libei/default.nix +++ b/pkgs/development/libraries/libei/default.nix @@ -22,14 +22,14 @@ let in stdenv.mkDerivation rec { pname = "libei"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libinput"; repo = "libei"; rev = version; - hash = "sha256-8n/C0rBlyhY8SaxkwU+tDskwSQObLRrR+utk4Ktgb7U="; + hash = "sha256-yKeMHgR3s83xwoXgLW28ewF2tvs6l0Hq0cCAroCgq0U="; }; buildInputs = [ From 633da8f7a0a05aca42f6cc23e53523e18ce10a4f Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Fri, 9 Aug 2024 22:48:43 +0800 Subject: [PATCH 008/124] xonsh: 0.17.0 -> 0.18.2 --- pkgs/by-name/xo/xonsh/unwrapped.nix | 46 ++++++++++++++++------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index 76c90af0a8f4..4b9f6c6e3cfc 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -12,7 +12,7 @@ let argset = { pname = "xonsh"; - version = "0.17.0"; + version = "0.18.2"; pyproject = true; # PyPI package ships incomplete tests @@ -20,7 +20,7 @@ let owner = "xonsh"; repo = "xonsh"; rev = "refs/tags/${argset.version}"; - hash = "sha256-9sRY9aetWWXzCFfgdHCBCia48THIJcMxsYMnFR6Xa8A="; + hash = "sha256-iTdUu2yGixWwDJICDLfzRcwgGe+xlq2CvxUeSbmDiUU="; }; nativeBuildInputs = with pythonPackages; [ @@ -28,23 +28,28 @@ let wheel ]; - propagatedBuildInputs = (with pythonPackages; [ - ply - prompt-toolkit - pygments - ]); + propagatedBuildInputs = ( + with pythonPackages; + [ + ply + prompt-toolkit + pygments + ] + ); - nativeCheckInputs = [ - git - glibcLocales - ] ++ (with pythonPackages; [ - pip - pyte - pytest-mock - pytest-subprocess - pytestCheckHook - requests - ]); + nativeCheckInputs = + [ + git + glibcLocales + ] + ++ (with pythonPackages; [ + pip + pyte + pytest-mock + pytest-subprocess + pytestCheckHook + requests + ]); disabledTests = [ # fails on sandbox @@ -71,14 +76,13 @@ let "test_subproc_output_format" # https://github.com/xonsh/xonsh/issues/5569 - "test_spec_modifier_alias_output_format" + "test_spec_decorator_alias_output_format" ]; disabledTestPaths = [ # fails on sandbox "tests/completers/test_command_completers.py" - "tests/test_ptk_highlight.py" - "tests/test_ptk_shell.py" + "tests/shell/test_ptk_highlight.py" # fails on non-interactive shells "tests/prompt/test_gitstatus.py" "tests/completers/test_bash_completer.py" From 9b82f8625b87f4485a4df8d404c7844bc655a86f Mon Sep 17 00:00:00 2001 From: David Cox Date: Fri, 9 Aug 2024 16:19:53 -0700 Subject: [PATCH 009/124] cargo-typify: 0.0.14 -> 0.1.0 --- pkgs/by-name/ca/cargo-typify/package.nix | 43 ++++++++++++++++++------ 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ca/cargo-typify/package.nix b/pkgs/by-name/ca/cargo-typify/package.nix index e8bf2013f935..40e30350f5e7 100644 --- a/pkgs/by-name/ca/cargo-typify/package.nix +++ b/pkgs/by-name/ca/cargo-typify/package.nix @@ -1,35 +1,58 @@ -{ lib, rustfmt, rustPlatform, fetchFromGitHub, gitUpdater }: +{ + lib, + rustfmt, + rustPlatform, + fetchFromGitHub, + gitUpdater, + makeWrapper, +}: rustPlatform.buildRustPackage rec { pname = "cargo-typify"; - version = "0.0.14"; + version = "0.1.0"; src = fetchFromGitHub { owner = "oxidecomputer"; repo = "typify"; rev = "v${version}"; - hash = "sha256-Clwm5hRjPPPRB6xpO8YOGpqnyNFtsSMkPbWBY3etPCI="; + hash = "sha256-vokhWIY5iikTyADrqxp6DIq+tJ+xdFPebDFTddJnstA="; }; - cargoHash = "sha256-balx5xOtrWwMOFeGQkYQ2f+lcGMCJvdPqE8rH9adkfU="; + cargoHash = "sha256-etlZqhtRCcCBeMC4lq6BjTD4TQyWEwJf1bLKjoIDR70="; - cargoBuildFlags = [ "-p" "cargo-typify" ]; + nativeBuildInputs = [ + rustfmt + makeWrapper + ]; - nativeCheckInputs = [ rustfmt ]; + cargoBuildFlags = [ + "--package" + "cargo-typify" + ]; + cargoTestFlags = [ + "--package" + "cargo-typify" + ]; + + strictDeps = true; preCheck = '' # cargo-typify depends on rustfmt-wrapper, which requires RUSTFMT: export RUSTFMT="${lib.getExe rustfmt}" ''; + postInstall = '' + wrapProgram $out/bin/cargo-typify \ + --set RUSTFMT "${lib.getExe rustfmt}" + ''; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = with lib; { + meta = { description = "JSON Schema to Rust type converter"; mainProgram = "cargo-typify"; homepage = "https://github.com/oxidecomputer/typify"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ david-r-cox ]; - broken = true; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ david-r-cox ]; }; } From c79d2d8a7500cf93f53a1e9b24a8d4ed0dcd5fef Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:19 +0200 Subject: [PATCH 010/124] python311Packages.acme-tiny: modernize --- .../python-modules/acme-tiny/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index c0ddb81a1920..368bb2cc2f85 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, setuptools-scm, fusepy, fuse, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "acme-tiny"; version = "5.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -19,12 +20,15 @@ buildPythonPackage rec { }; patchPhase = '' - substituteInPlace acme_tiny.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' - substituteInPlace tests/test_module.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' - substituteInPlace tests/utils.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf + substituteInPlace acme_tiny.py --replace-fail '"openssl"' '"${openssl.bin}/bin/openssl"' + substituteInPlace tests/test_module.py --replace-fail '"openssl"' '"${openssl.bin}/bin/openssl"' + substituteInPlace tests/utils.py --replace-fail /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf ''; - buildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; nativeCheckInputs = [ fusepy From 5cf2740f074c20fc589044621700dcbda29b24fb Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:20 +0200 Subject: [PATCH 011/124] python311Packages.adb-enhanced: modernize --- .../python-modules/adb-enhanced/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/adb-enhanced/default.nix b/pkgs/development/python-modules/adb-enhanced/default.nix index 7ef10347207c..ad33e08ef8a9 100644 --- a/pkgs/development/python-modules/adb-enhanced/default.nix +++ b/pkgs/development/python-modules/adb-enhanced/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, docopt, fetchFromGitHub, + setuptools, jdk11, psutil, pythonOlder, @@ -11,25 +12,27 @@ buildPythonPackage rec { pname = "adb-enhanced"; version = "2.5.24"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ashishb"; - repo = pname; + repo = "adb-enhanced"; rev = "refs/tags/${version}"; hash = "sha256-0HxeL6VGM+HTiAxs3NFRcEFbmH9q+0/pJdGyF1hl4hU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ psutil docopt ]; postPatch = '' substituteInPlace adbe/adb_enhanced.py \ - --replace "cmd = 'java" "cmd = '${jdk11}/bin/java" + --replace-fail "cmd = 'java" "cmd = '${jdk11}/bin/java" ''; # Disable tests because they require a dedicated Android emulator From aa94f8c8cfc3b43c7e9a8a131f22379cc1d46337 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:20 +0200 Subject: [PATCH 012/124] python311Packages.aiolip: modernize --- pkgs/development/python-modules/aiolip/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiolip/default.nix b/pkgs/development/python-modules/aiolip/default.nix index 5baebc529b02..06c23bc68bea 100644 --- a/pkgs/development/python-modules/aiolip/default.nix +++ b/pkgs/development/python-modules/aiolip/default.nix @@ -3,26 +3,29 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + setuptools, pythonOlder, }: buildPythonPackage rec { pname = "aiolip"; version = "1.1.6"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "bdraco"; - repo = pname; + repo = "aiolip"; rev = version; sha256 = "1bgmcl8q1p6f2xm3w2qylvla6vf6bd1p2hfwj4l8w6w0w04vr02g"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' - substituteInPlace setup.py --replace "'pytest-runner'," "" + substituteInPlace setup.py --replace-fail "'pytest-runner'," "" ''; pythonImportsCheck = [ "aiolip" ]; From 8b13d1ccb6b897a681da8aabd60d5949e9f5f1b6 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:20 +0200 Subject: [PATCH 013/124] python311Packages.ambee: modernize --- pkgs/development/python-modules/ambee/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ambee/default.nix b/pkgs/development/python-modules/ambee/default.nix index 45dbce4ff1d4..91cf9f27b2e1 100644 --- a/pkgs/development/python-modules/ambee/default.nix +++ b/pkgs/development/python-modules/ambee/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ambee"; version = "0.4.0"; disabled = pythonOlder "3.8"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "frenck"; @@ -25,9 +25,9 @@ buildPythonPackage rec { hash = "sha256-2wX2CLr6kdVw2AGPW6DmYI2OBfQFI/iWVorok2d3wx4="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp yarl ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" + --replace-fail "0.0.0" "${version}" ''; pythonImportsCheck = [ "ambee" ]; From 5a04e268f99ed52b2ab1ab3a0cc11d6528cb9302 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:20 +0200 Subject: [PATCH 014/124] python311Packages.atc-ble: modernize --- .../python-modules/atc-ble/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/atc-ble/default.nix b/pkgs/development/python-modules/atc-ble/default.nix index 76e572401904..1b099a8d0f41 100644 --- a/pkgs/development/python-modules/atc-ble/default.nix +++ b/pkgs/development/python-modules/atc-ble/default.nix @@ -6,6 +6,7 @@ poetry-core, pycryptodomex, pytestCheckHook, + pytest-cov-stub, pythonOlder, sensor-state-data, }: @@ -13,31 +14,29 @@ buildPythonPackage rec { pname = "atc-ble"; version = "0.1.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "atc-ble"; rev = "refs/tags/v${version}"; hash = "sha256-rwOFKxUlbbNIDJRdCmZpHstXwxcTnvlExgcVDdGbIVY="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=atc_ble --cov-report=term-missing:skip-covered" "" - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ + dependencies = [ bluetooth-sensor-state-data pycryptodomex sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; pythonImportsCheck = [ "atc_ble" ]; From 903fa55418475433d98695387936d6a1b98a0fb1 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:21 +0200 Subject: [PATCH 015/124] python311Packages.autarco: modernize --- pkgs/development/python-modules/autarco/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autarco/default.nix b/pkgs/development/python-modules/autarco/default.nix index 0ecb14291c3a..f9e843ec7a57 100644 --- a/pkgs/development/python-modules/autarco/default.nix +++ b/pkgs/development/python-modules/autarco/default.nix @@ -8,6 +8,7 @@ orjson, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, syrupy, @@ -33,8 +34,7 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" + --replace-fail "0.0.0" "${version}" ''; build-system = [ poetry-core ]; @@ -51,6 +51,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook syrupy ]; From 445bbd6b0475965b3fb58b94f057d270f74af746 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:21 +0200 Subject: [PATCH 016/124] python311Packages.avro3k: modernize --- pkgs/development/python-modules/avro3k/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/avro3k/default.nix b/pkgs/development/python-modules/avro3k/default.nix index a2e9c344c564..cc85bb4611a6 100644 --- a/pkgs/development/python-modules/avro3k/default.nix +++ b/pkgs/development/python-modules/avro3k/default.nix @@ -2,13 +2,14 @@ lib, buildPythonPackage, fetchPypi, + setuptools, isPy3k, }: buildPythonPackage rec { pname = "avro3k"; version = "1.7.7-SNAPSHOT"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchPypi { @@ -19,9 +20,11 @@ buildPythonPackage rec { # setuptools.extern.packaging.version.InvalidVersion: Invalid version: '1.7.7-SNAPSHOT' postPatch = '' substituteInPlace setup.py \ - --replace "1.7.7-SNAPSHOT" "1.7.7" + --replace-fail "1.7.7-SNAPSHOT" "1.7.7" ''; + build-system = [ setuptools ]; + doCheck = false; # No such file or directory: './run_tests.py meta = with lib; { From 614bc023d2115e180e03812d3ad171b7e0cea9ee Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:21 +0200 Subject: [PATCH 017/124] python311Packages.azure-mgmt-commerce: modernize --- .../python-modules/azure-mgmt-commerce/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix index 8668ecb99d52..93875a62e84e 100644 --- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrestazure, azure-common, azure-mgmt-core, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-commerce"; version = "6.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -19,7 +20,9 @@ buildPythonPackage rec { sha256 = "6f5447395503b2318f451d24f8021ee08db1cac44f1c3337ea690700419626b6"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrestazure azure-common azure-mgmt-core @@ -28,8 +31,6 @@ buildPythonPackage rec { prePatch = '' rm -f azure_bdist_wheel.py tox.ini - substituteInPlace setup.py \ - --replace "wheel==0.30.0" "wheel" sed -i "/azure-namespace-package/c\ " setup.cfg ''; @@ -43,8 +44,6 @@ buildPythonPackage rec { description = "This is the Microsoft Azure Commerce Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ - maxwilson - ]; + maintainers = with maintainers; [ maxwilson ]; }; } From 2488c2733ec24d3dd6228e146d40c9137bfcafbb Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:21 +0200 Subject: [PATCH 018/124] python311Packages.azure-mgmt-consumption: modernize --- .../python-modules/azure-mgmt-consumption/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix index b300fe7f17b6..5e47775d2b1e 100644 --- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrestazure, azure-common, azure-mgmt-core, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-consumption"; version = "10.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -19,7 +20,9 @@ buildPythonPackage rec { hash = "sha256-BqCGQ2wXN/d6uGiU1R9Zc7bg+l7fVlWOTCllieurkTA="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrestazure azure-common azure-mgmt-core @@ -28,8 +31,6 @@ buildPythonPackage rec { preBuild = '' rm -f azure_bdist_wheel.py - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-mgmt-nspkg" "" ''; pythonNamespaces = [ "azure.mgmt" ]; From aca3211eff0df0d878a83769ee18c953a8d08a68 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:22 +0200 Subject: [PATCH 019/124] python311Packages.azure-mgmt-relay: modernize --- .../python-modules/azure-mgmt-relay/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix index ced59697c8e3..0086fa381973 100644 --- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrestazure, azure-common, azure-mgmt-core, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-relay"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -19,7 +20,9 @@ buildPythonPackage rec { sha256 = "c93b7550e64b6734bf23ce57ca974a3ea929b734c58d1fe3669728c4fd2d2eb3"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrestazure azure-common azure-mgmt-core @@ -28,8 +31,6 @@ buildPythonPackage rec { preBuild = '' rm -f azure_bdist_wheel.py - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-mgmt-nspkg" "" ''; pythonNamespaces = [ "azure.mgmt" ]; From 10923934a831356643aa9cfa4e60fa8da38d5583 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:22 +0200 Subject: [PATCH 020/124] python311Packages.batchgenerators: modernize --- .../python-modules/batchgenerators/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index e07567ff1be0..6c02b8e8cb20 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + setuptools, pytestCheckHook, future, numpy, @@ -16,18 +17,20 @@ buildPythonPackage rec { pname = "batchgenerators"; version = "0.25"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "MIC-DKFZ"; - repo = pname; + repo = "batchgenerators"; rev = "v${version}"; hash = "sha256-L2mWH2t8PN9o1M67KDdl1Tj2ZZ02MY4icsJY2VNrj3A="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ future numpy pillow @@ -38,10 +41,7 @@ buildPythonPackage rec { ]; # see https://github.com/MIC-DKFZ/batchgenerators/pull/78 - postPatch = '' - substituteInPlace setup.py \ - --replace '"unittest2",' "" - ''; + pythonRemoveDeps = [ "unittest2" ]; nativeCheckInputs = [ pytestCheckHook ]; From 8d409110a5cb76a77e66ab62e79b7c52aa2e3b21 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:22 +0200 Subject: [PATCH 021/124] python311Packages.block-io: modernize --- .../development/python-modules/block-io/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index 65190dcca668..d3a7b7213d6b 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "block-io"; version = "2.0.6"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -22,7 +22,11 @@ buildPythonPackage rec { hash = "sha256-M7czfpagXqoWWSu4enB3Z2hc2GtAaskI6cnJzJdpC8I="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + pythonRelaxDeps = [ "base58" ]; + + dependencies = [ base58 bitcoin-utils-fork-minimal pycryptodome @@ -30,11 +34,6 @@ buildPythonPackage rec { setuptools ]; - preConfigure = '' - substituteInPlace setup.py \ - --replace "base58==2.1.0" "base58>=2.1.0" - ''; - # Tests needs a BlockIO API key to run properly # https://github.com/BlockIo/block_io-python/blob/79006bc8974544b70a2d8e9f19c759941d32648e/test.py#L18 doCheck = false; From bc6f638fa084f90e06eb692fc07b983847109031 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:14 +0200 Subject: [PATCH 022/124] python311Packages.hydrus-api: modernize --- .../python-modules/hydrus-api/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/hydrus-api/default.nix b/pkgs/development/python-modules/hydrus-api/default.nix index 0ce083570536..9d62af64cea7 100644 --- a/pkgs/development/python-modules/hydrus-api/default.nix +++ b/pkgs/development/python-modules/hydrus-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "hydrus-api"; version = "5.0.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -20,15 +20,9 @@ buildPythonPackage rec { hash = "sha256-3Roeab9/woGF/aZYm9nbqrcyYN8CKA1k66cTRxx6jM4="; }; - postPatch = '' - substituteInPlace pyproject.toml --replace \ - "poetry.masonry.api" \ - "poetry.core.masonry.api" - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; pythonImportsCheck = [ "hydrus_api" ]; From a8f9398b683c6935377156041b3a4b9724edf610 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:14 +0200 Subject: [PATCH 023/124] python311Packages.imagecorruptions: modernize --- .../python-modules/imagecorruptions/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix index 37a7e1e7056b..fa92484160e1 100644 --- a/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/pkgs/development/python-modules/imagecorruptions/default.nix @@ -1,6 +1,7 @@ { buildPythonPackage, fetchPypi, + setuptools, numpy, scikit-image, lib, @@ -10,19 +11,18 @@ buildPythonPackage rec { pname = "imagecorruptions"; version = "1.1.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "044e173f24d5934899bdbf3596bfbec917e8083e507eed583ab217abebbe084d"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'opencv-python >= 3.4.5'," "" - ''; + pythonRemoveDeps = [ "opencv-python" ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy scikit-image opencv4 From 18c369675008be37d72d6c6cd341654a0abeec2d Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:15 +0200 Subject: [PATCH 024/124] python311Packages.imantics: modernize --- .../python-modules/imantics/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/imantics/default.nix b/pkgs/development/python-modules/imantics/default.nix index 88e8e4835ce4..2204450bed74 100644 --- a/pkgs/development/python-modules/imantics/default.nix +++ b/pkgs/development/python-modules/imantics/default.nix @@ -2,6 +2,7 @@ buildPythonPackage, fetchFromGitHub, lib, + setuptools, numpy, opencv4, lxml, @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "imantics"; version = "0.1.12"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jsbroks"; @@ -21,18 +22,17 @@ buildPythonPackage rec { sha256 = "1zv2gj8cbakhh2fyr2611cbqhfk37a56x973ny9n43y70n26pzm8"; }; - propagatedBuildInputs = [ + pythonRemoveDeps = [ "opencv-python" ]; + + build-system = [ setuptools ]; + + dependencies = [ numpy opencv4 lxml xmljson ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "'opencv-python>=3'," "" - ''; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "imantics" ]; From b52da3f4f9078f1622f18fa8428f733597e19385 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:15 +0200 Subject: [PATCH 025/124] python311Packages.jupyter-c-kernel: modernize --- .../python-modules/jupyter-c-kernel/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-c-kernel/default.nix b/pkgs/development/python-modules/jupyter-c-kernel/default.nix index 77c3f6379f16..ba5b3ff85d40 100644 --- a/pkgs/development/python-modules/jupyter-c-kernel/default.nix +++ b/pkgs/development/python-modules/jupyter-c-kernel/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + setuptools, fetchPypi, ipykernel, gcc, @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "jupyter-c-kernel"; version = "1.2.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "jupyter_c_kernel"; @@ -19,10 +20,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace jupyter_c_kernel/kernel.py \ - --replace "'gcc'" "'${gcc}/bin/gcc'" + --replace-fail "'gcc'" "'${gcc}/bin/gcc'" ''; - propagatedBuildInputs = [ ipykernel ]; + build-system = [ setuptools ]; + + dependencies = [ ipykernel ]; # no tests in repository doCheck = false; From a6d7f4bbadcfa3dfef29199ab309291acb9a341b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:16 +0200 Subject: [PATCH 026/124] python311Packages.jupyterhub-systemdspawner: modernize --- .../jupyterhub-systemdspawner/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index 216beb5fc5fe..c40866fd3d82 100644 --- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -5,13 +5,14 @@ fetchFromGitHub, jupyterhub, pythonOlder, + setuptools, tornado, }: buildPythonPackage rec { pname = "jupyterhub-systemdspawner"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,16 +24,13 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace systemdspawner/systemd.py \ - --replace "/bin/bash" "${bash}/bin/bash" - substituteInPlace systemdspawner/systemdspawner.py \ - --replace "/bin/bash" "${bash}/bin/bash" + --replace-fail "/bin/bash" "${bash}/bin/bash" ''; - buildInputs = [ bash ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ jupyterhub tornado ]; From f9172bb670d2884d4f69fa076e40e99883308756 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:17 +0200 Subject: [PATCH 027/124] python311Packages.jupyterlab-execute-time: modernize --- .../jupyterlab-execute-time/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix index 8af2907fe092..f2efc2e7d5e8 100644 --- a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix +++ b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix @@ -1,8 +1,9 @@ -{ lib -, buildPythonPackage -, fetchPypi -, jupyterlab -, jupyter-packaging +{ + lib, + buildPythonPackage, + fetchPypi, + jupyterlab, + jupyter-packaging, }: buildPythonPackage rec { @@ -19,7 +20,7 @@ buildPythonPackage rec { # jupyterlab is required to build from source but we use the pre-build package postPatch = '' substituteInPlace pyproject.toml \ - --replace '"jupyterlab~=4.0.0"' "" + --replace-fail '"jupyterlab~=4.0.0"' "" ''; dependencies = [ From 485e36875125f0cfa6f10ce5f1938fc1be86de67 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:17 +0200 Subject: [PATCH 028/124] python311Packages.karton-autoit-ripper: modernize --- .../karton-autoit-ripper/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/karton-autoit-ripper/default.nix b/pkgs/development/python-modules/karton-autoit-ripper/default.nix index 7974ad57c49e..b71bd366ad41 100644 --- a/pkgs/development/python-modules/karton-autoit-ripper/default.nix +++ b/pkgs/development/python-modules/karton-autoit-ripper/default.nix @@ -3,6 +3,7 @@ autoit-ripper, buildPythonPackage, fetchFromGitHub, + setuptools, karton-core, malduck, pythonOlder, @@ -12,31 +13,32 @@ buildPythonPackage rec { pname = "karton-autoit-ripper"; version = "1.2.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; - repo = pname; + repo = "karton-autoit-ripper"; rev = "refs/tags/v${version}"; hash = "sha256-D+M3JsIN8LUWg8GVweEzySHI7KaBb6cNHHn4pXoq55M="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + pythonRelaxDeps = [ + "autoit-ripper" + "malduck" + "regex" + ]; + + dependencies = [ autoit-ripper karton-core malduck regex ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "autoit-ripper==" "autoit-ripper>=" \ - --replace "malduck==" "malduck>=" \ - --replace "regex==" "regex>=" - ''; - # Module has no tests doCheck = false; From 35db852051d2d4808002055bfb586368872879b3 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:18 +0200 Subject: [PATCH 029/124] python311Packages.karton-classifier: modernize --- .../karton-classifier/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/karton-classifier/default.nix b/pkgs/development/python-modules/karton-classifier/default.nix index 21bd3f5679d8..8e98ab9d1d2b 100644 --- a/pkgs/development/python-modules/karton-classifier/default.nix +++ b/pkgs/development/python-modules/karton-classifier/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, chardet, fetchFromGitHub, + setuptools, karton-core, pytestCheckHook, python-magic, @@ -12,18 +13,25 @@ buildPythonPackage rec { pname = "karton-classifier"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; - repo = pname; + repo = "karton-classifier"; rev = "refs/tags/v${version}"; hash = "sha256-DH8I4Lbbs2TVMvYlvh/P2I/7O4+VechP2JDDVHNsTSg="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = [ + "chardet" + "python-magic" + ]; + + build-system = [ setuptools ]; + + dependencies = [ chardet karton-core python-magic @@ -31,12 +39,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "chardet==3.0.4" "chardet" \ - --replace "python-magic==0.4.18" "python-magic" - ''; - pythonImportsCheck = [ "karton.classifier" ]; disabledTests = [ From eed233f455ee8658ef77a128a81e96be8c7be51f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:18 +0200 Subject: [PATCH 030/124] python311Packages.keyring-pass: modernize --- pkgs/development/python-modules/keyring-pass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyring-pass/default.nix b/pkgs/development/python-modules/keyring-pass/default.nix index bf618e9a136a..0409bd995c99 100644 --- a/pkgs/development/python-modules/keyring-pass/default.nix +++ b/pkgs/development/python-modules/keyring-pass/default.nix @@ -24,10 +24,10 @@ buildPythonPackage rec { postPatch = '' substituteInPlace keyring_pass/__init__.py \ - --replace 'pass_binary = "pass"' 'pass_binary = "${lib.getExe pass}"' + --replace-fail 'pass_binary = "pass"' 'pass_binary = "${lib.getExe pass}"' ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ keyring From 70e5f69810c5c3d99f7f40dfef31a31b576a6db6 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:19 +0200 Subject: [PATCH 031/124] python311Packages.keyrings-cryptfile: modernize --- .../keyrings-cryptfile/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/pkgs/development/python-modules/keyrings-cryptfile/default.nix index d9cd3f4a0e04..4db10bd0ed5a 100644 --- a/pkgs/development/python-modules/keyrings-cryptfile/default.nix +++ b/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -3,16 +3,18 @@ argon2-cffi, buildPythonPackage, fetchPypi, + setuptools, keyring, pycryptodome, pytestCheckHook, + pytest-cov-stub, pythonOlder, }: buildPythonPackage rec { pname = "keyrings-cryptfile"; version = "1.3.9"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.5"; @@ -22,12 +24,9 @@ buildPythonPackage rec { hash = "sha256-fCpFPKuZhUJrjCH3rVSlfkn/joGboY4INAvYgBrPAJE="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "-s --cov=keyrings/cryptfile" "" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ argon2-cffi keyring pycryptodome @@ -35,7 +34,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "keyrings.cryptfile" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; disabledTests = [ # FileNotFoundError: [Errno 2] No such file or directory: '/build/... From 06f30a2e18396caf66e9fdad13a1af143dae2fdb Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:19 +0200 Subject: [PATCH 032/124] python311Packages.kneed: modernize --- pkgs/development/python-modules/kneed/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/kneed/default.nix b/pkgs/development/python-modules/kneed/default.nix index 0852d12a7340..1148522ab5a8 100644 --- a/pkgs/development/python-modules/kneed/default.nix +++ b/pkgs/development/python-modules/kneed/default.nix @@ -7,12 +7,13 @@ scipy, matplotlib, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { pname = "kneed"; version = "0.8.5"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "arvkevi"; @@ -21,20 +22,16 @@ buildPythonPackage rec { sha256 = "sha256-oakP6NkdvTzMZcoXS6cKNsRo//K+CoPLlhvbQLGij00="; }; - postPatch = '' - substituteInPlace pytest.ini \ - --replace "--cov=kneed" "" - ''; + build-system = [ hatchling ]; - nativeBuildInputs = [ hatchling ]; - - propagatedBuildInputs = [ + dependencies = [ numpy scipy ]; checkInputs = [ pytestCheckHook + pytest-cov-stub matplotlib ]; From c92cf41dae18eb213af21472c8f425bdc9bcf1ac Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:20 +0200 Subject: [PATCH 033/124] python311Packages.libais: modernize --- pkgs/development/python-modules/libais/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index b68c21f7c7cf..df31f4c53fec 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -4,13 +4,14 @@ fetchPypi, pytestCheckHook, pythonOlder, + setuptools, six, }: buildPythonPackage rec { pname = "libais"; version = "0.17"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,12 +20,9 @@ buildPythonPackage rec { hash = "sha256-6yrqIpjF6XaSfXSOTA0B4f3aLcHXkgA/3WBZBBNQ018="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'," "" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ six ]; + dependencies = [ six ]; nativeCheckInputs = [ pytestCheckHook ]; From a6a0905d1f1d713780d4b40c6d58b0804d9460bd Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:20 +0200 Subject: [PATCH 034/124] python311Packages.libpurecool: modernize --- pkgs/development/python-modules/libpurecool/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libpurecool/default.nix b/pkgs/development/python-modules/libpurecool/default.nix index 26b857f0c0b9..5564bb1d22a7 100644 --- a/pkgs/development/python-modules/libpurecool/default.nix +++ b/pkgs/development/python-modules/libpurecool/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, netifaces, paho-mqtt, pycryptodome, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "libpurecool"; version = "0.6.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -24,10 +25,12 @@ buildPythonPackage rec { postPatch = '' rm libpurecool/zeroconf.py substituteInPlace libpurecool/dyson_pure_cool_link.py \ - --replace "from .zeroconf import ServiceBrowser, Zeroconf" "from zeroconf import ServiceBrowser, Zeroconf" + --replace-fail "from .zeroconf import ServiceBrowser, Zeroconf" "from zeroconf import ServiceBrowser, Zeroconf" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ netifaces paho-mqtt pycryptodome From da0073b4cbeced1238282f44547ae37c6fa31bc7 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:21 +0200 Subject: [PATCH 035/124] python311Packages.limnoria: modernize --- pkgs/development/python-modules/limnoria/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index edc94e07471c..4c19f6e772c9 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + setuptools, chardet, cryptography, feedparser, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "limnoria"; version = "2024.5.30"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -26,7 +27,9 @@ buildPythonPackage rec { hash = "sha256-uKJMeC1dXhQp1CGbtdnqmELFO64VWblhABGfpKHGCZQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ chardet cryptography feedparser @@ -40,7 +43,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "version=version" 'version="${version}"' + --replace-fail "version=version" 'version="${version}"' ''; checkPhase = '' From 2571cbf3bac3cf85d080b28384b0de6ab70d2fa7 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:21 +0200 Subject: [PATCH 036/124] python311Packages.markdown-macros: modernize --- .../python-modules/markdown-macros/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix index cc524efb5aa1..aad691159b69 100644 --- a/pkgs/development/python-modules/markdown-macros/default.nix +++ b/pkgs/development/python-modules/markdown-macros/default.nix @@ -3,13 +3,14 @@ buildPythonPackage, fetchPypi, fetchpatch, + setuptools, markdown, }: buildPythonPackage rec { pname = "markdown-macros"; version = "0.1.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -27,10 +28,12 @@ buildPythonPackage rec { ]; prePatch = '' - substituteInPlace setup.py --replace "distribute" "setuptools" + substituteInPlace setup.py --replace-fail "distribute" "setuptools" ''; - propagatedBuildInputs = [ markdown ]; + build-system = [ setuptools ]; + + dependencies = [ markdown ]; doCheck = false; From cdfe7cc796c94706d2b7db35fed03b5f23f542a6 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:22 +0200 Subject: [PATCH 037/124] python311Packages.marshmallow-polyfield: modernize --- .../marshmallow-polyfield/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index 0852091f4774..28fea8cedaf6 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -5,6 +5,7 @@ marshmallow, pythonOlder, pytestCheckHook, + pytest-cov-stub, setuptools, }: @@ -22,16 +23,14 @@ buildPythonPackage rec { hash = "sha256-jbpeyih2Ccw1Rk+QcXRO9AfN5B/DhZmxa/M6FzXHqqs="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=marshmallow_polyfield" "" - ''; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; + dependencies = [ marshmallow ]; - propagatedBuildInputs = [ marshmallow ]; - - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; pythonImportsCheck = [ "marshmallow" ]; From 7b60a1f42e074ad78cbbcb1f9087eff62972854c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:22 +0200 Subject: [PATCH 038/124] python311Packages.matplotlib-sixel: modernize --- .../python-modules/matplotlib-sixel/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib-sixel/default.nix b/pkgs/development/python-modules/matplotlib-sixel/default.nix index ac1b1a256370..98da9405ad1b 100644 --- a/pkgs/development/python-modules/matplotlib-sixel/default.nix +++ b/pkgs/development/python-modules/matplotlib-sixel/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, imagemagick, matplotlib, }: @@ -9,18 +10,20 @@ buildPythonPackage rec { pname = "matplotlib-sixel"; version = "0.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-JXOb1/IacJV8bhDvF+OPs2Yg1tgRDOqwiAQfiSKTlew="; }; - propagatedBuildInputs = [ matplotlib ]; + build-system = [ setuptools ]; + + dependencies = [ matplotlib ]; postPatch = '' substituteInPlace sixel/sixel.py \ - --replace 'Popen(["convert",' 'Popen(["${imagemagick}/bin/convert",' + --replace-fail 'Popen(["convert",' 'Popen(["${imagemagick}/bin/convert",' ''; pythonImportsCheck = [ "sixel" ]; From cef790b54f83db9094a92d3ae1c92ccf14a3d460 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:23 +0200 Subject: [PATCH 039/124] python311Packages.mayim: modernize --- pkgs/development/python-modules/mayim/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mayim/default.nix b/pkgs/development/python-modules/mayim/default.nix index ee383cbb7ca9..49d4a23c80e1 100644 --- a/pkgs/development/python-modules/mayim/default.nix +++ b/pkgs/development/python-modules/mayim/default.nix @@ -11,6 +11,7 @@ # test pytest-asyncio, + pytest-cov-stub, pytestCheckHook, }: @@ -27,16 +28,11 @@ buildPythonPackage rec { hash = "sha256-nb0E9kMEJUihaCp8RnqGh0nSyDQo50eL1C4K5lBPlPQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--cov=src --cov-append --cov-report term-missing" "" - ''; - passthru.optional-dependencies = { postgres = [ psycopg ] ++ psycopg.optional-dependencies.pool; mysql = [ asyncmy ]; @@ -47,6 +43,7 @@ buildPythonPackage rec { [ pytestCheckHook pytest-asyncio + pytest-cov-stub ] ++ (with passthru.optional-dependencies; [ postgres From b4ee2e7b722d0c1b556164263025b79c357edd4e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:23 +0200 Subject: [PATCH 040/124] python311Packages.mesonpep517: modernize --- pkgs/development/python-modules/mesonpep517/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mesonpep517/default.nix b/pkgs/development/python-modules/mesonpep517/default.nix index f47f40e0d1f9..4256dbe6ece4 100644 --- a/pkgs/development/python-modules/mesonpep517/default.nix +++ b/pkgs/development/python-modules/mesonpep517/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mesonpep517"; version = "0.2"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -26,15 +26,15 @@ buildPythonPackage rec { # postPatch = '' substituteInPlace pyproject.toml \ - --replace 'backend-path = "."' 'backend-path = ["."]' + --replace-fail 'backend-path = "."' 'backend-path = ["."]' ''; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ toml ]; + dependencies = [ toml ]; propagatedNativeBuildInputs = [ meson From bbc0431aa7b5df6c3d4118b02a286be8da794532 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:24 +0200 Subject: [PATCH 041/124] python311Packages.mkdocs-jupyter: modernize --- .../python-modules/mkdocs-jupyter/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix index c64987e32a28..f50ed05a643f 100644 --- a/pkgs/development/python-modules/mkdocs-jupyter/default.nix +++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -10,13 +10,14 @@ nbconvert, pygments, pytestCheckHook, + pytest-cov-stub, pythonOlder, }: buildPythonPackage rec { pname = "mkdocs-jupyter"; version = "0.24.8"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,19 +27,11 @@ buildPythonPackage rec { hash = "sha256-Cadi9ITVQNnA6UTTSyjLU2oyhp4iS0YOL8eRsUP3aUA="; }; - postPatch = '' - sed -i "/--cov/d" pyproject.toml - substituteInPlace src/mkdocs_jupyter/tests/test_base_usage.py \ - --replace "[\"mkdocs\"," "[\"${mkdocs.out}/bin/mkdocs\"," - ''; - pythonRelaxDeps = [ "nbconvert" ]; - nativeBuildInputs = [ - hatchling - ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ ipykernel jupytext mkdocs @@ -47,7 +40,10 @@ buildPythonPackage rec { pygments ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; pythonImportsCheck = [ "mkdocs_jupyter" ]; From 715615a6593d1f40dd49bce5e88f73aaf401cc90 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:24 +0200 Subject: [PATCH 042/124] python311Packages.mlrose: modernize --- pkgs/development/python-modules/mlrose/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index fa12508f522e..284222299cd3 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + setuptools, scikit-learn, pytestCheckHook, pytest-randomly, @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "mlrose"; version = "1.3.0"; - format = "setuptools"; + pyproject = true; disabled = isPy27; src = fetchFromGitHub { @@ -30,14 +31,15 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ scikit-learn ]; + build-system = [ setuptools ]; + dependencies = [ scikit-learn ]; nativeCheckInputs = [ pytest-randomly pytestCheckHook ]; postPatch = '' - substituteInPlace setup.py --replace sklearn scikit-learn + substituteInPlace setup.py --replace-fail sklearn scikit-learn ''; pythonImportsCheck = [ "mlrose" ]; From 63d0510f7cc1dfc43822d3f09bbe14459ab583ef Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:25 +0200 Subject: [PATCH 043/124] python311Packages.monai-deploy: modernize --- pkgs/development/python-modules/monai-deploy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/monai-deploy/default.nix b/pkgs/development/python-modules/monai-deploy/default.nix index d5a1c315d495..f719b47cf8b3 100644 --- a/pkgs/development/python-modules/monai-deploy/default.nix +++ b/pkgs/development/python-modules/monai-deploy/default.nix @@ -31,15 +31,15 @@ buildPythonPackage rec { # Asked in https://github.com/Project-MONAI/monai-deploy-app-sdk/issues/450 # if this patch can be incorporated upstream. substituteInPlace pyproject.toml \ - --replace 'versioneer-518' 'versioneer' + --replace-fail 'versioneer-518' 'versioneer' ''; - nativeBuildInputs = [ + build-system = [ versioneer setuptools ]; - propagatedBuildInputs = [ + dependencies = [ numpy networkx colorama From 9e4692ca288ae3f03c9a6b65e3d97ae462551ab2 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:26 +0200 Subject: [PATCH 044/124] python311Packages.nameko: modernize --- pkgs/development/python-modules/nameko/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nameko/default.nix b/pkgs/development/python-modules/nameko/default.nix index b5d445c33f44..11730ac66487 100644 --- a/pkgs/development/python-modules/nameko/default.nix +++ b/pkgs/development/python-modules/nameko/default.nix @@ -32,12 +32,12 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace setup.py --replace "path.py" "path" + substituteInPlace setup.py --replace-fail "path.py" "path" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ dnspython eventlet kombu From 52e111e252db4901945aa7c7bc4a600ba76f859d Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:26 +0200 Subject: [PATCH 045/124] python311Packages.niworkflows: modernize --- pkgs/development/python-modules/niworkflows/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix index d6eb920d36d4..1816cdbd20a3 100644 --- a/pkgs/development/python-modules/niworkflows/default.nix +++ b/pkgs/development/python-modules/niworkflows/default.nix @@ -40,16 +40,14 @@ buildPythonPackage rec { hash = "sha256-29ZxLuKrvgCIOMMCUpi0HHhlNlgqUrUrSCiikwecmKw="; }; - postPatch = '' - substituteInPlace pyproject.toml --replace '"traits < 6.4"' '"traits"' - ''; + pythonRelaxDeps = [ "traits" ]; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ attrs importlib-resources jinja2 From 48b72b80d96e14c6ad8215eed249a2de49b36860 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:27 +0200 Subject: [PATCH 046/124] python311Packages.nix-kernel: modernize --- .../python-modules/nix-kernel/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/nix-kernel/default.nix b/pkgs/development/python-modules/nix-kernel/default.nix index 5c4b270d2e7a..a14a12b5b4f0 100644 --- a/pkgs/development/python-modules/nix-kernel/default.nix +++ b/pkgs/development/python-modules/nix-kernel/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, isPy3k, pexpect, notebook, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "nix-kernel"; version = "unstable-2020-04-26"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; @@ -24,14 +25,16 @@ buildPythonPackage rec { postPatch = '' substituteInPlace nix-kernel/kernel.py \ - --replace "'nix'" "'${nix}/bin/nix'" \ - --replace "'nix repl'" "'${nix}/bin/nix repl'" + --replace-fail "'nix'" "'${nix}/bin/nix'" \ + --replace-fail "'nix repl'" "'${nix}/bin/nix repl'" substituteInPlace setup.py \ - --replace "cmdclass={'install': install_with_kernelspec}," "" + --replace-fail "cmdclass={'install': install_with_kernelspec}," "" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pexpect notebook ]; From 8da2253393b05ecbc5ec1e86e7a28847ff4b5f56 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:27 +0200 Subject: [PATCH 047/124] python311Packages.packet-python: modernize --- .../development/python-modules/packet-python/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index bc50624aa03b..631248fe8bad 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -4,6 +4,7 @@ fetchPypi, pytestCheckHook, pythonOlder, + setuptools, requests, requests-mock, }: @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "packet-python"; version = "1.44.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,10 +23,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "pytest-runner" "" + --replace-fail "pytest-runner" "" ''; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook From 12ebc22f045c1210e28cf82196070129bba5c17e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:28 +0200 Subject: [PATCH 048/124] python311Packages.pglast: modernize --- .../development/python-modules/pglast/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index edf70ea2cb9d..02a11e0f01a7 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -5,12 +5,13 @@ pythonOlder, setuptools, pytest, + pytest-cov-stub, }: buildPythonPackage rec { pname = "pglast"; version = "6.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,14 +20,14 @@ buildPythonPackage rec { hash = "sha256-mGP7o52Wun6AdE2jMAJBmLR10EmN50qzbMzB06BFXMg="; }; - propagatedBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=pglast --cov-report term-missing" "" - ''; + dependencies = [ setuptools ]; - nativeCheckInputs = [ pytest ]; + nativeCheckInputs = [ + pytest + pytest-cov-stub + ]; # pytestCheckHook doesn't work # ImportError: cannot import name 'parse_sql' from 'pglast' From 47487997b86f8e49902c2dd4efd5b27a2e8e8148 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:28 +0200 Subject: [PATCH 049/124] python311Packages.pika-pool: modernize --- pkgs/development/python-modules/pika-pool/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix index 42b52c525853..1a458de4076a 100644 --- a/pkgs/development/python-modules/pika-pool/default.nix +++ b/pkgs/development/python-modules/pika-pool/default.nix @@ -2,27 +2,28 @@ lib, buildPythonPackage, fetchPypi, + setuptools, pika, }: buildPythonPackage rec { pname = "pika-pool"; version = "0.1.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "f3985888cc2788cdbd293a68a8b5702a9c955db6f7b8b551aeac91e7f32da397"; }; - postPatch = '' - substituteInPlace setup.py --replace "pika >=0.9,<0.11" "pika" - ''; + pythonRelaxDeps = [ "pika" ]; + + build-system = [ setuptools ]; # Tests require database connections doCheck = false; - propagatedBuildInputs = [ pika ]; + dependencies = [ pika ]; meta = with lib; { homepage = "https://github.com/bninja/pika-pool"; license = licenses.bsdOriginal; From 4fe439e48c4be86a54b730c4c570029a1dfeb1c8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:28 +0200 Subject: [PATCH 050/124] python311Packages.podcats: modernize --- pkgs/development/python-modules/podcats/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix index e8069792072b..f95fb719212f 100644 --- a/pkgs/development/python-modules/podcats/default.nix +++ b/pkgs/development/python-modules/podcats/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, flask, mutagen, }: @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "podcats"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jakubroztocil"; @@ -18,12 +19,14 @@ buildPythonPackage rec { sha256 = "0zjdgry5n209rv19kj9yaxy7c7zq5gxr488izrgs4sc75vdzz8xc"; }; - patchPhase = '' + postPatch = '' substituteInPlace podcats.py \ - --replace 'debug=True' 'debug=True, use_reloader=False' + --replace-fail 'debug=True' 'debug=True, use_reloader=False' ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ flask mutagen ]; From 3acdcfb661d5e2f63c717f3f987e288f0e3d9dc1 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:23 +0200 Subject: [PATCH 051/124] python311Packages.boiboite-opener-framework: modernize --- .../python-modules/boiboite-opener-framework/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/boiboite-opener-framework/default.nix b/pkgs/development/python-modules/boiboite-opener-framework/default.nix index d9936a7593e9..9be58802c5e3 100644 --- a/pkgs/development/python-modules/boiboite-opener-framework/default.nix +++ b/pkgs/development/python-modules/boiboite-opener-framework/default.nix @@ -23,10 +23,7 @@ buildPythonPackage rec { hash = "sha256-atKqHRX24UjF/9Dy0aYXAN+80nBJKCd07FmaR5Vl1q4="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "scapy==2.5.0rc1" "scapy" - ''; + pythonRelaxDeps = [ "scapy" ]; build-system = [ setuptools ]; From cf6dbb6012ada570bdb00fca1673d563bf8371bd Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:23 +0200 Subject: [PATCH 052/124] python311Packages.celery-singleton: modernize --- .../development/python-modules/celery-singleton/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/celery-singleton/default.nix b/pkgs/development/python-modules/celery-singleton/default.nix index de011ca70d0b..3d75770e932a 100644 --- a/pkgs/development/python-modules/celery-singleton/default.nix +++ b/pkgs/development/python-modules/celery-singleton/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "celery-singleton"; version = "0.3.1"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "steinitzu"; @@ -33,9 +33,9 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ celery redis ]; From e42259283bb8990b4f234b4fc748976813332c1c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:23 +0200 Subject: [PATCH 053/124] python311Packages.cemm: modernize --- pkgs/development/python-modules/cemm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cemm/default.nix b/pkgs/development/python-modules/cemm/default.nix index 83ff151d7c8b..39159b404162 100644 --- a/pkgs/development/python-modules/cemm/default.nix +++ b/pkgs/development/python-modules/cemm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cemm"; version = "0.5.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -38,12 +38,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace '"0.0.0"' '"${version}"' + --replace-fail '"0.0.0"' '"${version}"' ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp yarl ]; From f4f419f03f8426897b1836daa032a38b5d769926 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:24 +0200 Subject: [PATCH 054/124] python311Packages.ciscoconfparse: modernize --- .../python-modules/ciscoconfparse/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix index 1643c6acfa47..478591d51df3 100644 --- a/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "ciscoconfparse"; version = "1.7.24"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mpenning"; - repo = pname; + repo = "ciscoconfparse"; rev = "refs/tags/${version}"; hash = "sha256-vL/CQdYcOP356EyRToviWylP1EBtxmeov6qkhfQNZ2Y="; }; @@ -35,16 +35,14 @@ buildPythonPackage rec { sed -i '/requires-python/d' pyproject.toml substituteInPlace pyproject.toml \ - --replace '"poetry>=1.3.2",' "" + --replace-fail '"poetry>=1.3.2",' "" patchShebangs tests ''; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ passlib deprecat dnspython From 387a8f0d6eb141e6ddf262555bbba4eb45428849 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:24 +0200 Subject: [PATCH 055/124] python311Packages.databricks-connect: modernize --- .../python-modules/databricks-connect/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 89e85bcd7b0b..7f06b59df3e2 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -3,6 +3,7 @@ jdk8, buildPythonPackage, fetchPypi, + setuptools, six, py4j, pythonOlder, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "databricks-connect"; version = "11.3.33"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +23,9 @@ buildPythonPackage rec { sourceRoot = "."; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ py4j six jdk8 @@ -31,14 +34,11 @@ buildPythonPackage rec { # requires network access doCheck = false; - prePatch = '' - substituteInPlace setup.py \ - --replace "py4j==0.10.9" "py4j" - ''; + pythonRelaxDeps = [ "py4j" ]; preFixup = '' substituteInPlace "$out/bin/find-spark-home" \ - --replace find_spark_home.py .find_spark_home.py-wrapped + --replace-fail find_spark_home.py .find_spark_home.py-wrapped ''; pythonImportsCheck = [ From 745861dc21ea4893421105e456d130a6179f0d0c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:24 +0200 Subject: [PATCH 056/124] python311Packages.django-payments: modernize --- .../python-modules/django-payments/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django-payments/default.nix b/pkgs/development/python-modules/django-payments/default.nix index 714bc0253bfe..935808b32c79 100644 --- a/pkgs/development/python-modules/django-payments/default.nix +++ b/pkgs/development/python-modules/django-payments/default.nix @@ -9,6 +9,7 @@ mercadopago, pythonOlder, requests, + setuptools, setuptools-scm, sphinx-rtd-theme, stripe, @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "django-payments"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -31,12 +32,15 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "django-phonenumber-field[phonenumberslite]" "django-phonenumber-field" + --replace-fail "django-phonenumber-field[phonenumberslite]" "django-phonenumber-field" ''; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ django django-phonenumber-field requests From 9007b0b8fc5f326f94fc153e1c48db5282c24879 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:25 +0200 Subject: [PATCH 057/124] python311Packages.django-scim2: modernize --- .../python-modules/django-scim2/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/django-scim2/default.nix b/pkgs/development/python-modules/django-scim2/default.nix index 2c9c2922f481..bb4b5d7c508c 100644 --- a/pkgs/development/python-modules/django-scim2/default.nix +++ b/pkgs/development/python-modules/django-scim2/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "django-scim2"; version = "0.19.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "15five"; - repo = pname; + repo = "django-scim2"; rev = "refs/tags/${version}"; hash = "sha256-larDh4f9/xVr11/n/WfkJ2Tx45DMQqyK3ZzkWAvzeig="; }; @@ -31,13 +31,13 @@ buildPythonPackage rec { # remove this when upstream releases a new version > 0.19.0 postPatch = '' substituteInPlace pyproject.toml \ - --replace "poetry>=0.12" "poetry-core>=1.5.2" \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" + --replace-fail "poetry>=0.12" "poetry-core>=1.5.2" \ + --replace-fail "poetry.masonry.api" "poetry.core.masonry.api" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ django scim2-filter-parser ]; From 8d6345577a61cf173711de7ae9a755023dd26869 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:25 +0200 Subject: [PATCH 058/124] python311Packages.eiswarnung: modernize --- .../python-modules/eiswarnung/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix index 0806d423a4b8..ff5fb07f11c0 100644 --- a/pkgs/development/python-modules/eiswarnung/default.nix +++ b/pkgs/development/python-modules/eiswarnung/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, pytz, @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "eiswarnung"; version = "2.0.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.11"; @@ -30,14 +31,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace '"0.0.0"' '"${version}"' \ - --replace 'addopts = "--cov"' "" \ - --replace 'pytz = ">=2022.7.1,<2024.0.0"' 'pytz = "*"' + --replace-fail '"0.0.0"' '"${version}"' ''; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ "pytz" ]; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ aiohttp pytz yarl @@ -46,6 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; From 0b0107407342ee4f2ec16077c131723c285a76ee Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:25 +0200 Subject: [PATCH 059/124] python311Packages.entrance: modernize --- pkgs/development/python-modules/entrance/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix index 121c57a89106..960e629d1474 100644 --- a/pkgs/development/python-modules/entrance/default.nix +++ b/pkgs/development/python-modules/entrance/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, pythonOlder, routerFeatures, + setuptools, janus, ncclient, paramiko, @@ -18,7 +19,7 @@ let if routerFeatures then { prePatch = '' - substituteInPlace ./setup.py --replace "extra_deps = []" "extra_deps = router_feature_deps" + substituteInPlace ./setup.py --replace-fail "extra_deps = []" "extra_deps = router_feature_deps" ''; extraBuildInputs = [ janus @@ -36,7 +37,7 @@ in buildPythonPackage rec { pname = "entrance"; version = "1.1.20"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -49,7 +50,9 @@ buildPythonPackage rec { # No useful tests doCheck = false; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyyaml sanic ] ++ opts.extraBuildInputs; From e186dcb118a29945b9b1064dd38f4d0357923487 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:25 +0200 Subject: [PATCH 060/124] python311Packages.envoy-reader: modernize --- .../python-modules/envoy-reader/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/envoy-reader/default.nix b/pkgs/development/python-modules/envoy-reader/default.nix index 3f91c0c69e6a..46a8249d9e2f 100644 --- a/pkgs/development/python-modules/envoy-reader/default.nix +++ b/pkgs/development/python-modules/envoy-reader/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, envoy-utils, fetchFromGitHub, + setuptools, httpx, pyjwt, pytest-asyncio, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "envoy-reader"; version = "0.21.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +28,9 @@ buildPythonPackage rec { hash = "sha256-aIpZ4ln4L57HwK8H0FqsyNnXosnAp3ingrJI6/MPS90="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ beautifulsoup4 envoy-utils httpx @@ -41,10 +44,11 @@ buildPythonPackage rec { respx ]; + pythonRelaxDeps = [ "pyjwt" ]; + postPatch = '' substituteInPlace setup.py \ - --replace "pytest-runner>=5.2" "" \ - --replace "pyjwt==2.1.0" "pyjwt>=2.1.0" + --replace-fail "pytest-runner>=5.2" "" ''; pythonImportsCheck = [ "envoy_reader" ]; From 21d6cb90b1d7a2400cdfa6b0ee6017f1256ff046 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:26 +0200 Subject: [PATCH 061/124] python311Packages.fastapi-mail: modernize --- .../python-modules/fastapi-mail/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index feb52ac8b3f1..16a3e0c67666 100644 --- a/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/pkgs/development/python-modules/fastapi-mail/default.nix @@ -33,16 +33,19 @@ buildPythonPackage rec { hash = "sha256-2iTZqZIxlt1GKhElasTcnys18UbNNDwHoZziHBOIGBo="; }; + pythonRelaxDeps = [ + "aiosmtplib" + "pydantic" + ]; + postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "1.2.5"' 'version = "${version}"' \ - --replace 'aiosmtplib = "^2.0"' 'aiosmtplib = "*"' \ - --replace 'pydantic = "^2.0"' 'pydantic = "*"' \ + --replace-fail 'version = "1.2.5"' 'version = "${version}"' ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aioredis aiosmtplib blinker From 4aa4bc22f2b57b743599cdbc0f5406a44b897a67 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:26 +0200 Subject: [PATCH 062/124] python311Packages.fhir-py: modernize --- pkgs/development/python-modules/fhir-py/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/fhir-py/default.nix b/pkgs/development/python-modules/fhir-py/default.nix index 6e156e7da72b..f03666938c48 100644 --- a/pkgs/development/python-modules/fhir-py/default.nix +++ b/pkgs/development/python-modules/fhir-py/default.nix @@ -9,6 +9,7 @@ requests, pytestCheckHook, pytest-asyncio, + pytest-cov-stub, responses, }: @@ -26,15 +27,9 @@ buildPythonPackage rec { hash = "sha256-kYqoRso1ypN5novRxMMzz1h2NGNybbw5lK4+HErG79I="; }; - preBuild = '' - substituteInPlace pyproject.toml \ - --replace "--cov=fhirpy" "" \ - --replace "--cov-report=xml" "" - ''; + build-system = [ flit-core ]; - nativeBuildInputs = [ flit-core ]; - - propagatedBuildInputs = [ + dependencies = [ aiohttp pytz requests @@ -43,6 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-asyncio + pytest-cov-stub responses ]; From bd15d3a0e9fa186684e111f1257f07782c686435 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:26 +0200 Subject: [PATCH 063/124] python311Packages.finvizfinance: modernize --- .../python-modules/finvizfinance/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/finvizfinance/default.nix b/pkgs/development/python-modules/finvizfinance/default.nix index 7e0ad12fd798..0c3ff788d468 100644 --- a/pkgs/development/python-modules/finvizfinance/default.nix +++ b/pkgs/development/python-modules/finvizfinance/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + setuptools, beautifulsoup4, datetime, lxml, @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "finvizfinance"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.5"; @@ -26,17 +27,14 @@ buildPythonPackage rec { hash = "sha256-4aR1x9GgbxnJUpn1+i95djZEVBFTAIzhMLxHe2FaciY="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "bs4" "beautifulsoup4" - ''; + build-system = [ setuptools ]; nativeCheckInputs = [ pytest-mock pytestCheckHook ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 datetime lxml From 189b5c25812b32fb010a0e1599bb1a0833eb3e5b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:26 +0200 Subject: [PATCH 064/124] python311Packages.flake8-future-import: modernize --- .../python-modules/flake8-future-import/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 88d7f959b89a..8ea9f8c7d73d 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -6,6 +6,7 @@ isPy38, isPy39, pythonAtLeast, + setuptools, flake8, six, python, @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "flake8-future-import"; version = "0.4.7"; - format = "setuptools"; + pyproject = true; # PyPI tarball doesn't include the test suite src = fetchFromGitHub { @@ -36,10 +37,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace "test_flake8_future_import.py" \ - --replace "'flake8'" "'${lib.getExe flake8}'" + --replace-fail "'flake8'" "'${lib.getExe flake8}'" ''; - propagatedBuildInputs = [ flake8 ]; + build-system = [ setuptools ]; + + dependencies = [ flake8 ]; nativeCheckInputs = [ six ]; From 6586493ba472ebf692c47ad2d8460266daa05586 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:27 +0200 Subject: [PATCH 065/124] python311Packages.flake8-polyfill: modernize --- .../python-modules/flake8-polyfill/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flake8-polyfill/default.nix b/pkgs/development/python-modules/flake8-polyfill/default.nix index 0c912cd7005b..faf3c0bdb030 100644 --- a/pkgs/development/python-modules/flake8-polyfill/default.nix +++ b/pkgs/development/python-modules/flake8-polyfill/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchpatch, fetchPypi, + setuptools, flake8, mock, pep8, @@ -12,14 +13,16 @@ buildPythonPackage rec { pname = "flake8-polyfill"; version = "1.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4"; }; - propagatedBuildInputs = [ flake8 ]; + build-system = [ setuptools ]; + + dependencies = [ flake8 ]; nativeCheckInputs = [ mock @@ -39,7 +42,7 @@ buildPythonPackage rec { postPatch = '' # Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead. substituteInPlace setup.cfg \ - --replace pytest 'tool:pytest' + --replace-fail pytest 'tool:pytest' ''; pythonImportsCheck = [ "flake8_polyfill" ]; From fc93476f31531f2f81e15e8b9aa79e62b68b0de5 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 03:59:27 +0200 Subject: [PATCH 066/124] python311Packages.flask-gravatar: modernize --- .../python-modules/flask-gravatar/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/flask-gravatar/default.nix b/pkgs/development/python-modules/flask-gravatar/default.nix index 9194a9436ac6..81a29a3c56fa 100644 --- a/pkgs/development/python-modules/flask-gravatar/default.nix +++ b/pkgs/development/python-modules/flask-gravatar/default.nix @@ -12,13 +12,14 @@ # tests pytestCheckHook, + pytest-cov-stub, pygments, }: buildPythonPackage rec { pname = "flask-gravatar"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "Flask-Gravatar"; @@ -39,18 +40,18 @@ buildPythonPackage rec { -e "s|tests_require=tests_require,||g" \ -e "s|extras_require=extras_require,||g" \ -e "s|setup_requires=setup_requires,||g" - # pep8 is deprecated and cov not needed + # pep8 is deprecated substituteInPlace pytest.ini \ - --replace "--pep8" "" \ - --replace "--cov=flask_gravatar --cov-report=term-missing" "" + --replace-fail "--pep8" "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ flask ]; + dependencies = [ flask ]; nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub pygments ]; From 40ab48a98d4d1d7c33cb7fef78fe8cc83c8ac835 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Aug 2024 16:53:12 +0000 Subject: [PATCH 067/124] python312Packages.license-expression: 30.3.0 -> 30.3.1 --- .../development/python-modules/license-expression/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index 3cf9532d3923..67170c5965fd 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "license-expression"; - version = "30.3.0"; + version = "30.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "nexB"; repo = "license-expression"; rev = "refs/tags/v${version}"; - hash = "sha256-nHqfnetVyz4W2Q6onH0mU/4x9e/vD4rbl9DF4TYqWzs="; + hash = "sha256-+hINYDfUrNsCmXOIa4XO/ML1fJoB8/n6iQ4UGdw5ClE="; }; dontConfigure = true; From 04bae32729e8fbf5c3e697d4650775aca05349a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Aug 2024 12:02:24 +0200 Subject: [PATCH 068/124] python312Packages.license-expression: refactor --- .../development/python-modules/license-expression/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index 67170c5965fd..7e2233034389 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -24,9 +24,9 @@ buildPythonPackage rec { dontConfigure = true; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ boolean-py ]; + dependencies = [ boolean-py ]; nativeCheckInputs = [ pytestCheckHook ]; From 1b6efd0fca4d6960e5b1a0a751855efd308b7e7b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 25 Jul 2024 08:05:09 +0200 Subject: [PATCH 069/124] python312Packages.torch: 2.3.0 -> 2.4.0 Diff: https://github.com/pytorch/pytorch/compare/v2.3.1...v2.4.0 Changelog: https://github.com/pytorch/pytorch/releases/tag/v2.4.0 Co-authored-by: =?UTF-8?q?Danie=CC=88l=20de=20Kok?= Co-authored-by: Connor Baker --- .../python-modules/torch/default.nix | 32 ++++++---- .../torch/fix-cmake-cuda-toolkit.patch | 60 ++++--------------- .../passthrough-python-lib-rel-path.patch | 12 ++++ 3 files changed, 45 insertions(+), 59 deletions(-) create mode 100644 pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index afc1fd6e74e1..bd6b1b262837 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -99,7 +99,7 @@ let setBool = v: if v then "1" else "0"; - # https://github.com/pytorch/pytorch/blob/v2.0.1/torch/utils/cpp_extension.py#L1744 + # https://github.com/pytorch/pytorch/blob/v2.4.0/torch/utils/cpp_extension.py#L1953 supportedTorchCudaCapabilities = let real = [ @@ -119,6 +119,7 @@ let "8.7" "8.9" "9.0" + "9.0a" ]; ptx = lists.map (x: "${x}+PTX") real; in @@ -206,13 +207,14 @@ let # In particular, this triggered warnings from cuda's `aliases.nix` "Magma cudaPackages does not match cudaPackages" = cudaSupport && (effectiveMagma.cudaPackages.cudaVersion != cudaPackages.cudaVersion); - "Rocm support is currently broken because `rocmPackages.hipblaslt` is unpackaged. (2024-06-09)" = rocmSupport; + "Rocm support is currently broken because `rocmPackages.hipblaslt` is unpackaged. (2024-06-09)" = + rocmSupport; }; in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "2.3.1"; + version = "2.4.0"; pyproject = true; disabled = pythonOlder "3.8.0"; @@ -230,11 +232,16 @@ buildPythonPackage rec { repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-vpgtOqzIDKgRuqdT8lB/g6j+oMIH1RPxdbjtlzZFjV8="; + hash = "sha256-s49rtarGNNFpnNG+kfJtZLE8ND53Ma201I0cOjeFSts="; }; patches = - lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ] + [ + # Allow setting PYTHON_LIB_REL_PATH with an environment variable. + # https://github.com/pytorch/pytorch/pull/128419 + ./passthrough-python-lib-rel-path.patch + ] + ++ lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ # pthreadpool added support for Grand Central Dispatch in April # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) @@ -279,11 +286,12 @@ buildPythonPackage rec { 'message(FATAL_ERROR "Found NCCL header version and library version' \ 'message(WARNING "Found NCCL header version and library version' '' - # Remove PyTorch's FindCUDAToolkit.cmake and to use CMake's default. - # We do not remove the entirety of cmake/Modules_CUDA_fix because we need FindCUDNN.cmake. + # Remove PyTorch's FindCUDAToolkit.cmake and use CMake's default. + # NOTE: Parts of pytorch rely on unmaintained FindCUDA.cmake with custom patches to support e.g. + # newer architectures (sm_90a). We do want to delete vendored patches, but have to keep them + # until https://github.com/pytorch/pytorch/issues/76082 is addressed + lib.optionalString cudaSupport '' rm cmake/Modules/FindCUDAToolkit.cmake - rm -rf cmake/Modules_CUDA_fix/{upstream,FindCUDA.cmake} '' # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc' # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header. @@ -375,6 +383,10 @@ buildPythonPackage rec { USE_SYSTEM_NCCL = USE_NCCL; USE_STATIC_NCCL = USE_NCCL; + # Set the correct Python library path, broken since + # https://github.com/pytorch/pytorch/commit/3d617333e + PYTHON_LIB_REL_PATH = "${placeholder "out"}/${python.sitePackages}"; + # Suppress a weird warning in mkl-dnn, part of ideep in pytorch # (upstream seems to have fixed this in the wrong place?) # https://github.com/intel/mkl-dnn/commit/8134d346cdb7fe1695a2aa55771071d455fae0bc @@ -466,9 +478,7 @@ buildPythonPackage rec { libcusolver libcusparse ] - ++ lists.optionals (cudaPackages ? cudnn) [ - cudnn - ] + ++ lists.optionals (cudaPackages ? cudnn) [ cudnn ] ++ lists.optionals useSystemNccl [ # Some platforms do not support NCCL (i.e., Jetson) nccl # Provides nccl.h AND a static copy of NCCL! diff --git a/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch b/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch index 45587d3fe7b9..9767d8fee308 100644 --- a/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch +++ b/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch @@ -1,51 +1,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9194e520bb0..d05fdcfb6cb 100644 +index c4cd4b2c2a..e983b21353 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1160,10 +1160,6 @@ if(BUILD_SHARED_LIBS) - ${PROJECT_SOURCE_DIR}/cmake/Modules_CUDA_fix - DESTINATION share/cmake/Caffe2/ - COMPONENT dev) -- install(FILES -- ${PROJECT_SOURCE_DIR}/cmake/Modules/FindCUDAToolkit.cmake -- DESTINATION share/cmake/Caffe2/ -- COMPONENT dev) - install(FILES - ${PROJECT_SOURCE_DIR}/cmake/Modules/FindCUSPARSELT.cmake - DESTINATION share/cmake/Caffe2/ -diff --git a/cmake/public/cuda.cmake b/cmake/public/cuda.cmake -index c7595774d81..4fc43771810 100644 ---- a/cmake/public/cuda.cmake -+++ b/cmake/public/cuda.cmake -@@ -61,9 +61,15 @@ find_package(CUDAToolkit REQUIRED) - cmake_policy(POP) - - if(NOT CMAKE_CUDA_COMPILER_VERSION VERSION_EQUAL CUDAToolkit_VERSION) -- message(FATAL_ERROR "Found two conflicting CUDA versions:\n" -- "V${CMAKE_CUDA_COMPILER_VERSION} in '${CUDA_INCLUDE_DIRS}' and\n" -- "V${CUDAToolkit_VERSION} in '${CUDAToolkit_INCLUDE_DIRS}'") -+ if(CUDA_INCLUDE_DIRS IN_LIST CUDAToolkit_INCLUDE_DIR) -+ message(STATUS "CUDA_INCLUDE_DIRS is a substring of CUDAToolkit_INCLUDE_DIR. " -+ "Setting CUDA_INCLUDE_DIRS to CUDAToolkit_INCLUDE_DIR.") -+ set(CUDA_INCLUDE_DIRS "${CUDAToolkit_INCLUDE_DIR}") -+ else() -+ message(FATAL_ERROR "Found two conflicting CUDA installs:\n" -+ "V${CMAKE_CUDA_COMPILER_VERSION} in '${CUDA_INCLUDE_DIRS}' and\n" -+ "V${CUDAToolkit_VERSION} in '${CUDAToolkit_INCLUDE_DIR}'") -+ endif() - endif() - - if(NOT TARGET CUDA::nvToolsExt) -diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py -index fb19b66dfba..3f83bef32fe 100644 ---- a/tools/setup_helpers/cmake.py -+++ b/tools/setup_helpers/cmake.py -@@ -207,6 +207,8 @@ class CMake: - "BUILDING_WITH_TORCH_LIBS", - "CUDA_HOST_COMPILER", - "CUDA_NVCC_EXECUTABLE", -+ "CUDAToolkit_ROOT", -+ "CUDAToolkit_INCLUDE_DIR", - "CUDA_SEPARABLE_COMPILATION", - "CUDNN_LIBRARY", - "CUDNN_INCLUDE_DIR", +@@ -1319,10 +1319,6 @@ if(BUILD_SHARED_LIBS) + DIRECTORY ${PROJECT_SOURCE_DIR}/cmake/Modules_CUDA_fix + DESTINATION share/cmake/Caffe2/ + COMPONENT dev) +- install( +- FILES ${PROJECT_SOURCE_DIR}/cmake/Modules/FindCUDAToolkit.cmake +- DESTINATION share/cmake/Caffe2/ +- COMPONENT dev) + install( + FILES ${PROJECT_SOURCE_DIR}/cmake/Modules/FindCUSPARSELT.cmake + DESTINATION share/cmake/Caffe2/ diff --git a/pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch b/pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch new file mode 100644 index 000000000000..629a0495c00e --- /dev/null +++ b/pkgs/development/python-modules/torch/passthrough-python-lib-rel-path.patch @@ -0,0 +1,12 @@ +diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py +index 5481ce46031c..d50d9d547399 100644 +--- a/tools/setup_helpers/cmake.py ++++ b/tools/setup_helpers/cmake.py +@@ -231,6 +231,7 @@ def generate( + "SELECTED_OP_LIST", + "TORCH_CUDA_ARCH_LIST", + "TRACING_BASED", ++ "PYTHON_LIB_REL_PATH", + ) + } + ) From b9561928f623e79419fb47add2a6fd9c6a20a085 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 25 Jul 2024 08:16:20 +0200 Subject: [PATCH 070/124] python311Packages.torch-bin: 2.3.0 -> 2.4.0 Diff: https://github.com/pytorch/pytorch/compare/v2.3.1...v2.4.0 Changelog: https://github.com/pytorch/pytorch/releases/tag/v2.4.0 --- pkgs/development/python-modules/torch/bin.nix | 8 +- .../python-modules/torch/binary-hashes.nix | 92 +++++++++---------- 2 files changed, 51 insertions(+), 49 deletions(-) diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index a10be3732efa..4ecaac16be18 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -28,7 +28,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.3.1"; + version = "2.4.0"; in buildPythonPackage { inherit version; @@ -102,7 +102,9 @@ buildPythonPackage { # # This is a quick hack to add `libnvrtc` to the runpath so that torch can find # it when it is needed at runtime. - extraRunpaths = lib.optionals stdenv.hostPlatform.isLinux [ "${lib.getLib cudaPackages.cuda_nvrtc}/lib" ]; + extraRunpaths = lib.optionals stdenv.hostPlatform.isLinux [ + "${lib.getLib cudaPackages.cuda_nvrtc}/lib" + ]; postPhases = lib.optionals stdenv.isLinux [ "postPatchelfPhase" ]; postPatchelfPhase = '' while IFS= read -r -d $'\0' elf ; do @@ -120,7 +122,7 @@ buildPythonPackage { pythonImportsCheck = [ "torch" ]; - passthru.tests = callPackage ./tests.nix {}; + passthru.tests = callPackage ./tests.nix { }; meta = { description = "PyTorch: Tensors and Dynamic neural networks in Python with strong GPU acceleration"; diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index 8d41a4c1eeca..8a2cbc2ffa9c 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.3.1" = { + "2.4.0" = { x86_64-linux-38 = { - name = "torch-2.3.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.3.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-TkEPNC/YbHO+oO0kVQnV/15od72lSySfdaM9U1yHfy8="; + name = "torch-2.4.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-ikebcXQK+SpOG5kEW+qDHz2nMYfIw+PSErHm/jkxWyE="; }; x86_64-linux-39 = { - name = "torch-2.3.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.3.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-3+phA2LA4qX/KNMi1qpl1l4D4TNJlhGaWjdwx9GCGsQ="; + name = "torch-2.4.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-iIObriuWfdOFeaqwu6lRDpKxHau8Th3V5jDF/WVfXac="; }; x86_64-linux-310 = { - name = "torch-2.3.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.3.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-8N610vkypo7VRiW6FA7dvyryK+l47hm5tjyYat1kJbI="; + name = "torch-2.4.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-KL+6CE3KUqBsRl160PPMNyw1/FA/PquIHMF6X9gpFOc="; }; x86_64-linux-311 = { - name = "torch-2.3.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.3.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-kl40rwkFBipItPgtDmZWNBrU1iaDSmqCRe9OruU3XJg="; + name = "torch-2.4.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-qf/zLTZeDHS2kJSAVIsuKRMUogStsptrtvLG0z+L4mw="; }; x86_64-linux-312 = { - name = "torch-2.3.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.3.1%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-s8WG9Ksl6D7//M+5cHnpEyUym8IoFmVVxLuTlXdT1Oo="; + name = "torch-2.4.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.4.0%2Bcu121-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-SaxVpkl93W0M3VG16ifY6+IMknMHeFXpyW6w3CifB8M="; }; aarch64-darwin-38 = { - name = "torch-2.3.1-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-vuC9M9xYqo/Ip1J4dum5oOgSrQgSIFSlv/LOWr8AWxA="; + name = "torch-2.4.0-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-OvTeKmGPsGXnhATEuieoGKe3lX6u/yjGxmzn+1BLaLg="; }; aarch64-darwin-39 = { - name = "torch-2.3.1-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-K7WveAxVvmj+EA/rBSjS7eus4dVcsuNR3nNYCbpzkes="; + name = "torch-2.4.0-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-iUD8i5ekxh/bXUajaPIfSjpWKheHnpMutRpexiMQyzE="; }; aarch64-darwin-310 = { - name = "torch-2.3.1-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-fAmpQ2J3hChIS8+ZX2AEsElSEGruDvRf8LS6tIT1SY0="; + name = "torch-2.4.0-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-aFQYq5NzDvvucVKIIf9UAFWWlw3Ul78DyJIE+34/cd4="; }; aarch64-darwin-311 = { - name = "torch-2.3.1-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-p91O04itHz1QK/CUU9X+WWx7Eh3n4M+soeIBd4Lpu6w="; + name = "torch-2.4.0-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-8Wm06m3JOzozMZYR/MR9wUBuTdU5hE3L0t7EwbluFm0="; }; aarch64-darwin-312 = { - name = "torch-2.3.1-cp312-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp312-none-macosx_11_0_arm64.whl"; - hash = "sha256-PDM9wuvBiVYVFO2gboHfIr+Ptk4jhHRrLLnwT5bR1Mg="; + name = "torch-2.4.0-cp312-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp312-none-macosx_11_0_arm64.whl"; + hash = "sha256-karwC/4f+kTcW1KAnZqVEp/KECEuyjrCZCDrEXJ8Yog="; }; aarch64-linux-38 = { - name = "torch-2.3.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-O3wUmPkE9n6x4zHy6+h0J3GiznG57pvAHelnJX6IHH0="; + name = "torch-2.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-nrqD+Kj5hUL5F+OQAMkD8VRlWs9jdcBzz81DBqFU64A="; }; aarch64-linux-39 = { - name = "torch-2.3.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-22v/S6YnO1muRD3gS1rcNtakC7KJiGYTO/8tUvJ26v4="; + name = "torch-2.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-J4akfI2N7BdvxnnSqrmm9UnCVFJRC0llCrE0E1JmujM="; }; aarch64-linux-310 = { - name = "torch-2.3.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-ZUT98pAYZowKbUobzJVZgsGtpwgGKBsBDLqTvc+9zyI="; + name = "torch-2.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-fBWeidTs8IQD+dE3PVVEIiQLmxFGoKGRKQadw1enKys="; }; aarch64-linux-311 = { - name = "torch-2.3.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-Kq8ON3NMvF/mv8yBraNuy7iZ1N2+E0mL2EqsqKkchig="; + name = "torch-2.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-OBacsPHmcnw9rI2si5pI0HKkn2Q7kIqZFV7x2Bthves="; }; aarch64-linux-312 = { - name = "torch-2.3.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-d9LeGklaHAf1ksM4oNWS5VzAudL4ADCeRqDqLA46KRk="; + name = "torch-2.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-7IY1E1C716vqNDb6b0Iws7C793oibkS6RhhA4gT8zXE="; }; }; } From 996253b5bfd011ab6d40846b25718f6badf0f246 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 11 Aug 2024 14:42:56 +0200 Subject: [PATCH 071/124] python312Packages.torchaudio: 2.3.1 -> 2.4.0 Diff: https://github.com/pytorch/audio/compare/v2.3.1...v2.4.0 Changelog: https://github.com/pytorch/audio/releases/tag/v2.4.0 --- 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 3252a5b19cfa..f736036b1350 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -72,14 +72,14 @@ let in buildPythonPackage rec { pname = "torchaudio"; - version = "2.3.1"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "audio"; rev = "refs/tags/v${version}"; - hash = "sha256-PYaqRNKIhQ1DnFRZYyJJfBszVM2Bmu7A/lvvzJ6lL3g="; + hash = "sha256-ltBPoFDA7GS9XRHyWeTRn1YTVqdaE/38KnkG4fp7Th8="; }; patches = [ ./0001-setup.py-propagate-cmakeFlags.patch ]; From 12055c0e00f16c3a8eed4bd57bb2b4d3df91add2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 11 Aug 2024 14:57:05 +0200 Subject: [PATCH 072/124] python311Packages.torchaudio-bin: 2.3.1 -> 2.4.0 Diff: https://github.com/pytorch/audio/compare/v2.3.1...v2.4.0 Changelog: https://github.com/pytorch/audio/releases/tag/v2.4.0 --- .../python-modules/torchaudio/bin.nix | 2 +- .../torchaudio/binary-hashes.nix | 92 +++++++++---------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 44205578a38d..31b119a26406 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.3.1"; + version = "2.4.0"; format = "wheel"; src = diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index bce74eff052e..53004bc2c0b9 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.3.1" = { + "2.4.0" = { x86_64-linux-38 = { - name = "torchaudio-2.3.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-4QoP0bNR6EnnzZ4ekw3KP/uMow+WI5vqEx8YP2WUXNs="; + name = "torchaudio-2.4.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-HbbFZ4nETaygQRxSMYg6d3Omqxbx6uSrXrUzRt71RTw="; }; x86_64-linux-39 = { - name = "torchaudio-2.3.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-bOv8CdkcpAPASLnPKuPWS09UzzGghYTQ0/v3+VAewNw="; + name = "torchaudio-2.4.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-5wG1xXOR9ApLTdWQtt8eGt+83GwT6zfEW+Kay4pz5vQ="; }; x86_64-linux-310 = { - name = "torchaudio-2.3.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-C0I/SuM1bxH2cj6MdyCKw/k2Gk+UHkzAjYbDLBN1lLw="; + name = "torchaudio-2.4.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-R+F2Pr3UEID6Otlv9OTyKHgxz6jd51IzrRMpxhOr2lA="; }; x86_64-linux-311 = { - name = "torchaudio-2.3.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-LZE2vzybarltxC8m9suDbUXRFfV2bhav9Sg1yOfN5WU="; + name = "torchaudio-2.4.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-KcjEOkm0MDZnvyDNhcP26borSg+0tqrsLgKzstbMbOo="; }; x86_64-linux-312 = { - name = "torchaudio-2.3.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.1%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-sAdz3eOqMNmxuYh1ZQQo+/tp/jC5jrtc7/vY/GHegSU="; + name = "torchaudio-2.4.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.4.0%2Bcu121-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-gTwbojelvYBZo0BOav9xtc09SXmtCV3PreFZJoCFUDE="; }; aarch64-darwin-38 = { - name = "torchaudio-2.3.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-zkXgWs1URpbGpvAj1P6GFK3ldRV5mhEDskGOhUg41KU="; + name = "torchaudio-2.4.0-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-/D+OzW8Lv8ZU07xSdWp8o1nx2ItPoCkOHNt2OjExt7k="; }; aarch64-darwin-39 = { - name = "torchaudio-2.3.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-NujAtlMlccJ6CKQNrkKM00ryJQB/FbzXcnJkO2JmuB0="; + name = "torchaudio-2.4.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-H9ZwyAjjIsEBlXoHZR4pk1+G7DiSQ8DEOiTt16GFSEE="; }; aarch64-darwin-310 = { - name = "torchaudio-2.3.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-H5E0sn5afwweMzgvwP4njlNpV2jLCvAujSK1AGx0oq0="; + name = "torchaudio-2.4.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-cz6dhZuI2r7+rwCOOrK4x4hbKUZgaLS3mkJ2a+RhnkY="; }; aarch64-darwin-311 = { - name = "torchaudio-2.3.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-AZhPODmMpemOz7/q+3KuWyEx0LuKpGS1d3rds+SCaHc="; + name = "torchaudio-2.4.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-rLz5Ep/8/OgIJU4sv/EDNjxQXOBu1MQjGz9DahBnnU0="; }; aarch64-darwin-312 = { - name = "torchaudio-2.3.1-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-XjZoVCCgehdhRunW4PqCJRmPEm4WegB4VTj4U4B+LUM="; + name = "torchaudio-2.4.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-rhOpXvb6vK2w7/NthfUEjXBHSi6XBPqchumQPLzsDUo="; }; aarch64-linux-38 = { - name = "torchaudio-2.3.1-cp38-cp38-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-n9D0u8P9WF+9fZdqmI/m54P8suDbnXDaxg9AvgcsZQQ="; + name = "torchaudio-2.4.0-cp38-cp38-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp38-cp38-linux_aarch64.whl"; + hash = "sha256-1/6efy/oJQ/eB7IDVsRNdw1fqjyid6vc2jr31IQEj7o="; }; aarch64-linux-39 = { - name = "torchaudio-2.3.1-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-TjvKIy+CDGoPpTlEJAdsxRn64yKI5/9vbWi9cXlNw1Q="; + name = "torchaudio-2.4.0-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-yECJTeEqbdPqV8uw0AhhI6qkgAG6Otme9xT+AJ6ujrk="; }; aarch64-linux-310 = { - name = "torchaudio-2.3.1-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-a1fnc6rXJ0PVCmSnQCoGy4vfzHCe/G2MJkKdlA5niOI="; + name = "torchaudio-2.4.0-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-F8tz1DNncdRVzY3ai0iRMHpTRriQpOax1Lc9VlJY/uE="; }; aarch64-linux-311 = { - name = "torchaudio-2.3.1-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-yMcnyDQYJb0Y2RAXxMAPNrU7CPIXbNub3LDe8cRQsh0="; + name = "torchaudio-2.4.0-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-vpacCUZts14Nebiwnf9myu27lWm0LJA6LV4Nsq92Djw="; }; aarch64-linux-312 = { - name = "torchaudio-2.3.1-cp312-cp312-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp312-cp312-linux_aarch64.whl"; - hash = "sha256-Qq9sekMOYmjywCjgYHjUE5ErXsbvoooJfr3Tw8eWWd8="; + name = "torchaudio-2.4.0-cp312-cp312-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.4.0-cp312-cp312-linux_aarch64.whl"; + hash = "sha256-U00ZB7slLs0rqeHWHP9yIP1mCQ5j33s8EJzqd6GdTLg="; }; }; } From 922b0d5dd813988c98fa306d2623336a5f2382d4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 11 Aug 2024 14:57:39 +0200 Subject: [PATCH 073/124] python312Packages.torchvision: 0.18.1 -> 0.19.0 Diff: https://github.com/pytorch/vision/compare/refs/tags/v0.18.1...0.19.0 Changelog: https://github.com/pytorch/vision/releases/tag/v0.19.0 --- pkgs/development/python-modules/torchvision/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index ea0453b8bc59..b25fdc2c4281 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -18,7 +18,7 @@ let inherit (cudaPackages) backendStdenv; pname = "torchvision"; - version = "0.18.1"; + version = "0.19.0"; in buildPythonPackage { inherit pname version; @@ -27,7 +27,7 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-aFm6CyoMA8HtpOAVF5Q35n3JRaOXYswWEqfooORUKsw="; + hash = "sha256-OVwdEqKEoZR1jtcg4ODyvIZvP9UQPodPv8qnTqbA/pc="; }; nativeBuildInputs = [ @@ -76,6 +76,7 @@ buildPythonPackage { meta = { description = "PyTorch vision library"; homepage = "https://pytorch.org/"; + changelog = "https://github.com/pytorch/vision/releases/tag/v${version}"; license = lib.licenses.bsd3; platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin; maintainers = with lib.maintainers; [ ericsagnes ]; From e100b56ca7ad558f32df01ef3bd047fb8a42e123 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 11 Aug 2024 15:00:57 +0200 Subject: [PATCH 074/124] python311Packages.torchvision-bin: 0.18.1 -> 0.19.0 Diff: https://github.com/pytorch/vision/compare/refs/tags/v0.18.1...0.19.0 Changelog: https://github.com/pytorch/vision/releases/tag/v0.19.0 --- .../python-modules/torchvision/bin.nix | 2 +- .../torchvision/binary-hashes.nix | 92 +++++++++---------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index d796159cbb9f..27dd914d7700 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -17,7 +17,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.18.1"; + version = "0.19.0"; 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 c3283f1c90b6..177a3ae30a99 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "0.18.1" = { + "0.19.0" = { x86_64-linux-38 = { - name = "torchvision-0.18.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-ruiWHcuKQY6S0G1LPpr1KYcpOkjBQjHDxQyO6jdB5BI="; + name = "torchvision-0.19.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-5GynSUL5Of12jXr29wqhfAciLKj6abBXtAi05u29bys="; }; x86_64-linux-39 = { - name = "torchvision-0.18.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-Hr9du9869EbITkK68u2+sb1vsMydO0kBr5acg5HRSl4="; + name = "torchvision-0.19.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-R2KGR72zWQyauWXvtwhTMA1eHGh1lRHumUpvH5fywSM="; }; x86_64-linux-310 = { - name = "torchvision-0.18.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-6VulosYWk5KB4Bur8RZk1tFyXoG7pX74H4HD5X5NQVE="; + name = "torchvision-0.19.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-XuEDx+tH+LCIN+DkixePfsyR12nSthJAuQy1qi0Gznc="; }; x86_64-linux-311 = { - name = "torchvision-0.18.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-KyrsLGjguhf57tiSF5b6Lbx6ST3qejtF0lwFWtQXSGg="; + name = "torchvision-0.19.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-NpTVJ7SPribGrEpDWWC4tXk9YcXxQgtr77lLM8mm/Ng="; }; x86_64-linux-312 = { - name = "torchvision-0.18.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.1%2Bcu121-cp312-cp312-linux_x86_64.whl"; - hash = "sha256-zo1bmSBW8GQKOe9XNDQuQ8pKgBVH3if7jbwwVdk0WUc="; + name = "torchvision-0.19.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.19.0%2Bcu121-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-9M7FuSc1N6VG5V6eCI++01kM+2kn+IFX1K/s7iPBJek="; }; aarch64-darwin-38 = { - name = "torchvision-0.18.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-scOGT6k3jIi86K0O81mfTyU5eJfOYS4cJFx0uXCS814="; + name = "torchvision-0.19.0-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-hU6WehapQJ6UG1u+WqNXsj9xWLzLneNa4g/UlF8F7NE="; }; aarch64-darwin-39 = { - name = "torchvision-0.18.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-l1uFlMD1KIh1QIrLt0lG7qeGxbAI0SnA0EXQ6tI3Qrw="; + name = "torchvision-0.19.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-3RJ5Vx1LaNWlPZt6Na7fkcTLHgsICZ9qHv+nsluMlec="; }; aarch64-darwin-310 = { - name = "torchvision-0.18.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-PmlOVLBUja2ZwSr2vwyOTzNQE305Hc0ZryKhxfiTIrM="; + name = "torchvision-0.19.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-7IdO+F3LJMaeYA9uJ2r4ksgM3j/9rrcnXv2kYyQrwqg="; }; aarch64-darwin-311 = { - name = "torchvision-0.18.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-gLXXlN0P26eHrcIvGjZ6Xq1FIydoZHPLJg3ZQ2S8VqY="; + name = "torchvision-0.19.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-2/OqcaOJkkT8iEMD7TxGBKFggk/vrHfoIxelRj78HZs="; }; aarch64-darwin-312 = { - name = "torchvision-0.18.1-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-K+bwv3xFXImlGh27b2aNNsbtxHn0mskS10XRDfVxVlc="; + name = "torchvision-0.19.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-wJ747RhPqHf2JRtiAibnT2grjx1rNBRWQo1JVbjZxnA="; }; aarch64-linux-38 = { - name = "torchvision-0.18.1-cp38-cp38-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-lybDFqJQHfhQPlpdxGpjGv1MUVqViXLlt/e5yH0hJcA="; + name = "torchvision-0.19.0-cp38-cp38-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp38-cp38-linux_aarch64.whl"; + hash = "sha256-B5ppbgsstS5L4wr6jps9fSgPAqK1/+3X6CH6Hv0aWo0="; }; aarch64-linux-39 = { - name = "torchvision-0.18.1-cp39-cp39-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-VL/NNSq7OW1cnCN9IAFnwXi9E2BRsTjh6O9GzjZ8J3M="; + name = "torchvision-0.19.0-cp39-cp39-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-X5pZjc+CvfyORDbOdHY7OHfavsOzP5RhO5Tt4T4+Te4="; }; aarch64-linux-310 = { - name = "torchvision-0.18.1-cp310-cp310-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-Vz/1I8c5QF7bCF9ly1kvSC0oow4psL5MS6CAQLOueF8="; + name = "torchvision-0.19.0-cp310-cp310-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-1GfUNABf0Foieiunr0xZG7Z+bUqXu9Bu2o2oP0Pp/Qc="; }; aarch64-linux-311 = { - name = "torchvision-0.18.1-cp311-cp311-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-zrmTqILxrnrjc+05wo1+PoAiBbDlmn7YTvQCjwu6jX8="; + name = "torchvision-0.19.0-cp311-cp311-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-Tmqk+j8Lw1mfoHHBSeZRo+a91nyRYXlEePn5FHHEBqI="; }; aarch64-linux-312 = { - name = "torchvision-0.18.1-cp312-cp312-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp312-cp312-linux_aarch64.whl"; - hash = "sha256-E9JNkE9l5i1moeDEH67GMLwZOGe4pKARZnaeio6N+Ok="; + name = "torchvision-0.19.0-cp312-cp312-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.19.0-cp312-cp312-linux_aarch64.whl"; + hash = "sha256-vg8noouOnyrpijGvNKS90qW/FU2SvXOleXyNIVb7OrY="; }; }; } From 6ddee218985ea35f6f6e88fa0017abca50c967b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Aug 2024 13:32:42 +0200 Subject: [PATCH 075/124] python312Packages.fastcore: 1.6.7 -> 1.6.8 Diff: https://github.com/fastai/fastcore/compare/refs/tags/1.6.7...1.6.8 Changelog: https://github.com/fastai/fastcore/blob/1.6.8/CHANGELOG.md --- 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 d124bae7d33f..f1112c0edcfa 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.6.7"; + version = "1.6.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-f31aQKYM1qawGrNtUZH3K+Zq9JerKNm+fEJ938bhHKc="; + hash = "sha256-Uu6AFN8A4mbkXVOZi6hGajAuz/5e1uwK0Z3opb99gVg="; }; build-system = [ setuptools ]; From 058da91a60f7dcf7e357f90dfd7caf948ae4829d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 08:26:15 +0200 Subject: [PATCH 076/124] python312Packages.fastcore: 1.6.8 -> 1.7.0 Diff: https://github.com/fastai/fastcore/compare/refs/tags/1.6.8...1.7.0 Changelog: https://github.com/fastai/fastcore/blob/1.7.0/CHANGELOG.md --- 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 f1112c0edcfa..3f7d54ac075b 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.6.8"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-Uu6AFN8A4mbkXVOZi6hGajAuz/5e1uwK0Z3opb99gVg="; + hash = "sha256-8pbAUemswRP+K8kh23u1AbVfv28+3Ykzla4cWzSFMfc="; }; build-system = [ setuptools ]; From dfc309b89a2977026461b4bfab5c471fbca654e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 08:27:17 +0200 Subject: [PATCH 077/124] python312Packages.cyclopts: 2.9.5 -> 2.9.6 Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v2.9.5...v2.9.6 Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v2.9.6 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 833608c353eb..f28032ead018 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "2.9.5"; + version = "2.9.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; rev = "refs/tags/v${version}"; - hash = "sha256-KZGsYaEcOs8NoUCRG4MqW9wqrqDJ1Ygv6U7QfyGqNhQ="; + hash = "sha256-KXqeCUbSLHzeIMDpfaNj5aVxDtVP6dlctBDbukKPLSA="; }; build-system = [ From 7d91eae56c7f00a36a8369b053a63e1672e60447 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 08:31:09 +0200 Subject: [PATCH 078/124] python312Packages.aliyun-python-sdk-kms: 2.16.3 -> 2.16.4 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-kms/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-kms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix index 7364654c8322..0e67deeac536 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-kms"; - version = "2.16.3"; + version = "2.16.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wxt9JOFTJxowQ+gB57a2s/DbR+lag8jRDNq4wRZi/Dk="; + hash = "sha256-DVuxZcB7apcpOXU6EoUHOT9IAReS7g7E9ZtgIeq9l1I="; }; build-system = [ setuptools ]; From 6946751a20a49d7a83987488dcca048d04b5507e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 08:31:46 +0200 Subject: [PATCH 079/124] python312Packages.aioqsw: 0.4.0 -> 0.4.1 Diff: https://github.com/Noltari/aioqsw/compare/refs/tags/0.4.0...0.4.1 Changelog: https://github.com/Noltari/aioqsw/releases/tag/0.4.1 --- pkgs/development/python-modules/aioqsw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix index 04c248cffe89..10fb274215f4 100644 --- a/pkgs/development/python-modules/aioqsw/default.nix +++ b/pkgs/development/python-modules/aioqsw/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioqsw"; - version = "0.4.0"; + version = "0.4.1"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xXbOIG9gw1rO+iWdXNWWmweM83FpTLMuaDTcRZoMvL8="; + hash = "sha256-h/rTwMF3lc/hWwpzCvK6UMq0rjq3xkw/tEY3BqOPS2s="; }; nativeBuildInputs = [ From e202a213b03bb86f000b5ed9f170f22f272a48c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 08:55:05 +0200 Subject: [PATCH 080/124] python312Packages.meshtastic: 2.3.11 -> 2.3.15 Changelog: https://github.com/meshtastic/python/releases/tag/2.3.15 --- .../python-modules/meshtastic/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index e7ce8351b1b3..0511fdd604b7 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -2,6 +2,7 @@ lib, bleak, buildPythonPackage, + dash-bootstrap-components, dotmap, fetchFromGitHub, hypothesis, @@ -9,6 +10,7 @@ parse, pexpect, platformdirs, + poetry-core, ppk2-api, print-color, protobuf, @@ -22,6 +24,7 @@ pythonOlder, pyyaml, requests, + riden, setuptools, tabulate, timeago, @@ -30,7 +33,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.3.11"; + version = "2.3.15"; pyproject = true; disabled = pythonOlder "3.7"; @@ -39,12 +42,15 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-s56apVx7+EXkdw3FUjyGKGFjP+IVbO0/VDB4urXEtXQ="; + hash = "sha256-mirEsGeEQuWtaJ+eCROV1g9Bm0mRvCeTKkxPQqCuwe4="; }; - pythonRelaxDeps = [ "protobuf" ]; + pythonRelaxDeps = [ + "bleak" + "protobuf" + ]; - build-system = [ setuptools ]; + build-system = [ poetry-core ]; dependencies = [ bleak @@ -74,8 +80,10 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + dash-bootstrap-components hypothesis pytestCheckHook + riden ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); preCheck = '' @@ -84,6 +92,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "meshtastic" ]; + disabledTestPaths = [ + # Circular import with dash-bootstrap-components + "meshtastic/tests/test_analysis.py" + ]; + disabledTests = [ # TypeError "test_main_info_with_seriallog_output_txt" From 49a8916e9e2b9372e93b982cb962a74537390d3f Mon Sep 17 00:00:00 2001 From: Mrmaxmeier Date: Thu, 15 Aug 2024 13:50:34 +0200 Subject: [PATCH 081/124] deepfilternet: fix compilation with Rust 1.80 As per #332957, rust-lang/rust#127343. Bumps the time dependency in Cargo.lock, to fix a compilation issue. Xref #333227 for a similar PR :) Upstream issue: https://github.com/Rikorose/DeepFilterNet/issues/602 --- pkgs/by-name/de/deepfilternet/Cargo.lock | 34 ++++++-- .../deepfilternet/cargo-lock-bump-time.patch | 84 +++++++++++++++++++ pkgs/by-name/de/deepfilternet/package.nix | 5 ++ 3 files changed, 115 insertions(+), 8 deletions(-) create mode 100644 pkgs/by-name/de/deepfilternet/cargo-lock-bump-time.patch diff --git a/pkgs/by-name/de/deepfilternet/Cargo.lock b/pkgs/by-name/de/deepfilternet/Cargo.lock index 48eb89cad3db..ae318a67acf3 100644 --- a/pkgs/by-name/de/deepfilternet/Cargo.lock +++ b/pkgs/by-name/de/deepfilternet/Cargo.lock @@ -1073,9 +1073,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] [[package]] name = "derivative" @@ -2805,6 +2808,12 @@ dependencies = [ "serde", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" @@ -3266,6 +3275,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -4134,12 +4149,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -4147,16 +4164,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] diff --git a/pkgs/by-name/de/deepfilternet/cargo-lock-bump-time.patch b/pkgs/by-name/de/deepfilternet/cargo-lock-bump-time.patch new file mode 100644 index 000000000000..b970274af6dd --- /dev/null +++ b/pkgs/by-name/de/deepfilternet/cargo-lock-bump-time.patch @@ -0,0 +1,84 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 48eb89c..ae318a6 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1073,9 +1073,12 @@ dependencies = [ + + [[package]] + name = "deranged" +-version = "0.3.8" ++version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] + + [[package]] + name = "derivative" +@@ -2805,6 +2808,12 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-derive" + version = "0.3.3" +@@ -3266,6 +3275,12 @@ dependencies = [ + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -4134,12 +4149,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.28" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -4147,16 +4164,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.14" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + diff --git a/pkgs/by-name/de/deepfilternet/package.nix b/pkgs/by-name/de/deepfilternet/package.nix index b39b9cab0781..0c1ee6bdb2dd 100644 --- a/pkgs/by-name/de/deepfilternet/package.nix +++ b/pkgs/by-name/de/deepfilternet/package.nix @@ -15,6 +15,11 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5bYbfO1kmduNm9YV5niaaPvRIDRmPt4QOX7eKpK+sWY="; }; + cargoPatches = [ + # Fix compilation with Rust 1.80 (https://github.com/NixOS/nixpkgs/issues/332957) + ./cargo-lock-bump-time.patch + ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { From b89e50748cad6fa6f19097ba251e739f300042b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 16:06:05 +0000 Subject: [PATCH 082/124] python312Packages.pyprosegur: 0.0.10 -> 0.0.11 --- pkgs/development/python-modules/pyprosegur/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyprosegur/default.nix b/pkgs/development/python-modules/pyprosegur/default.nix index a132407b2336..ff835d023496 100644 --- a/pkgs/development/python-modules/pyprosegur/default.nix +++ b/pkgs/development/python-modules/pyprosegur/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyprosegur"; - version = "0.0.10"; + version = "0.0.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "dgomes"; repo = "pyprosegur"; rev = "refs/tags/${version}"; - hash = "sha256-OHFJhufymD181FODHlIu+O5xh9dfKwEIVQX/zTOC6ks="; + hash = "sha256-DBr/MtomB7MlZlK8YBvtY1MIstLxotOkv07zZNNuRtM="; }; nativeBuildInputs = [ setuptools ]; From b2927163f2623330702714365fdd345ea25c156e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 16:09:59 +0000 Subject: [PATCH 083/124] python312Packages.pypck: 0.7.19 -> 0.7.20 --- pkgs/development/python-modules/pypck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index d7d451288398..cbadc2836823 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.19"; + version = "0.7.20"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "alengwenus"; repo = "pypck"; rev = "refs/tags/${version}"; - hash = "sha256-D4uUR8A1mrT+mxUswS34hSRczjRkRro/pz9NbMUCPjM="; + hash = "sha256-n+MtZA7dgmNDPwgYzwuoMFV9AYNYWx8dUCFFWVOmWR8="; }; postPatch = '' From f5fb7a41bc98209811e5debba17f48b34a885fee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 17:20:38 +0000 Subject: [PATCH 084/124] python312Packages.notus-scanner: 22.6.3 -> 22.6.4 --- pkgs/development/python-modules/notus-scanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix index bd52934394bd..85fd8c2ced93 100644 --- a/pkgs/development/python-modules/notus-scanner/default.nix +++ b/pkgs/development/python-modules/notus-scanner/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "notus-scanner"; - version = "22.6.3"; + version = "22.6.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "notus-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-LYYof/s0OvXMbEH7jyFIymUVrWYUd/6lychIzfPlylc="; + hash = "sha256-DcFIypfdrz8pM7qAMVpof6xKWYp/bSRUswngxa5EQFk="; }; pythonRelaxDeps = [ From c9448d63fc0b8455af7fe658c68eba51da01deb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 19:50:13 +0000 Subject: [PATCH 085/124] python312Packages.plugwise: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 6b2b163df6d8..7fddf000ddb3 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-OEEk0rMhvk99EVouotcNQlSfx5Xv23WswCQ5ZN5M3A4="; + hash = "sha256-IaLXCuope/6shF3HmKAo7IrXxVJLzAQzsqlx0dASllk="; }; postPatch = '' From db56e15d04c8038964c12a419a69f8a99b31c99f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 21:56:34 +0200 Subject: [PATCH 086/124] python312Packages.archinfo: 9.2.114 -> 9.2.115 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.114...v9.2.115 --- 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 e8f8dcae4990..e649bfe04a69 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.114"; + version = "9.2.115"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-Ov7jEV4avhdslf6K36lSQpz/bA+riYUKGVtnd3ChXPI="; + hash = "sha256-MuXECTXmM9oDPZ1P4654Z2DBEjFiq2rao9V5Z476sjk="; }; build-system = [ setuptools ]; From ec214490462b227b3d0dd62ef0039d8e0807167b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 21:56:52 +0200 Subject: [PATCH 087/124] python312Packages.ailment: 9.2.114 -> 9.2.115 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.114...v9.2.115 --- 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 3b65236eab6c..d93e0c7e726e 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.114"; + version = "9.2.115"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-l/cAGUmvIscZjFzTYNb+tMUPgyDEHt6emYbGjwpuJyU="; + hash = "sha256-RYsfQNi0TFxyM7Z1l1R3KYkFI7m0TW2+rzj5fEz/ET0="; }; build-system = [ setuptools ]; From 93f564333ecf1facd01e78df5d9fa8e70d125230 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 21:58:33 +0200 Subject: [PATCH 088/124] python312Packages.pyvex: 9.2.114 -> 9.2.115 --- 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 ce5bd306ea0c..b90a946584a9 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.114"; + version = "9.2.115"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-zXPUuB/UyPabDZH370u0lf3LCf0oJNkrFtc08/O7RrI="; + hash = "sha256-4qBHmQXwVakWErWYqhc5ioctQix4/LpH/Ge9qPFgguI="; }; build-system = [ setuptools ]; From 2857eaf9bdce104d25e99754a22c19ec509e7bb3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 22:02:10 +0200 Subject: [PATCH 089/124] python312Packages.cle: 9.2.114 -> 9.2.115 Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.114...v9.2.115 --- 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 f982d7b67327..9845ee5ae946 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -18,14 +18,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.114"; + version = "9.2.115"; # 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-M8agIZ4Gk67wKUfKI/13sYAYUta0sWk7cVkM5ayb0V0="; + hash = "sha256-tAng3ed/oGeFIg1bSugT+s9laLuD9nsuTvLd2lx6Xcs="; }; in buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-PGAuLW0yTuKrAo+xxlLQnnxugiZAhXQmC89Ve2OY8aY="; + hash = "sha256-HYALGByZYM2FXXIucYkByZ7C31Mb1ZgiySKDWdk/5GQ="; }; build-system = [ setuptools ]; From cdd57ccde8687e47da81535bf1e61521544838ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 22:08:04 +0200 Subject: [PATCH 090/124] python312Packages.claripy: 9.2.114 -> 9.2.115 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.114...v9.2.115 --- pkgs/development/python-modules/claripy/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 6fbb68cb9713..2d25a41f0d70 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -8,12 +8,13 @@ pytestCheckHook, pythonOlder, setuptools, + typing-extensions, z3-solver, }: buildPythonPackage rec { pname = "claripy"; - version = "9.2.114"; + version = "9.2.115"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-VvYJQK2++wfH9aNR31Cbz8nQalWwbOwiE8YMOhAVG3c="; + hash = "sha256-KOjLjR59n4D9i12YSBrwyr0B8q2WZ1Y7D3tbWkKL5gY="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail @@ -36,6 +37,7 @@ buildPythonPackage rec { cachetools decorator pysmt + typing-extensions z3-solver ] ++ z3-solver.requiredPythonModules; From 6e48259a54a805c1fe12b98c18ebed42b7c4bef5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 22:09:18 +0200 Subject: [PATCH 091/124] python311Packages.angr: 9.2.114 -> 9.2.115 Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.114...v9.2.115 --- 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 f08136d84c03..933ea383249b 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.114"; + version = "9.2.115"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-Juv1/N/QdV99P1QupXU+OTl2ycT0SNrQF3PfDvQjb3Y="; + hash = "sha256-9YMwVi4pQxdIMFfwVdQ8okc+n40qOnUDUYn8Rv3vmWU="; }; pythonRelaxDeps = [ "capstone" ]; From 18fb00789bea6d59828614989880782311b0245b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 15 Aug 2024 21:36:42 +0100 Subject: [PATCH 092/124] btrfs-progs: 6.10 -> 6.10.1 Changes: https://github.com/kdave/btrfs-progs/releases/tag/v6.10.1 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index e448bfdcd13b..07d34c2af19c 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.10"; + version = "6.10.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-M4KoTj/P4f/eoHphqz9OhmZdOPo18fNFSNXfhnQj4N8="; + hash = "sha256-JWhGlrxbXQfJjxnUv3pItTq5SHDKTEaKaK89+eLIo14="; }; nativeBuildInputs = [ From 0856fa8c94f8e99d72d8c712c15072c00872a1b9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 9 Aug 2024 12:09:16 +0200 Subject: [PATCH 093/124] python312Packages.pytorch-lightning: 2.3.3 -> 2.4.0 Diff: https://github.com/Lightning-AI/pytorch-lightning/compare/refs/tags/2.3.3...2.4.0 Changelog: https://github.com/Lightning-AI/pytorch-lightning/releases/tag/refs/tags/2.4.0 --- .../pytorch-lightning/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index bcea697b8325..116997ceb8e4 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -2,12 +2,16 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system + setuptools, + + # dependencies fsspec, lightning-utilities, numpy, packaging, pyyaml, - setuptools, tensorboardx, torch, torchmetrics, @@ -21,14 +25,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.3.3"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-JgT+OiBToBBa3h556gF+kmcqLKLaK17tlTPokvEDyUE="; + hash = "sha256-FngD3nYTGVEjS1VrXAVps2/B8VlS7BZMDAsmIDtAyW0="; }; preConfigure = '' @@ -39,12 +43,12 @@ buildPythonPackage rec { dependencies = [ fsspec + lightning-utilities numpy packaging pyyaml tensorboardx torch - lightning-utilities torchmetrics tqdm traitlets @@ -61,11 +65,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytorch_lightning" ]; - meta = with lib; { + meta = { description = "Lightweight PyTorch wrapper for machine learning researchers"; homepage = "https://github.com/Lightning-AI/pytorch-lightning"; changelog = "https://github.com/Lightning-AI/pytorch-lightning/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ tbenst ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ tbenst ]; }; } From eff5dec62ab9895346b77818a00f7cc70aea89fe Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 15 Aug 2024 22:46:36 +0200 Subject: [PATCH 094/124] python312Packages.finetuning-scheduler: 2.3.3 -> 2.4.0 Diff: https://github.com/speediedan/finetuning-scheduler/compare/refs/tags/v2.3.3...v2.4.0 Changelog: https://github.com/speediedan/finetuning-scheduler/blob/refs/tags/v2.4.0/CHANGELOG.md --- .../python-modules/finetuning-scheduler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/finetuning-scheduler/default.nix b/pkgs/development/python-modules/finetuning-scheduler/default.nix index d4a2752c8ea3..0ff7318f0bb3 100644 --- a/pkgs/development/python-modules/finetuning-scheduler/default.nix +++ b/pkgs/development/python-modules/finetuning-scheduler/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "finetuning-scheduler"; - version = "2.3.3"; + version = "2.4.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "speediedan"; repo = "finetuning-scheduler"; rev = "refs/tags/v${version}"; - hash = "sha256-Nci+NcfcaZV3NH3MTCyr8PwPdDykJTdq8+CmtngWdiM="; + hash = "sha256-uSFGZseSJv519LpaddO6yP6AsIMZutEA0Y7Yr+mEWTQ="; }; build-system = [ setuptools ]; From eb2a90144811d83941d4ec6020aa11bcfc37eccc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 01:01:07 +0000 Subject: [PATCH 095/124] checkSSLCert: 2.82.0 -> 2.83.0 --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 86098d640223..d7b2549c4177 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.82.0"; + version = "2.83.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-u+/IXevDt4mlnQ4a1M1t2Zh26/FBd9yAtpr71NrdXTY="; + hash = "sha256-wGg7KqpnHPz4kSpvM1FEc0om1xoWQNFNQ9Qeq/JfCwg="; }; nativeBuildInputs = [ From cab3fd43713f0e5d8c1475ccafff25b13a8f2839 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 05:12:01 +0000 Subject: [PATCH 096/124] eiciel: 0.10.0 -> 0.10.1 --- pkgs/tools/filesystems/eiciel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/eiciel/default.nix b/pkgs/tools/filesystems/eiciel/default.nix index ac87be61a444..4e9112a237f9 100644 --- a/pkgs/tools/filesystems/eiciel/default.nix +++ b/pkgs/tools/filesystems/eiciel/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "eiciel"; - version = "0.10.0"; + version = "0.10.1"; outputs = [ "out" "nautilusExtension" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "rofirrim"; repo = "eiciel"; rev = version; - sha256 = "0lhnrxhbg80pqjy9f8yiqi7x48rb6m2cmkffv25ssjynsmdnar0s"; + sha256 = "sha256-gpuxx1Ts9HCO+3C+Z3k1tVA+1Mip8/Bd+FvWisVdsVY="; }; nativeBuildInputs = [ From 1e139dd141e093731f8845b72fefd4b8c11935f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 07:56:52 +0000 Subject: [PATCH 097/124] zola: 0.19.1 -> 0.19.2 --- pkgs/by-name/zo/zola/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zo/zola/package.nix b/pkgs/by-name/zo/zola/package.nix index 3a90debe24cb..e6fc773a2127 100644 --- a/pkgs/by-name/zo/zola/package.nix +++ b/pkgs/by-name/zo/zola/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "getzola"; repo = "zola"; rev = "v${version}"; - hash = "sha256-qvePWGTosOTWsuwcFeOVZ7MePFpMPkC3eosIgjlPRyY="; + hash = "sha256-BjHAHj3EGE1L+EQdniS4OGOViOmcRDR5RhgmYK2zmVY="; }; - cargoHash = "sha256-Q2Zx00Gf89TJcsOFqkq0b4e96clv/CLQE51gGONZZl0="; + cargoHash = "sha256-ZbSdPi90Nl15YYN1tx9iNsdAjh6x02XKGG73IlOKdXo="; nativeBuildInputs = [ pkg-config From 28d06e49298d334588b99d93b0d65143ccea0eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 14 Aug 2024 13:41:08 +0200 Subject: [PATCH 098/124] bitwarden-directory-connector: fix missing distutils --- pkgs/tools/security/bitwarden-directory-connector/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix index 87b0ff8fd50b..1774598ec44a 100644 --- a/pkgs/tools/security/bitwarden-directory-connector/default.nix +++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix @@ -44,7 +44,7 @@ let ]; nativeBuildInputs = [ - python3 + (python3.withPackages (ps: with ps; [ setuptools ])) pkg-config ]; From febde5e54bcf66b47fe0d3069b6cb435ce727718 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 16 Aug 2024 16:44:54 +0300 Subject: [PATCH 099/124] mastodon: 4.2.10 -> 4.2.11 Changelog: https://github.com/mastodon/mastodon/releases/tag/v4.2.11 --- pkgs/servers/mastodon/gemset.nix | 8 ++++---- pkgs/servers/mastodon/source.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index dc002c161735..d6e73054a717 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -2440,10 +2440,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d8ivcirrrxpkpjc1c835wknc9s2fl54xpw08s177yfrh5ish209"; + sha256 = "0gccz5lixnddazvhksmj7l7hjwzjra2kz3qfyrzl2bz1q9h80bzh"; type = "gem"; }; - version = "3.2.8"; + version = "3.3.5"; }; rotp = { groups = ["default"]; @@ -2951,10 +2951,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1isbzxvykrm2h8msyq1c8ajypg7950w2mh0hrlgndhw52d1fic3c"; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; type = "gem"; }; - version = "3.0.9"; + version = "3.1.0"; }; swd = { dependencies = ["activesupport" "attr_required" "httpclient"]; diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index b2dc7df4ef81..313ecf64620d 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -1,7 +1,7 @@ # This file was generated by pkgs.mastodon.updateScript. { fetchFromGitHub, applyPatches, patches ? [] }: let - version = "4.2.10"; + version = "4.2.11"; in ( applyPatches { @@ -9,7 +9,7 @@ in owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-z3veI0CpZk6mBgygqXk8SN/5WWjy5VkKLxC7nOLnyZE="; + hash = "sha256-pOO3Ice8BMt+YyN5VNv2ayb5l2tY3wgbhHDcWy7Lqe0="; }; patches = patches ++ []; }) // { From e4767b4727589567da29a90a71947c2bdbe43988 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 14 Aug 2024 15:15:25 +0100 Subject: [PATCH 100/124] olm: mark as vulnerable See . --- pkgs/development/libraries/olm/default.nix | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index bb7553c2eb3e..f95574198710 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -27,5 +27,44 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.matrix.org/matrix-org/olm"; license = licenses.asl20; maintainers = with maintainers; [ tilpner oxzi ]; + knownVulnerabilities = [ '' + The libolm end‐to‐end encryption library used in many Matrix + clients and Jitsi Meet has been deprecated upstream, and relies + on a cryptography library that has known side‐channel issues and + disclaims that its implementations are not cryptographically secure + and should not be used when cryptographic security is required. + + It is not known that the issues can be exploited over the network in + practical conditions. Upstream has stated that the library should + not be used going forwards, and there are no plans to move to a + another cryptography implementation or otherwise further maintain + the library at all. + + You should make an informed decision about whether to override this + security warning, especially if you critically rely on end‐to‐end + encryption. If you don’t care about that, or don’t use the Matrix + functionality of a multi‐protocol client depending on libolm, + then there should be no additional risk. + + Some clients are investigating migrating away from libolm to maintained + libraries without known vulnerabilities. + + For further information, see: + + * The libolm deprecation notice: + + + * The warning from the cryptography code used by libolm: + + + * The blog post disclosing the details of the known vulnerabilities: + + + * The Matrix.org project lead’s response to the disclosure: + + + * A (likely incomplete) aggregation of client tracking issue links: + + '' ]; }; } From 7f4aa521469383d28f746c4836310152ce6b20f0 Mon Sep 17 00:00:00 2001 From: Riley Bruins Date: Fri, 16 Aug 2024 08:28:34 -0700 Subject: [PATCH 101/124] lua-language-server: 3.10.1 -> 3.10.4 --- .../tools/language-servers/lua-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index 56d01b585bf3..6b50c5afc130 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.10.1"; + version = "3.10.4"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = finalAttrs.version; - hash = "sha256-05b/NUpM6LASihZuMEduMCvh6ss44yHcA20gOQDMPAQ="; + hash = "sha256-Fohc8tuLzNCOhcU/FK6NunPXJoshLZOUUA6ARlQy9jI="; fetchSubmodules = true; }; From bbfd5d10851a4953301e0373d8749b8fe41bc31f Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 14 Aug 2024 15:15:25 +0100 Subject: [PATCH 102/124] {cinny-unwrapped,element-call,fluffychat,jitsi-meet}: inherit vulnerabilities from olm These vendor the libolm code. --- .../networking/instant-messengers/fluffychat/default.nix | 2 ++ pkgs/by-name/ci/cinny-unwrapped/package.nix | 2 ++ pkgs/by-name/el/element-call/package.nix | 2 ++ pkgs/servers/web-apps/jitsi-meet/default.nix | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 5d4978783785..666cda55472e 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -8,6 +8,7 @@ , pulseaudio , makeDesktopItem , zenity +, olm , targetFlutterPlatform ? "linux" }: @@ -44,6 +45,7 @@ flutter319.buildFlutterApplication (rec { maintainers = with maintainers; [ mkg20001 gilice ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; sourceProvenance = [ sourceTypes.fromSource ]; + inherit (olm.meta) knownVulnerabilities; }; } // lib.optionalAttrs (targetFlutterPlatform == "linux") { nativeBuildInputs = [ imagemagick ]; diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index da90e7b940ed..63f4d84649c6 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -9,6 +9,7 @@ pango, stdenv, darwin, + olm, }: buildNpmPackage rec { @@ -54,5 +55,6 @@ buildNpmPackage rec { maintainers = with lib.maintainers; [ abbe ]; license = lib.licenses.agpl3Only; platforms = lib.platforms.all; + inherit (olm.meta) knownVulnerabilities; }; } diff --git a/pkgs/by-name/el/element-call/package.nix b/pkgs/by-name/el/element-call/package.nix index 835329fef295..8f9e27b3a9b3 100644 --- a/pkgs/by-name/el/element-call/package.nix +++ b/pkgs/by-name/el/element-call/package.nix @@ -6,6 +6,7 @@ , yarnBuildHook , nodejs , npmHooks +, olm }: let @@ -52,5 +53,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; maintainers = with maintainers; [ kilimnik ]; mainProgram = "element-call"; + inherit (olm.meta) knownVulnerabilities; }; }) diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index f1097aeb1aec..32d7249ffc6a 100644 --- a/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, nixosTests }: +{ lib, stdenv, fetchurl, nixosTests, olm }: stdenv.mkDerivation rec { pname = "jitsi-meet"; @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = teams.jitsi.members; platforms = platforms.all; + inherit (olm.meta) knownVulnerabilities; }; } From e1d55a3328d6364865952fa6a1432d9e01749b19 Mon Sep 17 00:00:00 2001 From: Judson Lester Date: Fri, 16 Aug 2024 09:44:53 -0700 Subject: [PATCH 103/124] lorri: 1.7.0 -> 1.7.1 Motivated by transition to Rust 1.8.0 and issues with the old `time` crate --- pkgs/tools/misc/lorri/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index 39a6f9efa1a6..001efe6563b8 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -14,9 +14,9 @@ let # Run `eval $(nix-build -A lorri.updater)` after updating the revision! # It will copy some required files if necessary. # Also don’t forget to run `nix-build -A lorri.tests` - version = "1.7.0"; - sha256 = "sha256-pGNhhEBHyWhTaW24dHrxAvpb/qr5RPbHXRwDZx6Rf74="; - cargoHash = "sha256-ENZATiBhoO+N6NpSknOWpvsatkaYb4mS/E63XNRXfMU="; + version = "1.7.1"; + sha256 = "sha256-dEdKMgE4Jd8CCvtGQDZNDCYOomZAV8aR7Cmtyn8RfTo="; + cargoHash = "sha256-+sKxKxc2DVHn54uQa8K+CKmm0A0ym9SXgtOcfRZ6R5E="; in (rustPlatform.buildRustPackage rec { pname = "lorri"; From f268979829fbdd0735db279a3c8e2bfc38f0591a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 17:28:27 +0000 Subject: [PATCH 104/124] python312Packages.aiomealie: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/aiomealie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix index b2f4f9836559..1c73118ffc5d 100644 --- a/pkgs/development/python-modules/aiomealie/default.nix +++ b/pkgs/development/python-modules/aiomealie/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiomealie"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-mealie"; rev = "refs/tags/v${version}"; - hash = "sha256-/Hg0kcwUNaEsm8znOOkWd0oOu0ikK5LAYGKbP2pvHhQ="; + hash = "sha256-1n/AMXEoJJ/jftYzYHvo+jTSasNEqnFVAYqlipHFmGc="; }; postPatch = '' From 2d9403eeb236fbc6a58bb92bb3755d51692f153d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 17:49:05 +0000 Subject: [PATCH 105/124] python312Packages.model-bakery: 1.19.1 -> 1.19.2 --- pkgs/development/python-modules/model-bakery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-bakery/default.nix b/pkgs/development/python-modules/model-bakery/default.nix index 45395bb1035d..17c1aeb3c45f 100644 --- a/pkgs/development/python-modules/model-bakery/default.nix +++ b/pkgs/development/python-modules/model-bakery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-bakery"; - version = "1.19.1"; + version = "1.19.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "model-bakers"; repo = "model_bakery"; rev = "refs/tags/${version}"; - hash = "sha256-OSLRFuBG4GamSOpZvkPvoBanmRdDM8lCTNOwwZVjyEQ="; + hash = "sha256-Y1cv4AykDUkO5z1ejKuBphPGijnjpbgGcmwGBxeebcY="; }; build-system = [ hatchling ]; From af637e8489f026002d071b23c2ab243d8b24f48b Mon Sep 17 00:00:00 2001 From: tahanonu Date: Fri, 16 Aug 2024 15:44:08 +0100 Subject: [PATCH 106/124] python312Packages.pycompliace: init at 0.0.1 Release: https://github.com/rhmdnd/pycompliance/releases/tag/0.0.1 Co-authored-by: Florian --- .../python-modules/pycompliance/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pycompliance/default.nix diff --git a/pkgs/development/python-modules/pycompliance/default.nix b/pkgs/development/python-modules/pycompliance/default.nix new file mode 100644 index 000000000000..af1d976c0471 --- /dev/null +++ b/pkgs/development/python-modules/pycompliance/default.nix @@ -0,0 +1,33 @@ +{ + buildPythonPackage, + fetchFromGitHub, + hatchling, + lib, + unittestCheckHook, +}: + +buildPythonPackage rec { + pname = "pycompliance"; + version = "0.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rhmdnd"; + repo = "pycompliance"; + rev = version; + hash = "sha256-gCrKbKqRDlh9q9bETQ9NEPbf+40WKF1ltfBy6LYjlVw="; + }; + + build-system = [ hatchling ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + pythonImportsCheck = [ "pycompliance" ]; + + meta = { + description = "Simply library to represent compliance benchmarks as tree structures"; + homepage = "https://github.com/rhmdnd/pycompliance"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ tochiaha ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d0625948c0b7..7b8140fa845e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10310,6 +10310,8 @@ self: super: with self; { pycomm3 = callPackage ../development/python-modules/pycomm3 { }; + pycompliance = callPackage ../development/python-modules/pycompliance { }; + pycomposefile = callPackage ../development/python-modules/pycomposefile { }; pycontrol4 = callPackage ../development/python-modules/pycontrol4 { }; From ca25d96201101b49af46667997be44d1bbd28b02 Mon Sep 17 00:00:00 2001 From: Otto Sabart Date: Fri, 16 Aug 2024 21:00:00 +0200 Subject: [PATCH 107/124] python312Packages.pydaikin: 2.13.2 -> 2.13.4 --- pkgs/development/python-modules/pydaikin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index e19269637f97..945be522b76f 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.13.2"; + version = "2.13.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fredrike"; repo = "pydaikin"; rev = "refs/tags/v${version}"; - hash = "sha256-eq6QE5yYPb9y7bNJwk3sLQp7Pw0PtWn2T/6J+ICfPsY="; + hash = "sha256-zttn1AlKeLtDBxoJd15uYfi1V8FYIwbADm864jnpSQs="; }; build-system = [ setuptools ]; From ee1faea3f2a8ffbdda5dca163496890edcc42b41 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 16 Aug 2024 15:21:38 +0200 Subject: [PATCH 108/124] cloud-hypervisor: 40.0 -> 41.0 --- .../cloud-hypervisor/Cargo.lock | 254 ++++++++++-------- .../cloud-hypervisor/default.nix | 12 +- 2 files changed, 141 insertions(+), 125 deletions(-) diff --git a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock index 302b76013547..dbb3ee5a6b79 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock +++ b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock @@ -12,9 +12,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -36,23 +36,24 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" @@ -74,9 +75,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -84,9 +85,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "api_client" @@ -136,9 +137,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "9f2776ead772134d55b62dd45e59a79e21612d85d0af729b8b7d3967d601a62a" dependencies = [ "concurrent-queue", "event-listener 5.3.0", @@ -281,9 +282,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -296,9 +297,9 @@ dependencies = [ [[package]] name = "bitfield-struct" -version = "0.5.6" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26b8cea8bb6a81b75a84603b9e096f05fa86db057904ef29be1deee900532bd" +checksum = "6c2ce686adbebce0ee484a502c440b4657739adbad65eadf06d64f5816ee9765" dependencies = [ "proc-macro2", "quote", @@ -313,9 +314,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block" @@ -362,9 +363,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -420,7 +421,7 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cloud-hypervisor" -version = "40.0.0" +version = "41.0.0" dependencies = [ "anyhow", "api_client", @@ -451,9 +452,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "concurrent-queue" @@ -509,9 +510,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -519,9 +520,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", @@ -533,9 +534,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", @@ -566,12 +567,13 @@ dependencies = [ "acpi_tables", "anyhow", "arch", - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "event_monitor", "hypervisor", "libc", "log", + "num_enum", "pci", "serde", "thiserror", @@ -638,9 +640,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -648,9 +650,9 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", @@ -686,7 +688,7 @@ version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74351c3392ea1ff6cd2628e0042d268ac2371cb613252ff383b6dfa50d22fa79" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -698,9 +700,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -897,7 +899,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6341b3480afbb34eaefc7f92713bc92f2d83e338aaa1c44192f9c2956f4a4903" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "log", "managed", @@ -940,9 +942,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -1015,9 +1017,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "igvm" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc8970c7e36437c52af3b3ef1acaa5e334c2a95cd8ee9639d574830f48af17e" +checksum = "7984b10433b50e06a06bd50c69bca4888a5d7de8975f64ea4c2a7687eb99b09d" dependencies = [ "bitfield-struct", "crc32fast", @@ -1032,9 +1034,9 @@ dependencies = [ [[package]] name = "igvm_defs" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4942827cef415726296f6d62411afdb13c1b1924125f3222988f04bef33ad2" +checksum = "b64ec5588c475372ae830475d3ee9a7bd255407dcb9f03faf6d493556eb6105a" dependencies = [ "bitfield-struct", "open-enum", @@ -1080,6 +1082,12 @@ dependencies = [ "serde", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itoa" version = "1.0.11" @@ -1112,12 +1120,23 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bedae2ca4a531bebe311abaf9691f5cc14eaa21475243caa2e39c43bb872947d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "kvm-bindings", "libc", "vmm-sys-util", ] +[[package]] +name = "landlock" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dafb8a4afee64f167eb2b52d32f0eea002e41a7a6450e68c799c8ec3a81a634c" +dependencies = [ + "enumflags2", + "libc", + "thiserror", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -1126,9 +1145,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libredox" @@ -1136,7 +1155,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -1156,9 +1175,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -1193,9 +1212,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "managed" @@ -1311,7 +1330,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -1335,19 +1354,20 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.66", @@ -1355,9 +1375,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -1370,29 +1390,29 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open-enum" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba485b94b3e73fa752d98cfcab74647a4a537269682cc1ee5256aa020432506d" +checksum = "2eb2508143a400b3361812094d987dd5adc81f0f5294a46491be648d6c94cab5" dependencies = [ "open-enum-derive", ] [[package]] name = "open-enum-derive" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1c261430059cab8b2b51eec42a3c15750439ec6c013cd8fe41d4a450de776" +checksum = "8d1296fab5231654a5aec8bf9e87ba4e3938c502fc4c3c0425a00084c78944be" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "openssl-src" -version = "300.2.3+3.2.1" +version = "300.3.1+3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" dependencies = [ "cc", ] @@ -1486,9 +1506,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pci" @@ -1538,9 +1558,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand", @@ -1555,9 +1575,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "pnet" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "130c5b738eeda2dc5796fe2671e49027e6935e817ab51b930a36ec9e6a206a64" +checksum = "682396b533413cc2e009fbb48aadf93619a149d3e57defba19ff50ce0201bd0d" dependencies = [ "ipnetwork", "pnet_base", @@ -1569,18 +1589,18 @@ dependencies = [ [[package]] name = "pnet_base" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4cf6fb3ab38b68d01ab2aea03ed3d1132b4868fa4e06285f29f16da01c5f4c" +checksum = "ffc190d4067df16af3aba49b3b74c469e611cad6314676eaf1157f31aa0fb2f7" dependencies = [ "no-std-net", ] [[package]] name = "pnet_datalink" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5854abf0067ebbd3967f7d45ebc8976ff577ff0c7bd101c4973ae3c70f98fe" +checksum = "e79e70ec0be163102a332e1d2d5586d362ad76b01cec86f830241f2b6452a7b7" dependencies = [ "ipnetwork", "libc", @@ -1591,9 +1611,9 @@ dependencies = [ [[package]] name = "pnet_macros" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688b17499eee04a0408aca0aa5cba5fc86401d7216de8a63fdf7a4c227871804" +checksum = "13325ac86ee1a80a480b0bc8e3d30c25d133616112bb16e86f712dcf8a71c863" dependencies = [ "proc-macro2", "quote", @@ -1603,18 +1623,18 @@ dependencies = [ [[package]] name = "pnet_macros_support" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea925b72f4bd37f8eab0f221bbe4c78b63498350c983ffa9dd4bcde7e030f56" +checksum = "eed67a952585d509dd0003049b1fc56b982ac665c8299b124b90ea2bdb3134ab" dependencies = [ "pnet_base", ] [[package]] name = "pnet_packet" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a005825396b7fe7a38a8e288dbc342d5034dac80c15212436424fef8ea90ba" +checksum = "4c96ebadfab635fcc23036ba30a7d33a80c39e8461b8bd7dc7bb186acb96560f" dependencies = [ "glob", "pnet_base", @@ -1624,9 +1644,9 @@ dependencies = [ [[package]] name = "pnet_sys" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "417c0becd1b573f6d544f73671070b039051e5ad819cc64aa96377b536128d00" +checksum = "7d4643d3d4db6b08741050c2f3afa9a892c4244c085a72fcda93c9c2c9a00f4b" dependencies = [ "libc", "winapi", @@ -1634,9 +1654,9 @@ dependencies = [ [[package]] name = "pnet_transport" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2637e14d7de974ee2f74393afccbc8704f3e54e6eb31488715e72481d1662cc3" +checksum = "5f604d98bc2a6591cf719b58d3203fd882bdd6bf1db696c4ac97978e9f4776bf" dependencies = [ "libc", "pnet_base", @@ -1661,9 +1681,12 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro-crate" @@ -1770,9 +1793,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -1799,9 +1822,9 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "remain" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9f2390298a947ee0aa6073d440e221c0726188cfbcdf9604addb6ee393eb4a" +checksum = "46aef80f842736de545ada6ec65b81ee91504efd6853f4b96de7414c42ae7443" dependencies = [ "proc-macro2", "quote", @@ -1826,7 +1849,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -1876,9 +1899,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -1898,9 +1921,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.7.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ "serde", "serde_derive", @@ -1909,9 +1932,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.7.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ "darling", "proc-macro2", @@ -1946,9 +1969,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -2062,18 +2085,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" dependencies = [ "proc-macro2", "quote", @@ -2257,7 +2280,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6be08d1166d41a78861ad50212ab3f9eca0729c349ac3a7a8f557c62406b87cc" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "vm-memory", "vmm-sys-util", @@ -2433,7 +2456,7 @@ dependencies = [ "anyhow", "arc-swap", "arch", - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "blocking", "cfg-if", @@ -2450,6 +2473,7 @@ dependencies = [ "hypervisor", "igvm", "igvm_defs", + "landlock", "libc", "linux-loader", "log", @@ -2803,9 +2827,9 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", "zerocopy-derive", @@ -2813,9 +2837,9 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", @@ -2824,9 +2848,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" dependencies = [ "endi", "enumflags2", @@ -2837,9 +2861,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" dependencies = [ "proc-macro-crate", "proc-macro2", diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index cbe7cff1832f..f1dcda8df721 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -4,23 +4,15 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "40.0"; + version = "41.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - hash = "sha256-zrMJGdbOukNbzmcTuIcHlwAbJvTzhz53dc4TO/Fplb4="; + hash = "sha256-CI7hWRZUexvmBZJ8cPXxZxwmcxLnw6h9PFMhoaj9jh4="; }; - patches = [ - (fetchpatch { - name = "ub.patch"; - url = "https://github.com/cloud-hypervisor/cloud-hypervisor/commit/02f146fef81c4aa4a7ef3555c176d3b533158d7a.patch"; - hash = "sha256-g9WcGJy8Q+Bc0egDfoQVSVfKqyXa8vkIZk+aYQyFuy8="; - }) - ]; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { From 99714ac2fc613d672ec6b5d201be09bdc0629d70 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Fri, 16 Aug 2024 12:13:40 -0700 Subject: [PATCH 109/124] nixos/nebula: add missing `with maintainers` --- nixos/modules/services/networking/nebula.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/nebula.nix b/nixos/modules/services/networking/nebula.nix index d69af8d16b52..477731f3f5a4 100644 --- a/nixos/modules/services/networking/nebula.nix +++ b/nixos/modules/services/networking/nebula.nix @@ -270,5 +270,5 @@ in }) enabledNetworks); }; - meta.maintainers = [ numinit ]; + meta.maintainers = with maintainers; [ numinit ]; } From f799014fbfad35ea30392b262b3712ae27000b18 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 21:38:35 +0200 Subject: [PATCH 110/124] python312Packages.tencentcloud-sdk-python: 3.0.1212 -> 3.0.1213 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1212...3.0.1213 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1213/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 0fe34d24a0af..42eee643af23 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1212"; + version = "3.0.1213"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-9+gDWklZVCNu+l0knZA+3LaAtq6PmUmt2LVITpWP/O4="; + hash = "sha256-yDMAYfMaV57Rxh7ApaF/06Ir1AN20VH4NDJW5GenTvM="; }; build-system = [ setuptools ]; From db5126d79831a960c435d624c0b446ec7ea62380 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Aug 2024 16:39:05 +0200 Subject: [PATCH 111/124] mqttui: 0.21.0 -> 0.21.1 Diff: https://github.com/EdJoPaTo/mqttui/compare/refs/tags/v0.21.0...v0.21.1 Changelog: https://github.com/EdJoPaTo/mqttui/blob/v0.21.1/CHANGELOG.md --- pkgs/by-name/mq/mqttui/Cargo.lock | 503 ++++++++++++++++------------- pkgs/by-name/mq/mqttui/package.nix | 6 +- 2 files changed, 281 insertions(+), 228 deletions(-) diff --git a/pkgs/by-name/mq/mqttui/Cargo.lock b/pkgs/by-name/mq/mqttui/Cargo.lock index 7726441244f5..97d600c7d335 100644 --- a/pkgs/by-name/mq/mqttui/Cargo.lock +++ b/pkgs/by-name/mq/mqttui/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -26,7 +26,7 @@ dependencies = [ "cfg-if", "once_cell", "version_check", - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -52,47 +52,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -100,9 +101,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "async-tungstenite" @@ -135,15 +136,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -156,21 +157,15 @@ dependencies = [ [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block-buffer" @@ -195,9 +190,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "cassowary" @@ -207,18 +202,18 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "castaway" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" dependencies = [ "rustversion", ] [[package]] name = "cc" -version = "1.0.94" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" [[package]] name = "cfg-if" @@ -236,14 +231,14 @@ dependencies = [ "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "clap" -version = "4.5.4" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3" dependencies = [ "clap_builder", "clap_derive", @@ -251,9 +246,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa" dependencies = [ "anstream", "anstyle", @@ -264,20 +259,20 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.2" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" +checksum = "c6ae69fbb0833c6fcd5a8d4b8609f108c7ad95fc11e248d853ff2c42a90df26a" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn", @@ -285,15 +280,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clap_mangen" -version = "0.2.20" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dd95b5ebb5c1c54581dd6346f3ed6a79a3eef95dd372fc2ac13d535535300e" +checksum = "f17415fd4dfbea46e3274fcd8d368284519b358654772afb700dc2e8d2b24eeb" dependencies = [ "clap", "roff", @@ -301,9 +296,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "compact_str" @@ -349,10 +344,10 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.5.0", + "bitflags", "crossterm_winapi", "libc", - "mio", + "mio 0.8.11", "parking_lot", "signal-hook", "signal-hook-mio", @@ -380,9 +375,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "digest" @@ -402,15 +397,15 @@ checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591" [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -543,9 +538,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -554,32 +549,32 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + [[package]] name = "http" version = "1.1.0" @@ -593,9 +588,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "iana-time-zone" @@ -631,10 +626,10 @@ dependencies = [ ] [[package]] -name = "indoc" -version = "2.0.5" +name = "is_terminal_polyfill" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -645,6 +640,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -662,21 +666,21 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -684,9 +688,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" @@ -699,15 +703,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] @@ -724,9 +728,21 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "mqttui" -version = "0.21.0" +version = "0.21.1" dependencies = [ "anyhow", "chrono", @@ -747,23 +763,24 @@ dependencies = [ "serde", "serde_json", "tui-tree-widget", + "unicode-width", "url", ] [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] @@ -782,9 +799,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -792,22 +809,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -839,15 +856,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f" +dependencies = [ + "zerocopy 0.6.6", +] [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -893,39 +913,39 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564a852040e82671dc50a37d88f3aa83bbc690dfc6844cfe7a2591620206a80" +checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef" dependencies = [ - "bitflags 2.5.0", + "bitflags", "cassowary", "compact_str", "crossterm", - "indoc", - "itertools", + "itertools 0.12.1", "lru", "paste", "stability", "strum", "unicode-segmentation", + "unicode-truncate", "unicode-width", ] [[package]] name = "ratatui-binary-data-widget" version = "0.1.0" -source = "git+https://github.com/EdJoPaTo/ratatui-binary-data-widget?branch=main#dcc0ef5e9492b6e638d0bf0ca0e9eb94f47e3795" +source = "git+https://github.com/EdJoPaTo/ratatui-binary-data-widget?branch=main#32cfa2d930728429780e5032722d7350c1ca7ce6" dependencies = [ "ratatui", ] [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -956,9 +976,9 @@ dependencies = [ [[package]] name = "rmpv" -version = "1.0.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e540282f11751956c82bc5529a7fb71b871b998fbf9cf06c2419b22e1b4350df" +checksum = "58450723cd9ee93273ce44a20b6ec4efe17f8ed2e3631474387bfdecf18bb2a9" dependencies = [ "num-traits", "rmp", @@ -968,9 +988,9 @@ dependencies = [ [[package]] name = "roff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" +checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3" [[package]] name = "rumqttc" @@ -995,9 +1015,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -1010,11 +1030,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -1023,9 +1043,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.3" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", @@ -1037,9 +1057,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -1060,15 +1080,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.4.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -1077,15 +1097,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" @@ -1104,11 +1124,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation", "core-foundation-sys", "libc", @@ -1117,9 +1137,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -1127,33 +1147,33 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.198" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -1162,11 +1182,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -1194,20 +1215,20 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio", + "mio 0.8.11", "signal-hook", ] [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -1229,9 +1250,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1248,9 +1269,9 @@ dependencies = [ [[package]] name = "stability" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a" +checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac" dependencies = [ "quote", "syn", @@ -1270,20 +1291,20 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", "rustversion", @@ -1292,15 +1313,15 @@ dependencies = [ [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.59" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -1319,18 +1340,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -1339,9 +1360,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -1354,25 +1375,25 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", - "mio", + "mio 1.0.1", "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -1423,9 +1444,9 @@ dependencies = [ [[package]] name = "tui-tree-widget" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0c6f924587e719c50b8f83485afbe4d4c16edca6b641d5d9a3204edeba5cf0" +checksum = "a6201de8ad8d88cb6cac4cfe3436d9a1ea31c0732a7aec4c2cc3b23186ad7dcc" dependencies = [ "ratatui", "unicode-width", @@ -1486,10 +1507,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] -name = "unicode-width" -version = "0.1.11" +name = "unicode-truncate" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf" +dependencies = [ + "itertools 0.13.0", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "unicode-width" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "untrusted" @@ -1499,9 +1531,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -1516,15 +1548,15 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wasi" @@ -1614,7 +1646,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1632,7 +1664,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1652,18 +1684,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -1674,9 +1706,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -1686,9 +1718,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -1698,15 +1730,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -1716,9 +1748,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -1728,9 +1760,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -1740,9 +1772,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -1752,9 +1784,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "ws_stream_tungstenite" @@ -1764,7 +1796,7 @@ checksum = "a198f414f083fb19fcc1bffcb0fa0cf46d33ccfa229adf248cac12c180e91609" dependencies = [ "async-tungstenite", "async_io_stream", - "bitflags 2.5.0", + "bitflags", "futures-core", "futures-io", "futures-sink", @@ -1778,18 +1810,39 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" dependencies = [ - "zerocopy-derive", + "byteorder", + "zerocopy-derive 0.6.6", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive 0.7.35", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", @@ -1798,6 +1851,6 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/by-name/mq/mqttui/package.nix b/pkgs/by-name/mq/mqttui/package.nix index a1023cb6deba..e4bbd4974f31 100644 --- a/pkgs/by-name/mq/mqttui/package.nix +++ b/pkgs/by-name/mq/mqttui/package.nix @@ -8,19 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "mqttui"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "EdJoPaTo"; repo = "mqttui"; rev = "refs/tags/v${version}"; - hash = "sha256-aIvT1js+xY1rauZYVCkl71JLfIDjIEGy3W8WdIaTyxY="; + hash = "sha256-JxaXiQj/dGSUhqyDtNij3JKT5NtEkyMta6rLGHmcLrU="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ratatui-binary-data-widget-0.1.0" = "sha256-4/8ZZag7vpEXnh6wJvZkgGLrOQNJXsnek3gFG/F0+zY="; + "ratatui-binary-data-widget-0.1.0" = "sha256-IQ6BbFW1huv8QrNjqBMVKVMN7gfic/NyTBQNf+wCwAo="; }; }; From fdde669dfc7a99f3aa83c6d34d252bd7df6ea90e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 22:11:17 +0200 Subject: [PATCH 112/124] nuclei: 3.3.0 -> 3.3.1 Diff: https://github.com/projectdiscovery/nuclei/compare/refs/tags/v3.3.0...v3.3.1 Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v3.3.1 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 74cd4a057820..d0bd1280349c 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-1Vc8bza7RVqIxnRQVNki43Y3iwS9wH4bGbJn2Ee4jVY="; + hash = "sha256-pUctan5p3jxrj2/98nzibZQAL2EK8R5jnD/hjVgxSzQ="; }; - vendorHash = "sha256-53s4z0XWkoB52gRQJ8ADDQxo+RX7cN698E8PtLXcXrc="; + vendorHash = "sha256-sJkkgh7F5Hgj9K6m7OTQbamkcS3uS78jK9HdLYeypIU="; subPackages = [ "cmd/nuclei/" ]; From 01ee55582670317107863cb756c7e24a5a3bba6a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 22:16:09 +0200 Subject: [PATCH 113/124] python312Packages.playwrightcapture: 1.25.12 -> 1.25.13 Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.25.12...v1.25.13 Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.25.13 --- pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 2b1b168bfe44..33e95475b887 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.25.12"; + version = "1.25.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-nVRXTswisYm5Lbhb6brkUbl9okTkAcU+6WDe3Q+v6Cg="; + hash = "sha256-O482RKJejgg3eJe4M9U0ExuDFwFz9Fbpxvrn6re58h8="; }; pythonRelaxDeps = [ From 7f856d0f5ba4d9ce35f65eaf2ad4b65ac36840af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 22:16:26 +0200 Subject: [PATCH 114/124] python312Packages.lacuscore: 1.10.10 -> 1.10.11 Diff: https://github.com/ail-project/LacusCore/compare/refs/tags/v1.10.10...v1.10.11 Changelog: https://github.com/ail-project/LacusCore/releases/tag/v1.10.11 --- pkgs/development/python-modules/lacuscore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 603579c0c075..f84b74b6e9fc 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.10.10"; + version = "1.10.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; rev = "refs/tags/v${version}"; - hash = "sha256-FayFtkCV19fHlwsHIljVYEXJc8rxGZingfug3k2JCBM="; + hash = "sha256-WO0aAvSm0fE7AjgFxnLc5Sej0Ub7v8LruSgrwdFlUPE="; }; pythonRelaxDeps = [ From 92b7902d5eb3682958bc4efaa9fda31fefcc66df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 22:20:44 +0200 Subject: [PATCH 115/124] python312Packages.nessclient: 1.0.0 -> 1.1.2 Diff: https://github.com/nickw444/nessclient/compare/refs/tags/1.0.0...1.1.2 Changelog: https://github.com/nickw444/nessclient/releases/tag/1.1.2 --- .../python-modules/nessclient/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/nessclient/default.nix b/pkgs/development/python-modules/nessclient/default.nix index 160cb669be55..b13dbcba2068 100644 --- a/pkgs/development/python-modules/nessclient/default.nix +++ b/pkgs/development/python-modules/nessclient/default.nix @@ -4,30 +4,38 @@ click, fetchFromGitHub, justbackoff, + pyserial-asyncio, pythonOlder, pytest-asyncio, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "nessclient"; - version = "1.0.0"; - format = "setuptools"; + version = "1.1.2"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "nickw444"; - repo = pname; + repo = "nessclient"; rev = "refs/tags/${version}"; - hash = "sha256-UqHXKfS4zF1YhFbNKSVESmsxD0CYJKOmjMOE3blGdI8="; + hash = "sha256-STDEIY7D02MlH+R6uLAKl6ghSQjhG1OEQWj71DrZP30="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ justbackoff - click + pyserial-asyncio ]; + optional-dependencies = { + cli = [ click ]; + }; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook @@ -37,10 +45,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation/abstraction of the Ness D8x/D16x Serial Interface ASCII protocol"; - mainProgram = "ness-cli"; homepage = "https://github.com/nickw444/nessclient"; changelog = "https://github.com/nickw444/nessclient/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "ness-cli"; }; } From 0e6a73c007cb3e2ceda7446d0b653599c48dce5c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 16 Aug 2024 22:27:09 +0200 Subject: [PATCH 116/124] ruff: 0.6.0 -> 0.6.1 Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.6.0...0.6.1 Changelog: https://github.com/astral-sh/ruff/releases/tag/0.6.1 --- pkgs/by-name/ru/ruff/Cargo.lock | 6 +++--- pkgs/by-name/ru/ruff/package.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ru/ruff/Cargo.lock b/pkgs/by-name/ru/ruff/Cargo.lock index 2c69d7cb8225..d9033c14f217 100644 --- a/pkgs/by-name/ru/ruff/Cargo.lock +++ b/pkgs/by-name/ru/ruff/Cargo.lock @@ -2060,7 +2060,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.6.0" +version = "0.6.1" dependencies = [ "anyhow", "argfile", @@ -2252,7 +2252,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.6.0" +version = "0.6.1" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2572,7 +2572,7 @@ dependencies = [ [[package]] name = "ruff_wasm" -version = "0.6.0" +version = "0.6.1" dependencies = [ "console_error_panic_hook", "console_log", diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index e4cfeddc2de7..62ef5ab26522 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-s4JIqeOIxJ3NQ61fuBYYF0kSovEMcVHRExLB7kpICeg="; + hash = "sha256-/tD1TJRq+/2/KMmRHqB8ZbShoDkXG9nnBqacxXYKjbg="; }; cargoLock = { From 103b4d26d9003eaf23e7b1a38db35d53b0e9fc10 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 22:32:04 +0200 Subject: [PATCH 117/124] python312Packages.weatherflow4py: 0.2.22 -> 0.2.23 Diff: https://github.com/jeeftor/weatherflow4py/compare/refs/tags/v0.2.22...v0.2.23 Changelog: https://github.com/jeeftor/weatherflow4py/releases/tag/v0.2.23 --- pkgs/development/python-modules/weatherflow4py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix index 54f8673e23c5..ac48a838ff5a 100644 --- a/pkgs/development/python-modules/weatherflow4py/default.nix +++ b/pkgs/development/python-modules/weatherflow4py/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "weatherflow4py"; - version = "0.2.22"; + version = "0.2.23"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = "weatherflow4py"; rev = "refs/tags/v${version}"; - hash = "sha256-J1hZormJByWC29fuRAJ2ozydRxQh9bGp4Pi96DuTSQo="; + hash = "sha256-ghdjQyZPLFzgmrB2ppzNbqM/D2/zW872tw4emzInLBY="; }; build-system = [ poetry-core ]; From c3a3297d81b564fc09754b89ea73eec20ba7aa92 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 22:34:12 +0200 Subject: [PATCH 118/124] python312Packages.pyexploitdb: 0.2.29 -> 0.2.30 Changelog: https://github.com/GoVanguard/pyExploitDb/blob/master/ChangeLog.md --- pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 20af23be5601..f2a947e1e405 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.29"; + version = "0.2.30"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-kS9VoEsXdXQOedbDkgAP2x+MuWG5kCAvpcquDQn7Jno="; + hash = "sha256-o0qlF7EqFMIkv5epPIjri8hZDrIXs9hOF6qg4xPunq8="; }; build-system = [ setuptools ]; From f9119f8838fde7df90f3fd21bce4acb7586587ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 22:34:46 +0200 Subject: [PATCH 119/124] python312Packages.pyflic: 2.0.3 -> 2.0.4 Diff: https://github.com/soldag/pyflic/compare/2.0.3...2.0.4 --- pkgs/development/python-modules/pyflic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyflic/default.nix b/pkgs/development/python-modules/pyflic/default.nix index 7e636607b0ed..09b80a3aaf14 100644 --- a/pkgs/development/python-modules/pyflic/default.nix +++ b/pkgs/development/python-modules/pyflic/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyflic"; - version = "2.0.3"; + version = "2.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "soldag"; repo = pname; rev = version; - sha256 = "0adf4k191138jmbsfhkhhbgaxcq97d1hr5w48ryxr1fig64sjqy2"; + sha256 = "sha256-K1trMBZfc1aHSNSddq0v//Gv8ySgT/ONQYgrKWzw2qs="; }; # Projec thas no tests From d0bef3cb6b58d0e5fbe886c7070016c09f451a88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 22:36:50 +0200 Subject: [PATCH 120/124] python312Packages.pyairnow: 1.2.1 -> 1.2.2 Diff: https://github.com/asymworks/pyairnow/compare/refs/tags/v1.2.1...v1.2.2 Changelog: https://github.com/asymworks/pyairnow/blob/v1.2.2/CHANGELOG.md --- .../python-modules/pyairnow/default.nix | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/pyairnow/default.nix b/pkgs/development/python-modules/pyairnow/default.nix index e3d93e1cfb12..667869f48a17 100644 --- a/pkgs/development/python-modules/pyairnow/default.nix +++ b/pkgs/development/python-modules/pyairnow/default.nix @@ -4,39 +4,31 @@ aioresponses, buildPythonPackage, fetchFromGitHub, - fetchpatch, - pytest-aiohttp, poetry-core, + pytest-aiohttp, pytest-asyncio, pytest-cov, pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "pyairnow"; - version = "1.2.1"; - format = "pyproject"; + version = "1.2.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "asymworks"; - repo = pname; + repo = "pyairnow"; rev = "refs/tags/v${version}"; - hash = "sha256-aab+3xrEiCjysa+DzXWelQwz8V2tr74y8v0NpDZiuTk="; + hash = "sha256-KjOu9V92n2rq8iOkgutlK7EMRvirFAEK8oxseI+dr2s="; }; - patches = [ - (fetchpatch { - # remove setuptools, wheel from build-system requirements - # https://github.com/asymworks/pyairnow/pull/7 - name = "pyairnow-build-system.patch"; - url = "https://github.com/asymworks/pyairnow/commit/e3cc892ffce855d8213264248b6b4ed78ee791bd.patch"; - hash = "sha256-L0MV2okkf6Nf1S4zS7lb4lt5eSfTF10yDJLzpyDrSl8="; - }) - ]; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; nativeCheckInputs = [ aioresponses @@ -52,7 +44,7 @@ buildPythonPackage rec { description = "Python wrapper for EPA AirNow Air Quality API"; homepage = "https://github.com/asymworks/pyairnow"; changelog = "https://github.com/asymworks/pyairnow/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From fd8508a4a8454598f8247393439c0a95d73ad119 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 22:38:13 +0200 Subject: [PATCH 121/124] python312Packages.pyairnow: migrate to pytest-cov-stub --- pkgs/development/python-modules/pyairnow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyairnow/default.nix b/pkgs/development/python-modules/pyairnow/default.nix index 667869f48a17..5a59c39d62b2 100644 --- a/pkgs/development/python-modules/pyairnow/default.nix +++ b/pkgs/development/python-modules/pyairnow/default.nix @@ -7,7 +7,7 @@ poetry-core, pytest-aiohttp, pytest-asyncio, - pytest-cov, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -34,7 +34,7 @@ buildPythonPackage rec { aioresponses pytest-asyncio pytest-aiohttp - pytest-cov + pytest-cov-stub pytestCheckHook ]; From bc1527040e25a8399fbd6e3d363dff8829842dbb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 22:42:09 +0200 Subject: [PATCH 122/124] python312Packages.aio-pika: 9.4.2 -> 9.4.3 Diff: https://github.com/mosquito/aio-pika/compare/refs/tags/9.4.2...9.4.3 Changelog: https://github.com/mosquito/aio-pika/blob/9.4.3/CHANGELOG.md --- pkgs/development/python-modules/aio-pika/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index 0cbc50b66735..0b00a8130dae 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aio-pika"; - version = "9.4.2"; + version = "9.4.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = "aio-pika"; rev = "refs/tags/${version}"; - hash = "sha256-Juzbn6A8IIdbtlN3cyT7UBb9fMpEgEgg0VE8GJCnGW4="; + hash = "sha256-lzBBcfWzhdT2v9RX5C+VWWSxsBCB7EOeCjm6wUrXGtA="; }; build-system = [ poetry-core ]; From 475952a296ec6bd332d0d078fff5e8453b25067a Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Fri, 16 Aug 2024 11:03:14 -0700 Subject: [PATCH 123/124] craftos-pc: 2.8.2 -> 2.8.3 This is a security and bugfix release. Changelog: https://github.com/MCJack123/craftos2/releases/tag/v2.8.3 Resolves: CVE-2024-39840/GHSA-vcvg-6m26-26vr and CVE-2024-43395/GHSA-hr3w-wc83-6923 --- pkgs/applications/emulators/craftos-pc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index 1952bd6e6bd3..535b50b0f138 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -15,18 +15,18 @@ }: let - version = "2.8.2"; + version = "2.8.3"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; rev = "v${version}"; - hash = "sha256-Kv0supnYKWLaVqOeZAzQNd3tQRP2KJugZqytyoj8QtY="; + hash = "sha256-OCHN/ef83X4r5hZcPfFFvNJHjINCTiK+COf369/WPsA="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; rev = "v${version}"; - hash = "sha256-5ZsLsqrkO02NLJCzsgf0k/ifsqNybTi4DcB9GLmWDHw="; + hash = "sha256-YidLt/JLwBMW0LMo5Q5PV6wGhF0J72FGX+iWYn6v0Z4="; }; in @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - hash = "sha256-ozebHgUgwdqYtWAyL+EdwpjEvZC+PkWcLYCPWz2FjSw="; + hash = "sha256-DbxAsXxpsa42dF6DaLmgIa+Hs/PPqJ4dE97PoKxG2Ig="; }; nativeBuildInputs = [ patchelf unzip ]; From ff93fa8385374ab39eafc2dc882f699bc010f49a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 21:34:23 +0200 Subject: [PATCH 124/124] metasploit: 6.4.21 -> 6.4.22 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 6 +++--- pkgs/tools/security/metasploit/default.nix | 4 ++-- pkgs/tools/security/metasploit/gemset.nix | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index a1a7159a2f38..faf09c5b2020 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.21" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.22" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 64607271cc8d..efbcd18ba416 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 91e46e232df4f94407147a93fe737ebde4babcb7 - ref: refs/tags/6.4.21 + revision: ffbd0eb2c802218e23052b7722ec08988a301411 + ref: refs/tags/6.4.22 specs: - metasploit-framework (6.4.21) + metasploit-framework (6.4.22) aarch64 abbrev actionpack (~> 7.0.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index c980a5d19674..3fc270533b80 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.21"; + version = "6.4.22"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-0qo7uxE6ovB3lqE4igmyJeMEtxgsEop6azt3EibDBmM="; + hash = "sha256-MJvYTsM03AxmTuOOiZvQT6npQ3KgHbP9OPz8sFZZ2d8="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index cc5c267854e4..8cccf2052612 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -724,12 +724,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "91e46e232df4f94407147a93fe737ebde4babcb7"; - sha256 = "0qq6qck14xrvddx8l4ic32vh9qr5n84qlf51jrvz18is26xkpanj"; + rev = "ffbd0eb2c802218e23052b7722ec08988a301411"; + sha256 = "1pyrb5bb1z7w73yv67d0f91ykaags2dqk3p39rk0rp1lqd7di6rh"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.21"; + version = "6.4.22"; }; metasploit-model = { groups = ["default"];