From 1043d2477e0059bd8dcbbb806578bab03a30e276 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 29 Jun 2024 00:25:00 +0200 Subject: [PATCH 001/357] vyper: 0.3.10 -> 0.4.0 Fixes CVE-2024-22419, CVE-2024-24559, CVE-2024-24560, CVE-2024-24561, CVE-2024-24563 and CVE-2024-24567. Release notes: https://github.com/vyperlang/vyper/releases/tag/v0.4.0 --- pkgs/development/compilers/vyper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 078cb7dac925..af16a4bb0248 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -21,7 +21,7 @@ let sample-contract = writeText "example.vy" '' count: int128 - @external + @deploy def __init__(foo: address): self.count = 1 ''; @@ -29,14 +29,14 @@ let in buildPythonPackage rec { pname = "vyper"; - version = "0.3.10"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-jcH1AcqrQX+wzpxoppRFh/AUfsfMfTiJzzpFwZRm5Ik="; + hash = "sha256-locUXGoL9C3lLpIgLOmpE2SNPGV6yOXPubNaEA3EfjQ="; }; postPatch = '' From 5f897e2abb090e4410159ea2aabb51626c1a0d0d Mon Sep 17 00:00:00 2001 From: Andreas Bielawski Date: Sun, 30 Jun 2024 20:14:55 +0200 Subject: [PATCH 002/357] maccy: 0.28.0 -> 0.31.0 --- pkgs/by-name/ma/maccy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/maccy/package.nix b/pkgs/by-name/ma/maccy/package.nix index 41ea87634a1b..6aa0c0ad43f0 100644 --- a/pkgs/by-name/ma/maccy/package.nix +++ b/pkgs/by-name/ma/maccy/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "maccy"; - version = "0.28.0"; + version = "0.31.0"; src = fetchurl { url = "https://github.com/p0deje/Maccy/releases/download/${finalAttrs.version}/Maccy.app.zip"; - hash = "sha256-dxjt5skIHN6VlkWpcmj+ZSovVARuQETKoyKMkMtUhHQ="; + hash = "sha256-vjfFtlX0b3howUc2bTR/pqXwnzjXpK6qPR8+81sANTs="; }; dontUnpack = true; From df83a721daa094fc6b15b24e94965821ebd01bec Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Tue, 9 Jul 2024 23:37:56 +0800 Subject: [PATCH 003/357] 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 72a442d42de52492082b0b0ec6efd68dc235d2af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 05:09:12 +0000 Subject: [PATCH 004/357] cproto: 4.7v -> 4.7w --- pkgs/development/tools/misc/cproto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix index 976f34f35fb5..faf0e8e5a4ee 100644 --- a/pkgs/development/tools/misc/cproto/default.nix +++ b/pkgs/development/tools/misc/cproto/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "cproto"; - version = "4.7v"; + version = "4.7w"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # No version listings and apparently no versioned tarball over http(s). "ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz" ]; - sha256 = "sha256-897D9hAncBlpdkWcS0SsJzVfYSDaduUjHsEyPjedFRE="; + sha256 = "sha256-ix1GjM2aKFnzmcdf773KDf3KTcMYkf7bxArFwybSe20="; }; # patch made by Joe Khoobyar copied from gentoo bugs From b10c9c4824039b6b1fa57c2f4d246d710e5e9f81 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Thu, 18 Jul 2024 14:15:51 +1000 Subject: [PATCH 005/357] gparted: fix GParted not running on Wayland Fixes https://github.com/NixOS/nixpkgs/issues/299729 --- pkgs/tools/misc/gparted/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index eef6062c73a5..9f5192c6d996 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -2,7 +2,7 @@ , adwaita-icon-theme , gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook3, substituteAll -, mtools, dosfstools +, mtools, dosfstools, xhost }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = [ "--disable-doc" ]; + configureFlags = [ "--disable-doc" "--enable-xhost-root" ]; buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin adwaita-icon-theme ]; nativeBuildInputs = [ gettext pkg-config wrapGAppsHook3 ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep mtools dosfstools ]}" + --prefix PATH : "${lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep mtools dosfstools xhost ]}" ) ''; From 3d6784a1adcdc90bfc37fa6d2a3253651e257ac1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 15:01:46 +0000 Subject: [PATCH 006/357] sof-tools: 2.9 -> 2.10 --- pkgs/by-name/so/sof-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/sof-tools/package.nix b/pkgs/by-name/so/sof-tools/package.nix index 179210da93e3..e7a591849f07 100644 --- a/pkgs/by-name/so/sof-tools/package.nix +++ b/pkgs/by-name/so/sof-tools/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sof-tools"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "thesofproject"; repo = "sof"; rev = "v${version}"; - hash = "sha256-AOBJtC40Lu1gWM8w/Vs/nc540bisg58m+qH16F1e6jY="; + hash = "sha256-VmP0z3q1P8LqQ+ELZGkI7lEXGiMYdAPvS8Lbwv6dUyk="; }; nativeBuildInputs = [ cmake ]; From 5f533e318c5b80f481afbec9125e7575709faea3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 13:56:40 +0000 Subject: [PATCH 007/357] commonsDaemon: 1.3.4 -> 1.4.0 --- pkgs/development/libraries/java/commons/daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/commons/daemon/default.nix b/pkgs/development/libraries/java/commons/daemon/default.nix index 68b1c924214d..63cc3d41a0c3 100644 --- a/pkgs/development/libraries/java/commons/daemon/default.nix +++ b/pkgs/development/libraries/java/commons/daemon/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.3.4"; + version = "1.4.0"; pname = "commons-daemon"; src = fetchurl { url = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz"; - sha256 = "sha256-n9zmdPC4nLs/Rnth9uojkc5Kg5IfgERbr08TOvENR0Q="; + sha256 = "sha256-Cnsd15yREDtkoNFRAsIpACnChncVNgddTJ1CEvhKn48="; }; installPhase = '' From 87482f591503c548bb44820c5cbd665a4aa69072 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 17:04:55 +0000 Subject: [PATCH 008/357] spring-boot-cli: 3.3.1 -> 3.3.2 --- pkgs/development/tools/spring-boot-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index 572ed0cfe1f8..d7d0acdd813c 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "3.3.1"; + version = "3.3.2"; src = fetchzip { url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip"; - hash = "sha256-3Mlid+hvHVjAw5pE6vyieSHWH8Zkoty3GuwE1gB5yQM="; + hash = "sha256-6xHiSd+CEFOZHiSLfAeMp/xcnTuEkFpCzYLgnnNkRN4="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 52e3f9dbf40d7b0c4bfebee96ad021101dde45bc Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Sat, 20 Jul 2024 02:20:47 +0800 Subject: [PATCH 009/357] 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 010/357] 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 f09ab69a7e15a170060e7c459008f31c1d31b058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 1 Jul 2024 13:33:28 +0200 Subject: [PATCH 011/357] nixos/zerotierone: clean up local.conf symlinks unconditionally --- nixos/modules/services/networking/zerotierone.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix index 2485327ed44e..8b52ad7dd51e 100644 --- a/nixos/modules/services/networking/zerotierone.nix +++ b/nixos/modules/services/networking/zerotierone.nix @@ -60,14 +60,16 @@ in mkdir -p /var/lib/zerotier-one/networks.d chmod 700 /var/lib/zerotier-one chown -R root:root /var/lib/zerotier-one + + # cleans up old symlinks also if we unset localConf + if [[ -L "${localConfFilePath}" && "$(readlink "${localConfFilePath}")" =~ ^${builtins.storeDir}.* ]]; then + rm ${localConfFilePath} + fi '' + (concatMapStrings (netId: '' touch "/var/lib/zerotier-one/networks.d/${netId}.conf" - '') cfg.joinNetworks) + optionalString (cfg.localConf != {}) '' - if [ -L "${localConfFilePath}" ] - then - rm ${localConfFilePath} - elif [ -f "${localConfFilePath}" ] - then + '') cfg.joinNetworks) + lib.optionalString (cfg.localConf != {}) '' + # in case the user has applied manual changes to the local.conf, we backup the file + if [ -f "${localConfFilePath}" ]; then mv ${localConfFilePath} ${localConfFilePath}.bak fi ln -s ${localConfFile} ${localConfFilePath} From 24917d46ab276dcb25c2d0cf00a3faad60e72a1f Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Sat, 20 Jul 2024 14:41:38 +0000 Subject: [PATCH 012/357] john: disable unfree code by default Introduce enableUnfree option which controls whether the non-free UnRAR code is included. Update meta.license accordingly. --- pkgs/tools/security/john/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index aeefcaa0bbef..5f27e61ec39f 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -17,6 +17,8 @@ withOpenCL ? true, opencl-headers, ocl-icd, + # include non-free ClamAV unrar code + enableUnfree ? false, substituteAll, makeWrapper, }: @@ -64,7 +66,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-native-tests" "--with-systemwide" - ]; + ] ++ lib.optionals (!enableUnfree) [ "--without-unrar" ]; buildInputs = [ @@ -131,7 +133,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "John the Ripper password cracker"; - license = licenses.gpl2Plus; + license = [ licenses.gpl2Plus ] ++ lib.optionals enableUnfree [ licenses.unfreeRedistributable ]; homepage = "https://github.com/openwall/john/"; maintainers = with maintainers; [ offline From 0fef31c2f0fc358c90fc9a03c51cb3a20cba251b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 01:43:51 +0000 Subject: [PATCH 013/357] swagger-codegen3: 3.0.58 -> 3.0.59 --- pkgs/tools/networking/swagger-codegen3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/tools/networking/swagger-codegen3/default.nix index 257a6a9a27bb..c23cd944a6e2 100644 --- a/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/pkgs/tools/networking/swagger-codegen3/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper, testers, swagger-codegen3 }: stdenv.mkDerivation rec { - version = "3.0.58"; + version = "3.0.59"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; - sha256 = "sha256-+6jWSNDxX6ZqdOYCQ+Vqpfv95drZLqp1AGW4YdNY57M="; + sha256 = "sha256-Imlu/dyfCJ7S1cxkkLcifj+0mdU/QUYdKnemFTZHGig="; }; dontUnpack = true; From 41eb430dc5b49481b81079d09214e5432ccb4f75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 04:50:31 +0000 Subject: [PATCH 014/357] rke: 1.5.10 -> 1.6.0 --- pkgs/applications/networking/cluster/rke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/applications/networking/cluster/rke/default.nix index cea0610f144e..3f44a9cff710 100644 --- a/pkgs/applications/networking/cluster/rke/default.nix +++ b/pkgs/applications/networking/cluster/rke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rke"; - version = "1.5.10"; + version = "1.6.0"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-e4YR3vYpaRVhwvBY8VwLp3XNXxnwYlS14VP0gSyLvJA="; + hash = "sha256-ZxNU76W7IGSn1cdzmiLI/eMO3dAd8bUQX+1cvANci2k="; }; - vendorHash = "sha256-++4d87ARL1czjL9I/AuodIP2PmbjjAQ5jf5x2bP16yQ="; + vendorHash = "sha256-Rr2BXCpliv9KF9wkXQLy6LxKxyPo1pO5SHUTcy2wETM="; subPackages = [ "." ]; From 0ad5a4c2f3419b0aac6337ba9007678b4894a7da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 05:15:50 +0000 Subject: [PATCH 015/357] typescript: 5.5.3 -> 5.5.4 --- pkgs/development/compilers/typescript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/development/compilers/typescript/default.nix index eb12388f84c0..9cf8cb530cda 100644 --- a/pkgs/development/compilers/typescript/default.nix +++ b/pkgs/development/compilers/typescript/default.nix @@ -2,20 +2,20 @@ buildNpmPackage rec { pname = "typescript"; - version = "5.5.3"; + version = "5.5.4"; src = fetchFromGitHub { owner = "microsoft"; repo = "TypeScript"; rev = "v${version}"; - hash = "sha256-2yfF14hR/avl67cOwo+Gr95w2jf+7KYlsMrlBTAKswM="; + hash = "sha256-U4lFR2SJQYqJYptVf3/QMD7ufa3r7Zm704gcwFKM/7s="; }; patches = [ ./disable-dprint-dstBundler.patch ]; - npmDepsHash = "sha256-YihnUZgM+74EmImalyTFtp9xyiOOfjZVohDfpcvlSEg="; + npmDepsHash = "sha256-JYNFAOTN0WvYkr20J6tFM1KSIDTm1LlFw7w1bLkdg6k="; passthru.tests = { version = testers.testVersion { From c2d8a9127e0ae5a29d925213ef9dab3a34be29f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 12:51:44 +0000 Subject: [PATCH 016/357] kubebuilder: 4.1.0 -> 4.1.1 --- .../applications/networking/cluster/kubebuilder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index dceb843ac72b..00e4efc9f7e6 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-CaDGl8+gIbcUH+bxqye+XEFO7ZwFE7NGZmyrqn7vzTk="; + hash = "sha256-1/X8HuhzizrkiOyCZ7F6rq6G33oqVaf4uW9Sr94ogL8="; }; - vendorHash = "sha256-8f37IPO9PsYA/oHCtIjVrUgOTkXzkHv4cGTy5bUQP8s="; + vendorHash = "sha256-2b/c6t9RkHbBe894DPOETLMf4MpsTjXMtEoVG4FMo24="; subPackages = ["cmd"]; From 2c25ed6677c3324e2333a7f73a5c18ba76981397 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 13:25:29 +0000 Subject: [PATCH 017/357] kuma-dp: 2.8.1 -> 2.8.2 --- pkgs/applications/networking/cluster/kuma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 633c7df45c8c..1351b9fe7051 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -15,14 +15,14 @@ buildGoModule rec { inherit pname; - version = "2.8.1"; + version = "2.8.2"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-k4XqFwpHlm6BmFORqc1IFGqbfLYqtHwLM2eSF3JV+0M="; + hash = "sha256-znjOMegh0lgFDonUXtRfs+1ZMN5Olzz01E2tX+tRcns="; }; vendorHash = "sha256-FEdDOpz6C89OlzU3Pl4Uu6P0WgM4QsuccQ9vAHnb4xI="; From 0c22506820c7f8a1322d4e753dd8b598df780b45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 17:19:25 +0000 Subject: [PATCH 018/357] myanon: 0.5 -> 0.6 --- pkgs/by-name/my/myanon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/my/myanon/package.nix b/pkgs/by-name/my/myanon/package.nix index c1f61dbff333..3ac096267e6d 100644 --- a/pkgs/by-name/my/myanon/package.nix +++ b/pkgs/by-name/my/myanon/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "myanon"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "ppomes"; repo = "myanon"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-tTGr8bTxZc75GYhpJ0uzpkPtMB3r/DXRMNqSlG+1eaA="; + hash = "sha256-sB6ykRywaoG2gfHOEQ9UoVn62nMciBWgCM9DhovBoe0="; }; nativeBuildInputs = [ autoreconfHook flex bison ]; From 85ee1d8a3ce055caef35e3a1d44917838d0f4274 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 20:15:49 +0000 Subject: [PATCH 019/357] nco: 5.2.6 -> 5.2.7 --- pkgs/development/libraries/nco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 708babff635d..885d6cd17ba1 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nco"; - version = "5.2.6"; + version = "5.2.7"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = finalAttrs.version; - hash = "sha256-v4kK1+tn/pgY2vz5BYzCBKfvLe5hti0ofUChUvQ++JU="; + hash = "sha256-RtjLCs+1HI2tJsSzMwoKq09teILvxFapZCxeZAZ4iCM="; }; nativeBuildInputs = [ From dba5e28f7212ebc7197402faa5e93153f1a71662 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jul 2024 01:07:49 +0000 Subject: [PATCH 020/357] gvproxy: 0.7.3 -> 0.7.4 --- pkgs/tools/networking/gvproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/gvproxy/default.nix b/pkgs/tools/networking/gvproxy/default.nix index 78c45563540f..621c931c3e24 100644 --- a/pkgs/tools/networking/gvproxy/default.nix +++ b/pkgs/tools/networking/gvproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gvproxy"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${version}"; - hash = "sha256-7j/0VuiHjazsPnyQ4NbmvXX1O/NbeB9l6HfmTRZyAW8="; + hash = "sha256-ovNYPYLC01xt7uiaXkFsLHiywAhQVa0tELk/AA8dxqs="; }; vendorHash = null; From 6bb17e1b038b642d447aca6a0faa438594543598 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jul 2024 03:32:03 +0000 Subject: [PATCH 021/357] firewalld-gui: 2.2.0 -> 2.2.1 --- pkgs/applications/networking/firewalld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix index 9c0053051db1..29e39fab9030 100644 --- a/pkgs/applications/networking/firewalld/default.nix +++ b/pkgs/applications/networking/firewalld/default.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "firewalld"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-MaBYJLNVlDEsMlnyNtf8G8D1Tnvcfv0/bXQ/8f7kBao="; + sha256 = "sha256-VI1LyedohInmZb7heNoZ/4cvLz5IImEE2tyNylvr2mU="; }; patches = [ From a169c2d3eeac4bf810dff278cfb45a0aaea849a7 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 25 Jul 2024 14:04:42 -0700 Subject: [PATCH 022/357] libva: fix building with llvm --- pkgs/development/libraries/libva/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index aad42d7e51f8..a8dc727416cb 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -66,4 +66,8 @@ stdenv.mkDerivation (finalAttrs: { lib.systems.inspect.platformPatterns.isStatic ]; }; +} // lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") { + NIX_LDFLAGS = "--undefined-version"; +} // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) { + NIX_CFLAGS_COMPILE = "-DHAVE_SECURE_GETENV"; }) From fbeb9728c878038500f482abb9bb288cbbd8ec22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jul 2024 14:11:09 +0000 Subject: [PATCH 023/357] arxiv-latex-cleaner: 1.0.6 -> 1.0.8 --- pkgs/by-name/ar/arxiv-latex-cleaner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix index 608a02d70bf0..1351611e7e7b 100644 --- a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix +++ b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix @@ -5,13 +5,13 @@ }: python3Packages.buildPythonApplication rec { pname = "arxiv-latex-cleaner"; - version = "1.0.6"; + version = "1.0.8"; src = fetchFromGitHub { owner = "google-research"; repo = "arxiv-latex-cleaner"; rev = "refs/tags/v${version}"; - hash = "sha256-S/r5riFIsRG+5za+4kVvUXOLIJ3ELCDWlSpYeSuNs+s="; + hash = "sha256-CQb1u1j+/px+vNqA3iXZ2oe6/0ZWeMjWrUQL9elRDEI="; }; propagatedBuildInputs = with python3Packages; [ From d6977767d39d50a830aaf91e26e750cf6f0dbbf1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Jul 2024 01:15:56 +0000 Subject: [PATCH 024/357] gabutdm: 2.5.0 -> 2.6.0 --- pkgs/by-name/ga/gabutdm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gabutdm/package.nix b/pkgs/by-name/ga/gabutdm/package.nix index 32da32be0361..9c2e57eb119e 100644 --- a/pkgs/by-name/ga/gabutdm/package.nix +++ b/pkgs/by-name/ga/gabutdm/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "gabutdm"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "gabutakut"; repo = "gabutdm"; rev = version; - hash = "sha256-0PBNKacgKT5xcd0mnn0y9ltmxEAbP+S7MLtt/Zau8vs="; + hash = "sha256-FKOgoJ0QreYk3PgvUoQMczC3tXkthw86/Y3pnm6tTQk="; }; nativeBuildInputs = [ From 20a58a024ea7fce459e35849bc8a23d8cbfc2dcf Mon Sep 17 00:00:00 2001 From: t4ccer Date: Wed, 31 Jul 2024 10:50:14 -0600 Subject: [PATCH 025/357] python3Packages.rply: 0.7.7 -> 0.7.8 --- pkgs/development/python-modules/rply/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix index 037bbca05e52..064a7a7a9040 100644 --- a/pkgs/development/python-modules/rply/default.nix +++ b/pkgs/development/python-modules/rply/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "rply"; - version = "0.7.7"; + version = "0.7.8"; format = "setuptools"; src = fetchFromGitHub { owner = "alex"; repo = "rply"; rev = "v${version}"; - hash = "sha256-5uINDCX4Jr4bSSwqBjvkS3f5wTMnZvsRGq1DeCw8Y+M="; + hash = "sha256-mO/wcIsDIBjoxUsFvzftj5H5ziJijJcoyrUk52fcyE4="; }; propagatedBuildInputs = [ appdirs ]; From 12ed83072543d9477d983ee8eb3a15ea51064d24 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Wed, 31 Jul 2024 10:50:35 -0600 Subject: [PATCH 026/357] python3Packages.uplc: 1.0.4 -> 1.0.6 --- pkgs/development/python-modules/uplc/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/uplc/default.nix b/pkgs/development/python-modules/uplc/default.nix index bc2111a78ca5..0de44fb056ca 100644 --- a/pkgs/development/python-modules/uplc/default.nix +++ b/pkgs/development/python-modules/uplc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "uplc"; - version = "1.0.4"; + version = "1.0.6"; format = "pyproject"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "OpShin"; repo = "uplc"; rev = version; - hash = "sha256-Mio6VVgQKy1GMeHNk0DITks9Nhr3lA1t7zewu9734j4="; + hash = "sha256-FQH2GE6ihLcHtEavAYFPr8xsRqnUROtZ8yyIfRbY9CQ="; }; propagatedBuildInputs = [ @@ -37,16 +37,11 @@ buildPythonPackage rec { python-secp256k1-cardano ]; - pythonRelaxDeps = [ - "pycardano" - "rply" - ]; - pythonImportsCheck = [ "uplc" ]; meta = with lib; { description = "Python implementation of untyped plutus language core"; - homepage = "https://opshin.dev"; + homepage = "https://github.com/OpShin/uplc"; license = licenses.mit; maintainers = with maintainers; [ t4ccer ]; mainProgram = "opshin"; From 6a295ece91bdc591b5a71a371cc918e5fc464981 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Wed, 31 Jul 2024 10:50:53 -0600 Subject: [PATCH 027/357] python3Packages.pluthon: 0.5.3 -> 1.0.0 --- .../development/python-modules/pluthon/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pluthon/default.nix b/pkgs/development/python-modules/pluthon/default.nix index 3467d9b21314..21994bd0817e 100644 --- a/pkgs/development/python-modules/pluthon/default.nix +++ b/pkgs/development/python-modules/pluthon/default.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch2, buildPythonPackage, setuptools, pythonOlder, @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "pluthon"; - version = "0.5.3"; + version = "1.0.0"; format = "pyproject"; @@ -21,18 +20,9 @@ buildPythonPackage rec { owner = "OpShin"; repo = "pluthon"; rev = version; - hash = "sha256-pX/XPZJQZaSY06nLLEvhf+1LEqYG3CdgPV/3Q6XOzTs="; + hash = "sha256-IYpkb/RXRu53HoeVKik7Jog5FyXwrWItrxSla9dN0s4="; }; - patches = [ - (fetchpatch2 { - name = "pluthon-bump-uplc.patch"; - # https://github.com/OpShin/pluthon/pull/21 - url = "https://github.com/OpShin/pluthon/commit/4b0a40223f253643056cab12231264c5beffc666.patch?full_index=1"; - hash = "sha256-dO9JaIpkugZFKsr3Hd0cFCy7K+cmf77UfrdkZ+sGQtA="; - }) - ]; - propagatedBuildInputs = [ setuptools uplc From 0764ddb0a3052bc0d20afd264d0be357486ed3cb Mon Sep 17 00:00:00 2001 From: t4ccer Date: Wed, 31 Jul 2024 10:51:07 -0600 Subject: [PATCH 028/357] opshin: 0.21.2 -> 0.22.0 --- pkgs/by-name/op/opshin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/opshin/package.nix b/pkgs/by-name/op/opshin/package.nix index 7a1a9801eb1f..bda3768ca1d7 100644 --- a/pkgs/by-name/op/opshin/package.nix +++ b/pkgs/by-name/op/opshin/package.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "opshin"; - version = "0.21.2"; + version = "0.22.0"; format = "pyproject"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "OpShin"; repo = "opshin"; rev = version; - hash = "sha256-YBdYF04iKUwIZncqyEDalU+YN6/qwlx/vQDzZ19GaPU="; + hash = "sha256-ixA5D7Bm/tjYEFhqaJ4sKkCkqQZpDyrwfD/LgN6Y4Uo="; }; propagatedBuildInputs = with python3.pkgs; [ From 1c26ee085359196eb87a94823ae50f35868c9f4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 03:18:52 +0000 Subject: [PATCH 029/357] wabt: 1.0.35 -> 1.0.36 --- pkgs/development/tools/wabt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index d4454dd5459b..f2be63608b69 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.35"; + version = "1.0.36"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - hash = "sha256-oWyHR2HRDA/N5Rm9EXhOi+lZ2N7In6HmE74ZL2Nyu9A="; + hash = "sha256-CswVvL6yxTf0ju/UPvEGMgTuNZ8mumSIcnVbYVfy178="; fetchSubmodules = true; }; From 1085c876681629f08939513ccab7b7f060d79a57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 19:01:04 +0000 Subject: [PATCH 030/357] jitsi-meet-prosody: 1.0.8043 -> 1.0.8091 --- pkgs/misc/jitsi-meet-prosody/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix index 1dc5de3b1cd2..00bd87d9b298 100644 --- a/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.8043"; + version = "1.0.8091"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "aCrcsmEH3t294G2f5VzhdagzAFnWb5x1jn3htxlSXdE="; + sha256 = "LsZItRkFvpYaj5DwEv4C6tRpmypHadzSVv8/Wto2/68="; }; dontBuild = true; From 8b204c1fff72c0ad4c2df5feba4dc34622562a9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 02:51:14 +0000 Subject: [PATCH 031/357] sudo-font: 1.3 -> 1.4 --- pkgs/data/fonts/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 49df566c1871..bca96e3f87d0 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "sudo-font"; - version = "1.3"; + version = "1.4"; src = fetchzip { url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - hash = "sha256-PlsS+i/NcIMayDP6GVTDI+BLVgPSUdanlXQ8cCSXIzM="; + hash = "sha256-d0KOxINOw5G7V8c/hhgktHnSqeGNrE3Nd3ngSKSlBhc="; }; installPhase = '' From 7d044a3d41fdd3bc5afa8475ccdf5e945e32bf45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 00:32:49 +0000 Subject: [PATCH 032/357] cmark: 0.31.0 -> 0.31.1 --- pkgs/development/libraries/cmark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index 5720f87c5bc4..a118ecf1adda 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cmark"; - version = "0.31.0"; + version = "0.31.1"; src = fetchFromGitHub { owner = "commonmark"; repo = pname; rev = version; - sha256 = "sha256-GBesKTp9DqoFAmCc0RB+XePvzV9g+w+oyrD1nCgyklI="; + sha256 = "sha256-+JLw7zCjjozjq1RhRQGFqHj/MTUTq3t7A0V3T2U2PQk="; }; nativeBuildInputs = [ cmake ]; From a30c3615d340295be7f9f4bb0017f05c67db2725 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 06:29:33 +0000 Subject: [PATCH 033/357] 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 a14c557f663f0c58844ca44226f3032513ee09c3 Mon Sep 17 00:00:00 2001 From: Andreas Bielawski Date: Sun, 4 Aug 2024 13:59:22 +0200 Subject: [PATCH 034/357] tlrc: fix build on darwin --- pkgs/by-name/tl/tlrc/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix index 4faeff53e378..e0e46552352a 100644 --- a/pkgs/by-name/tl/tlrc/package.nix +++ b/pkgs/by-name/tl/tlrc/package.nix @@ -1,7 +1,9 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform , installShellFiles +, darwin }: rustPlatform.buildRustPackage rec { @@ -19,6 +21,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + postInstall = '' installManPage tldr.1 installShellCompletion completions/{tldr.bash,_tldr,tldr.fish} From 4650657fbc3a73db9c207a42168f875fb8d2b787 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Aug 2024 08:13:15 +0000 Subject: [PATCH 035/357] rabbitmq-server: 3.13.3 -> 3.13.6 --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 79493f310dab..d2184a208c00 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.13.3"; + version = "3.13.6"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-CPnoPK3tBKKmIo8IioUCUWkw6+sdvzRaAngseRZ8eUM="; + hash = "sha256-y6rHZpAhXVuO6sn18ZRvbG8qajTCVdE7iWkn+KXUhwI="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; From ad4e9d57738e137736a14a5e263cb5d2647e609f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Aug 2024 09:55:52 +0000 Subject: [PATCH 036/357] git-subrepo: 0.4.6 -> 0.4.9 --- pkgs/applications/version-management/git-subrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-subrepo/default.nix b/pkgs/applications/version-management/git-subrepo/default.nix index e861bc17b8ca..29da4ee6be8b 100644 --- a/pkgs/applications/version-management/git-subrepo/default.nix +++ b/pkgs/applications/version-management/git-subrepo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-subrepo"; - version = "0.4.6"; + version = "0.4.9"; src = fetchFromGitHub { owner = "ingydotnet"; repo = "git-subrepo"; rev = version; - sha256 = "sha256-83N0Ek6DawUrOc6s2Utzi8776bX4UTGS/a/OffkV44Y="; + sha256 = "sha256-Fwh4haGXVDsLexe/1kjUhY4lF6u5cTrAwivZiOkPig0="; }; nativeBuildInputs = [ From e9211c2189973c9cba87cb1beaa7a307680f52c4 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Mon, 5 Aug 2024 21:27:08 -0700 Subject: [PATCH 037/357] glibcLocales: fix building with llvm --- pkgs/development/libraries/glibc/locales.nix | 6 +++++- pkgs/top-level/all-packages.nix | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index eddeb5e3ec4b..6edbb6837b58 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -8,11 +8,15 @@ { lib, stdenv, buildPackages, callPackage, writeText, glibc , allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ] +, linuxHeaders, withLinuxHeaders ? !stdenv.cc.isGNU }: -(callPackage ./common.nix { inherit stdenv; } { +(callPackage ./common.nix ({ inherit stdenv; } // lib.optionalAttrs withLinuxHeaders { + inherit linuxHeaders; +}) { pname = "glibc-locales"; extraNativeBuildInputs = [ glibc ]; + inherit withLinuxHeaders; }).overrideAttrs(finalAttrs: previousAttrs: { builder = ./locales-builder.sh; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb1895c6e749..81c3c996caae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20511,12 +20511,21 @@ with pkgs; # Only supported on Linux and only on glibc glibcLocales = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu - then callPackage ../development/libraries/glibc/locales.nix { } - else null; + then callPackage ../development/libraries/glibc/locales.nix { + stdenv = if (!stdenv.cc.isGNU) then + gccStdenv + else stdenv; + withLinuxHeaders = !stdenv.cc.isGNU; + } else null; glibcLocalesUtf8 = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu - then callPackage ../development/libraries/glibc/locales.nix { allLocales = false; } - else null; + then callPackage ../development/libraries/glibc/locales.nix { + stdenv = if (!stdenv.cc.isGNU) then + gccStdenv + else stdenv; + withLinuxHeaders = !stdenv.cc.isGNU; + allLocales = false; + } else null; glibcInfo = callPackage ../development/libraries/glibc/info.nix { }; From ead097db7f84c48357a37d131d5fed3ae868db9e Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Mon, 5 Aug 2024 21:37:09 -0700 Subject: [PATCH 038/357] glibcLocales: format --- pkgs/development/libraries/glibc/locales.nix | 157 ++++++++++--------- 1 file changed, 84 insertions(+), 73 deletions(-) diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index 6edbb6837b58..d47af97f191f 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -1,90 +1,101 @@ -/* This function builds just the `lib/locale/locale-archive' file from - Glibc and nothing else. If `allLocales' is true, all supported - locales are included; otherwise, just the locales listed in - `locales'. See localedata/SUPPORTED in the Glibc source tree for - the list of all supported locales: - https://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/SUPPORTED +/* + This function builds just the `lib/locale/locale-archive' file from + Glibc and nothing else. If `allLocales' is true, all supported + locales are included; otherwise, just the locales listed in + `locales'. See localedata/SUPPORTED in the Glibc source tree for + the list of all supported locales: + https://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/SUPPORTED */ -{ lib, stdenv, buildPackages, callPackage, writeText, glibc -, allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ] -, linuxHeaders, withLinuxHeaders ? !stdenv.cc.isGNU +{ + lib, + stdenv, + buildPackages, + callPackage, + writeText, + glibc, + allLocales ? true, + locales ? [ "en_US.UTF-8/UTF-8" ], + linuxHeaders, + withLinuxHeaders ? !stdenv.cc.isGNU, }: -(callPackage ./common.nix ({ inherit stdenv; } // lib.optionalAttrs withLinuxHeaders { - inherit linuxHeaders; -}) { - pname = "glibc-locales"; - extraNativeBuildInputs = [ glibc ]; - inherit withLinuxHeaders; -}).overrideAttrs(finalAttrs: previousAttrs: { +(callPackage ./common.nix + ({ inherit stdenv; } // lib.optionalAttrs withLinuxHeaders { inherit linuxHeaders; }) + { + pname = "glibc-locales"; + extraNativeBuildInputs = [ glibc ]; + inherit withLinuxHeaders; + } +).overrideAttrs + ( + finalAttrs: previousAttrs: { - builder = ./locales-builder.sh; + builder = ./locales-builder.sh; - outputs = [ "out" ]; + outputs = [ "out" ]; - LOCALEDEF_FLAGS = [ - (if stdenv.hostPlatform.isLittleEndian - then "--little-endian" - else "--big-endian") - ]; + LOCALEDEF_FLAGS = [ + (if stdenv.hostPlatform.isLittleEndian then "--little-endian" else "--big-endian") + ]; - preBuild = (previousAttrs.preBuild or "") + '' - # Awful hack: `localedef' doesn't allow the path to `locale-archive' - # to be overriden, but you *can* specify a prefix, i.e. it will use - # //lib/locale/locale-archive. So we use - # $TMPDIR as a prefix, meaning that the locale-archive is placed in - # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. - LOCALEDEF_FLAGS+=" --prefix=$TMPDIR" + preBuild = + (previousAttrs.preBuild or "") + + '' + # Awful hack: `localedef' doesn't allow the path to `locale-archive' + # to be overriden, but you *can* specify a prefix, i.e. it will use + # //lib/locale/locale-archive. So we use + # $TMPDIR as a prefix, meaning that the locale-archive is placed in + # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. + LOCALEDEF_FLAGS+=" --prefix=$TMPDIR" - mkdir -p $TMPDIR/"${buildPackages.glibc.out}/lib/locale" + mkdir -p $TMPDIR/"${buildPackages.glibc.out}/lib/locale" - echo 'C.UTF-8/UTF-8 \' >> ../glibc-2*/localedata/SUPPORTED + echo 'C.UTF-8/UTF-8 \' >> ../glibc-2*/localedata/SUPPORTED - # Hack to allow building of the locales (needed since glibc-2.12) - sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef $(LOCALEDEF_FLAGS),' ../glibc-2*/localedata/Makefile - '' - + lib.optionalString (!allLocales) '' - # Check that all locales to be built are supported - echo -n '${lib.concatMapStrings (s: s + " \\\n") locales}' \ - | sort -u > locales-to-build.txt - cat ../glibc-2*/localedata/SUPPORTED | grep ' \\' \ - | sort -u > locales-supported.txt - comm -13 locales-supported.txt locales-to-build.txt \ - > locales-unsupported.txt - if [[ $(wc -c locales-unsupported.txt) != "0 locales-unsupported.txt" ]]; then - cat locales-supported.txt - echo "Error: unsupported locales detected:" - cat locales-unsupported.txt - echo "You should choose from the list above the error." - false - fi + # Hack to allow building of the locales (needed since glibc-2.12) + sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef $(LOCALEDEF_FLAGS),' ../glibc-2*/localedata/Makefile + '' + + lib.optionalString (!allLocales) '' + # Check that all locales to be built are supported + echo -n '${lib.concatMapStrings (s: s + " \\\n") locales}' \ + | sort -u > locales-to-build.txt + cat ../glibc-2*/localedata/SUPPORTED | grep ' \\' \ + | sort -u > locales-supported.txt + comm -13 locales-supported.txt locales-to-build.txt \ + > locales-unsupported.txt + if [[ $(wc -c locales-unsupported.txt) != "0 locales-unsupported.txt" ]]; then + cat locales-supported.txt + echo "Error: unsupported locales detected:" + cat locales-unsupported.txt + echo "You should choose from the list above the error." + false + fi - echo SUPPORTED-LOCALES='${toString locales}' > ../glibc-2*/localedata/SUPPORTED - ''; + echo SUPPORTED-LOCALES='${toString locales}' > ../glibc-2*/localedata/SUPPORTED + ''; - # Current `nixpkgs` way of building locales is not compatible with - # parallel install. `locale-archive` is updated in parallel with - # multiple `localedef` processes and causes non-deterministic result: - # https://github.com/NixOS/nixpkgs/issues/245360 - enableParallelBuilding = false; + # Current `nixpkgs` way of building locales is not compatible with + # parallel install. `locale-archive` is updated in parallel with + # multiple `localedef` processes and causes non-deterministic result: + # https://github.com/NixOS/nixpkgs/issues/245360 + enableParallelBuilding = false; - makeFlags = (previousAttrs.makeFlags or []) ++ [ - "localedata/install-locales" - "localedir=${builtins.placeholder "out"}/lib/locale" - ]; + makeFlags = (previousAttrs.makeFlags or [ ]) ++ [ + "localedata/install-locales" + "localedir=${builtins.placeholder "out"}/lib/locale" + ]; - installPhase = - '' - mkdir -p "$out/lib/locale" "$out/share/i18n" - cp -v "$TMPDIR/$NIX_STORE/"*"/lib/locale/locale-archive" "$out/lib/locale" - cp -v ../glibc-2*/localedata/SUPPORTED "$out/share/i18n/SUPPORTED" - ''; + installPhase = '' + mkdir -p "$out/lib/locale" "$out/share/i18n" + cp -v "$TMPDIR/$NIX_STORE/"*"/lib/locale/locale-archive" "$out/lib/locale" + cp -v ../glibc-2*/localedata/SUPPORTED "$out/share/i18n/SUPPORTED" + ''; - setupHook = writeText "locales-setup-hook.sh" - '' - export LOCALE_ARCHIVE=@out@/lib/locale/locale-archive - ''; + setupHook = writeText "locales-setup-hook.sh" '' + export LOCALE_ARCHIVE=@out@/lib/locale/locale-archive + ''; - meta.description = "Locale information for the GNU C Library"; -}) + meta.description = "Locale information for the GNU C Library"; + } + ) From 4eb01e33819c7a9429b30d6c634b122683b4414f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 6 Aug 2024 18:09:44 +0200 Subject: [PATCH 039/357] 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 4d67dc7acceac0b46daea0985e367a32e061ae30 Mon Sep 17 00:00:00 2001 From: Artem Leshchev Date: Tue, 6 Aug 2024 21:59:11 -0500 Subject: [PATCH 040/357] python3Packages.awscrt: remove pin of gcc version stdenv is new enough now on all platforms. --- pkgs/development/python-modules/awscrt/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index f7320137d717..3201deab5029 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -5,7 +5,6 @@ cmake, perl, stdenv, - gcc10, CoreFoundation, Security, pythonOlder, @@ -28,13 +27,7 @@ buildPythonPackage rec { Security ]; - # gcc <10 is not supported, LLVM on darwin is just fine - nativeBuildInputs = - [ cmake ] - ++ lib.optionals (!stdenv.isDarwin && stdenv.isAarch64) [ - gcc10 - perl - ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals (!stdenv.isDarwin) [ perl ]; dontUseCmakeConfigure = true; From a87f5eb7d0afdc6c2f59cc33967ad4c770450d98 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 7 Aug 2024 20:05:28 -0700 Subject: [PATCH 041/357] llvmPackages_{13,14,15,16,17,18,git}: add recurse into attrs --- pkgs/development/compilers/llvm/default.nix | 41 +++++++++++---------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 5eb28661e992..40c0e54cd3f2 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -7,6 +7,7 @@ stdenv, gcc12Stdenv, pkgs, + recurseIntoAttrs, # This is the default binutils, but with *this* version of LLD rather # than the default LLVM version's, if LLD is the choice. We use these for # the `useLLVM` bootstrapping below. @@ -51,25 +52,27 @@ let args.name or (if (gitRelease != null) then "git" else lib.versions.major release_version); in lib.nameValuePair attrName ( - callPackage ./common { - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages."llvmPackages_${attrName}".tools; - targetLlvmLibraries = - targetPackages."llvmPackages_${attrName}".libraries or llvmPackages."${attrName}".libraries; - targetLlvm = targetPackages."llvmPackages_${attrName}".llvm or llvmPackages."${attrName}".llvm; - stdenv = - if (lib.versions.major release_version == "13" && stdenv.cc.cc.isGNU or false) then - gcc12Stdenv - else - stdenv; # does not build with gcc13 - inherit bootBintoolsNoLibc bootBintools; - inherit - officialRelease - gitRelease - monorepoSrc - version - ; - } + recurseIntoAttrs ( + callPackage ./common { + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages."llvmPackages_${attrName}".tools; + targetLlvmLibraries = + targetPackages."llvmPackages_${attrName}".libraries or llvmPackages."${attrName}".libraries; + targetLlvm = targetPackages."llvmPackages_${attrName}".llvm or llvmPackages."${attrName}".llvm; + stdenv = + if (lib.versions.major release_version == "13" && stdenv.cc.cc.isGNU or false) then + gcc12Stdenv + else + stdenv; # does not build with gcc13 + inherit bootBintoolsNoLibc bootBintools; + inherit + officialRelease + gitRelease + monorepoSrc + version + ; + } + ) ); llvmPackages = lib.mapAttrs' (version: args: mkPackage (args // { inherit version; })) versions; From d0e9693c7d5398d630fbfaa95b8dd34720ebb9de Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 7 Aug 2024 20:06:07 -0700 Subject: [PATCH 042/357] llvmPackages_git: remove recurse into attrs in call package --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e831bd025759..03c6cb80027f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -877,7 +877,7 @@ mapAliases ({ linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; - llvmPackages_git = (recurseIntoAttrs (callPackages ../development/compilers/llvm { })).git; + llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; lld_6 = throw "lld_6 has been removed from nixpkgs"; # Added 2024-01-08 lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19 From f0c83432dbb6216798296cfebc830d612bad8e87 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 7 Aug 2024 20:06:56 -0700 Subject: [PATCH 043/357] llvmPackagesSets: expose make package --- pkgs/development/compilers/llvm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 40c0e54cd3f2..e5fe4131f304 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -77,4 +77,4 @@ let llvmPackages = lib.mapAttrs' (version: args: mkPackage (args // { inherit version; })) versions; in -llvmPackages +llvmPackages // { inherit mkPackage; } From f4035cfe5878d699e668ebd79c1adbaaf44a8673 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Aug 2024 05:50:03 +0000 Subject: [PATCH 044/357] 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 300a4615c00a1a4e7c3dd49197022cc3ad2f85b2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 8 Aug 2024 09:19:47 +0100 Subject: [PATCH 045/357] nixVersions.git: 2.24.0pre20240723 -> 2.25.0pre20240807 The main goal of the update is to get past the possible upstream fix for https://github.com/NixOS/nix/issues/11265 --- pkgs/tools/package-management/nix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 8e71654cd56e..da7ec54d7047 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -200,13 +200,13 @@ in lib.makeExtensible (self: ({ }); git = (common rec { - version = "2.24.0"; - suffix = "pre20240723_${lib.substring 0 8 src.rev}"; + version = "2.25.0"; + suffix = "pre20240807_${lib.substring 0 8 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "fb450de20ec8df558f9f7f167d748acf7cabe151"; - hash = "sha256-xjN65yaPGwmly+Fdo6lVHL67+0IG+Cnxv7hNgYgoTGk="; + rev = "cfe66dbec325d5dcb601b642bd9c149ae1353147"; + hash = "sha256-1hqjl4br3MRK1pkzDrhBSxKUhdfQ/P4b5KbLfGua64g="; }; self_attribute_name = "git"; }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { From be7c2ce57ef0b73c376d9b0b02bb5f53af4a029e Mon Sep 17 00:00:00 2001 From: renesat Date: Thu, 8 Aug 2024 20:21:40 +0200 Subject: [PATCH 046/357] imgbrd-grabber: fix build --- pkgs/by-name/im/imgbrd-grabber/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/im/imgbrd-grabber/package.nix b/pkgs/by-name/im/imgbrd-grabber/package.nix index a3f083633bbe..5714ae5c109c 100644 --- a/pkgs/by-name/im/imgbrd-grabber/package.nix +++ b/pkgs/by-name/im/imgbrd-grabber/package.nix @@ -62,6 +62,9 @@ stdenv.mkDerivation (finalAttrs: { # ensure the script uses the rsync package from nixpkgs substituteInPlace ../scripts/package.sh --replace-fail "rsync" "${lib.getExe rsync}" + substituteInPlace gui/CMakeLists.txt \ + --replace-fail "find_package(Qt6 COMPONENTS " "find_package(Qt6 COMPONENTS NetworkAuth " \ + --replace-fail "set(QT_LIBRARIES " "set(QT_LIBRARIES Qt6::NetworkAuth " # the npm build step only runs typescript # run this step directly so it doesn't try and fail to download the unnecessary node_modules, etc. From c87320cec746754b7cef39b8337a9d18dd680df9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 8 Aug 2024 21:53:36 +0100 Subject: [PATCH 047/357] 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 01c11fc24fd96b9bb13402f48d50fb85f793ea41 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Aug 2024 15:51:52 +0200 Subject: [PATCH 048/357] python312Packages.forecast-solar: remove backports-zoneinfo --- pkgs/development/python-modules/forecast-solar/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/forecast-solar/default.nix b/pkgs/development/python-modules/forecast-solar/default.nix index 8543662edbd7..8a955b514440 100644 --- a/pkgs/development/python-modules/forecast-solar/default.nix +++ b/pkgs/development/python-modules/forecast-solar/default.nix @@ -6,7 +6,6 @@ pythonOlder, aiodns, aiohttp, - backports-zoneinfo, pytestCheckHook, }: @@ -15,6 +14,8 @@ buildPythonPackage rec { version = "3.1.0"; pyproject = true; + disabled = pythonOlder "3.11"; + src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "forecast_solar"; @@ -29,7 +30,7 @@ buildPythonPackage rec { dependencies = [ aiodns aiohttp - ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; + ]; pythonImportsCheck = [ "forecast_solar" ]; From d80d811a6ff54e313cc15b66b2701e00ca5a4c68 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 8 Aug 2024 11:15:26 +0200 Subject: [PATCH 049/357] nixos/iperf3: add package option --- nixos/modules/services/networking/iperf3.nix | 3 ++- pkgs/tools/networking/iperf/3.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/iperf3.nix b/nixos/modules/services/networking/iperf3.nix index 55a8fe4db595..2b1ee71f1421 100644 --- a/nixos/modules/services/networking/iperf3.nix +++ b/nixos/modules/services/networking/iperf3.nix @@ -4,6 +4,7 @@ let api = { enable = mkEnableOption "iperf3 network throughput testing server"; + package = mkPackageOption pkgs "iperf3" { }; port = mkOption { type = types.ints.u16; default = 5201; @@ -76,7 +77,7 @@ let CapabilityBoundingSet = ""; NoNewPrivileges = true; ExecStart = '' - ${pkgs.iperf3}/bin/iperf \ + ${lib.getExe cfg.package} \ --server \ --port ${toString cfg.port} \ ${optionalString (cfg.affinity != null) "--affinity ${toString cfg.affinity}"} \ diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 27b4e6ca37b4..8952c4004fd3 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = lib.platforms.unix; license = lib.licenses.bsd3; + mainProgram = "iperf3"; maintainers = with lib.maintainers; [ fpletz ]; }; } From 633da8f7a0a05aca42f6cc23e53523e18ce10a4f Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Fri, 9 Aug 2024 22:48:43 +0800 Subject: [PATCH 050/357] 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 8a2d0854659ee83bbe6a9816b0871cedbe8a246b Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 9 Aug 2024 10:16:24 -0700 Subject: [PATCH 051/357] llvmPackages_{13,14,15,16,17,18,git}.lldbPlugins: add recurse into attrs --- pkgs/development/compilers/llvm/common/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 1ec50ce87db3..e1f25fc8c0dc 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -89,9 +89,7 @@ let } ); in - { - llef = callPackage ./lldb-plugins/llef.nix { }; - } + lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; } ); tools = lib.makeExtensible ( From c77f6919d725ae1830728267bd84e53ec5b369c3 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 9 Aug 2024 12:05:13 -0700 Subject: [PATCH 052/357] llvmPackages_{13,14,15,16,17,18,git}.clang: commonify patches --- .../llvm/13/clang/gnu-install-dirs.patch | 235 ------------------ .../compilers/llvm/13/clang/purity.patch | 28 --- .../compilers/llvm/14/clang/purity.patch | 28 --- .../compilers/llvm/16/clang/purity.patch | 29 --- .../compilers/llvm/19/clang/purity.patch | 25 -- .../compilers/llvm/common/default.nix | 31 ++- .../llvm/git/clang/gnu-install-dirs.patch | 71 ------ .../compilers/llvm/git/clang/purity.patch | 25 -- 8 files changed, 27 insertions(+), 445 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/13/clang/gnu-install-dirs.patch delete mode 100644 pkgs/development/compilers/llvm/13/clang/purity.patch delete mode 100644 pkgs/development/compilers/llvm/14/clang/purity.patch delete mode 100644 pkgs/development/compilers/llvm/16/clang/purity.patch delete mode 100644 pkgs/development/compilers/llvm/19/clang/purity.patch delete mode 100644 pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch delete mode 100644 pkgs/development/compilers/llvm/git/clang/purity.patch diff --git a/pkgs/development/compilers/llvm/13/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/clang/gnu-install-dirs.patch deleted file mode 100644 index b834d386b4eb..000000000000 --- a/pkgs/development/compilers/llvm/13/clang/gnu-install-dirs.patch +++ /dev/null @@ -1,235 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9e74014134a0..976e6a1757fd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.13.4) - if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) - project(Clang) - -+ include(GNUInstallDirs) -+ - set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to") - set(CMAKE_CXX_STANDARD_REQUIRED YES) - set(CMAKE_CXX_EXTENSIONS NO) -@@ -416,7 +418,7 @@ include_directories(BEFORE - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/clang include/clang-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT clang-headers - FILES_MATCHING - PATTERN "*.def" -@@ -425,7 +427,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT clang-headers - FILES_MATCHING - PATTERN "CMakeFiles" EXCLUDE -@@ -445,7 +447,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - - add_custom_target(bash-autocomplete DEPENDS utils/bash-autocomplete.sh) - install(PROGRAMS utils/bash-autocomplete.sh -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT bash-autocomplete) - if(NOT LLVM_ENABLE_IDE) - add_llvm_install_targets(install-bash-autocomplete -diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake -index 704278a0e93b..d25c8d325c71 100644 ---- a/cmake/modules/AddClang.cmake -+++ b/cmake/modules/AddClang.cmake -@@ -123,9 +123,9 @@ macro(add_clang_library name) - install(TARGETS ${lib} - COMPONENT ${lib} - ${export_to_clangtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- RUNTIME DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if (NOT LLVM_ENABLE_IDE) - add_llvm_install_targets(install-${lib} -@@ -170,7 +170,7 @@ macro(add_clang_tool name) - - install(TARGETS ${name} - ${export_to_clangtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT ${name}) - - if(NOT LLVM_ENABLE_IDE) -@@ -185,7 +185,7 @@ endmacro() - macro(add_clang_symlink name dest) - add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) - # Always generate install targets -- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) -+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) - endmacro() - - function(clang_target_link_libraries target type) -diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index b2c0ce8dd4a0..19e5443d8c25 100644 ---- a/lib/Headers/CMakeLists.txt -+++ b/lib/Headers/CMakeLists.txt -@@ -215,7 +215,7 @@ set_target_properties(clang-resource-headers PROPERTIES - FOLDER "Misc" - RUNTIME_OUTPUT_DIRECTORY "${output_dir}") - --set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) -+set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) - - install( - FILES ${files} ${generated_files} -diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt -index ceef4b08637c..8efad5520ca4 100644 ---- a/tools/c-index-test/CMakeLists.txt -+++ b/tools/c-index-test/CMakeLists.txt -@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH - "@executable_path/../../lib") - else() -- set(INSTALL_DESTINATION bin) -+ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - - install(TARGETS c-index-test -diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt -index 35ecdb11253c..d77d75de0094 100644 ---- a/tools/clang-format/CMakeLists.txt -+++ b/tools/clang-format/CMakeLists.txt -@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) - endif() - - install(PROGRAMS clang-format-bbedit.applescript -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format-diff.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format-sublime.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format.el -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS git-clang-format -- DESTINATION bin -+ DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT clang-format) -diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt -index cda8e29ec5b1..0134d8ccd70b 100644 ---- a/tools/clang-rename/CMakeLists.txt -+++ b/tools/clang-rename/CMakeLists.txt -@@ -19,8 +19,8 @@ clang_target_link_libraries(clang-rename - ) - - install(PROGRAMS clang-rename.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-rename) - install(PROGRAMS clang-rename.el -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-rename) -diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt -index 51ff2e7e1565..1ed5f8a079a1 100644 ---- a/tools/libclang/CMakeLists.txt -+++ b/tools/libclang/CMakeLists.txt -@@ -166,7 +166,7 @@ endif() - if(INTERNAL_INSTALL_PREFIX) - set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") - else() -- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) -+ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - endif() - - install(DIRECTORY ../../include/clang-c -@@ -196,7 +196,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) - COMPONENT - libclang-python-bindings - DESTINATION -- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") -+ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") - endforeach() - if(NOT LLVM_ENABLE_IDE) - add_custom_target(libclang-python-bindings) -diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt -index ec0702d76f18..d25d982f51da 100644 ---- a/tools/scan-build/CMakeLists.txt -+++ b/tools/scan-build/CMakeLists.txt -@@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD) - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) - install(PROGRAMS bin/${BinFile} -- DESTINATION bin -+ DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT scan-build) - endforeach() - -@@ -61,7 +61,7 @@ if(CLANG_INSTALL_SCANBUILD) - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) - install(PROGRAMS libexec/${LibexecFile} -- DESTINATION libexec -+ DESTINATION ${CMAKE_INSTALL_LIBEXECDIR} - COMPONENT scan-build) - endforeach() - -@@ -89,7 +89,7 @@ if(CLANG_INSTALL_SCANBUILD) - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) - install(FILES share/scan-build/${ShareFile} -- DESTINATION share/scan-build -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build - COMPONENT scan-build) - endforeach() - -diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt -index dd3d33439299..fea19c12ce70 100644 ---- a/tools/scan-view/CMakeLists.txt -+++ b/tools/scan-view/CMakeLists.txt -@@ -19,7 +19,7 @@ if(CLANG_INSTALL_SCANVIEW) - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) - install(PROGRAMS bin/${BinFile} -- DESTINATION bin -+ DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT scan-view) - endforeach() - -@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) - install(FILES share/${ShareFile} -- DESTINATION share/scan-view -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view - COMPONENT scan-view) - endforeach() - -diff --git a/utils/hmaptool/CMakeLists.txt b/utils/hmaptool/CMakeLists.txt -index 62f2de0cb15c..6aa66825b6ec 100644 ---- a/utils/hmaptool/CMakeLists.txt -+++ b/utils/hmaptool/CMakeLists.txt -@@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM - - list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) - install(PROGRAMS ${CLANG_HMAPTOOL} -- DESTINATION bin -+ DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT hmaptool) - - add_custom_target(hmaptool ALL DEPENDS ${Depends}) diff --git a/pkgs/development/compilers/llvm/13/clang/purity.patch b/pkgs/development/compilers/llvm/13/clang/purity.patch deleted file mode 100644 index deb230a36c5b..000000000000 --- a/pkgs/development/compilers/llvm/13/clang/purity.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Thu, 18 May 2017 11:56:12 -0500 -Subject: [PATCH] "purity" patch for 5.0 - ---- - lib/Driver/ToolChains/Gnu.cpp | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp -index fe3c0191bb..c6a482bece 100644 ---- a/lib/Driver/ToolChains/Gnu.cpp -+++ b/lib/Driver/ToolChains/Gnu.cpp -@@ -487,12 +487,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, - if (!IsStatic) { - if (Args.hasArg(options::OPT_rdynamic)) - CmdArgs.push_back("-export-dynamic"); -- -- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) { -- CmdArgs.push_back("-dynamic-linker"); -- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + -- ToolChain.getDynamicLinker(Args))); -- } - } - - CmdArgs.push_back("-o"); --- -2.11.0 diff --git a/pkgs/development/compilers/llvm/14/clang/purity.patch b/pkgs/development/compilers/llvm/14/clang/purity.patch deleted file mode 100644 index deb230a36c5b..000000000000 --- a/pkgs/development/compilers/llvm/14/clang/purity.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Thu, 18 May 2017 11:56:12 -0500 -Subject: [PATCH] "purity" patch for 5.0 - ---- - lib/Driver/ToolChains/Gnu.cpp | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp -index fe3c0191bb..c6a482bece 100644 ---- a/lib/Driver/ToolChains/Gnu.cpp -+++ b/lib/Driver/ToolChains/Gnu.cpp -@@ -487,12 +487,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, - if (!IsStatic) { - if (Args.hasArg(options::OPT_rdynamic)) - CmdArgs.push_back("-export-dynamic"); -- -- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) { -- CmdArgs.push_back("-dynamic-linker"); -- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + -- ToolChain.getDynamicLinker(Args))); -- } - } - - CmdArgs.push_back("-o"); --- -2.11.0 diff --git a/pkgs/development/compilers/llvm/16/clang/purity.patch b/pkgs/development/compilers/llvm/16/clang/purity.patch deleted file mode 100644 index 1c94f293eb93..000000000000 --- a/pkgs/development/compilers/llvm/16/clang/purity.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Thu, 18 May 2017 11:56:12 -0500 -Subject: [PATCH] "purity" patch for 5.0 - ---- - lib/Driver/ToolChains/Gnu.cpp | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp -index fe3c0191bb..c6a482bece 100644 ---- a/lib/Driver/ToolChains/Gnu.cpp -+++ b/lib/Driver/ToolChains/Gnu.cpp -@@ -487,13 +487,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, - } else { - if (Args.hasArg(options::OPT_rdynamic)) - CmdArgs.push_back("-export-dynamic"); - -- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE && -- !Args.hasArg(options::OPT_r)) { -- CmdArgs.push_back("-dynamic-linker"); -- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + -- ToolChain.getDynamicLinker(Args))); -- } - } - - CmdArgs.push_back("-o"); --- -2.11.0 diff --git a/pkgs/development/compilers/llvm/19/clang/purity.patch b/pkgs/development/compilers/llvm/19/clang/purity.patch deleted file mode 100644 index 5ce14a3479a0..000000000000 --- a/pkgs/development/compilers/llvm/19/clang/purity.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Thu, 18 May 2017 11:56:12 -0500 -Subject: [PATCH] "purity" patch for 5.0 - ---- - lib/Driver/ToolChains/Gnu.cpp | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp -index fe3c0191bb..c6a482bece 100644 ---- a/lib/Driver/ToolChains/Gnu.cpp -+++ b/lib/Driver/ToolChains/Gnu.cpp -@@ -446,9 +446,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, - ToolChain.isPIEDefault(Args)); - if (IsPIE) - CmdArgs.push_back("-pie"); -- CmdArgs.push_back("-dynamic-linker"); -- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + -- ToolChain.getDynamicLinker(Args))); - } - } - --- -2.11.0 diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 1ec50ce87db3..8aeffc5c8b12 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -72,10 +72,33 @@ let + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}"; getVersionFile = p: - builtins.path { - name = builtins.baseNameOf p; - path = "${metadata.versionDir}/${p}"; - }; + if + (lib.versionOlder release_version "14" || lib.versionAtLeast release_version "19") + && p == "clang/gnu-install-dirs.patch" + then + builtins.path { + name = builtins.baseNameOf p; + path = if lib.versionAtLeast release_version "19" then ../19/${p} else ../12/${p}; + } + else if lib.versionAtLeast release_version "18" && p == "clang/purity.patch" then + builtins.path { + name = builtins.baseNameOf p; + path = ../18/${p}; + } + else if + lib.versionAtLeast release_version "15" + && lib.versionOlder release_version "17" + && p == "clang/purity.patch" + then + builtins.path { + name = builtins.baseNameOf p; + path = ../15/${p}; + } + else + builtins.path { + name = builtins.baseNameOf p; + path = "${metadata.versionDir}/${p}"; + }; }; lldbPlugins = lib.makeExtensible ( diff --git a/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch deleted file mode 100644 index b8c1c110cf22..000000000000 --- a/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake -index 75b0080f6..c895b884c 100644 ---- a/cmake/modules/AddClang.cmake -+++ b/cmake/modules/AddClang.cmake -@@ -119,8 +119,8 @@ macro(add_clang_library name) - install(TARGETS ${lib} - COMPONENT ${lib} - ${export_to_clangtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") - - if (NOT LLVM_ENABLE_IDE) -diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index e6ae4e19e..5ef01aea2 100644 ---- a/lib/Headers/CMakeLists.txt -+++ b/lib/Headers/CMakeLists.txt -@@ -337,6 +337,7 @@ set(llvm_libc_wrapper_files - - include(GetClangResourceDir) - get_clang_resource_dir(output_dir PREFIX ${LLVM_LIBRARY_OUTPUT_INTDIR}/.. SUBDIR include) -+set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR}/include) - set(out_files) - set(generated_files) - -diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt -index b5b6d2807..6b592d255 100644 ---- a/tools/libclang/CMakeLists.txt -+++ b/tools/libclang/CMakeLists.txt -@@ -246,7 +246,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) - COMPONENT - libclang-python-bindings - DESTINATION -- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") -+ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") - endforeach() - if(NOT LLVM_ENABLE_IDE) - add_custom_target(libclang-python-bindings) -diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt -index 3aca22c0b..3115353e3 100644 ---- a/tools/scan-build-py/CMakeLists.txt -+++ b/tools/scan-build-py/CMakeLists.txt -@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild}) - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib}) - install(FILES lib/libscanbuild/${lib} -- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild" - COMPONENT scan-build-py) - endforeach() - -@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources}) - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource}) - install(FILES lib/libscanbuild/resources/${resource} -- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources" - COMPONENT scan-build-py) - endforeach() - -@@ -122,7 +122,7 @@ foreach(lib ${LibEar}) - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib}) - install(FILES lib/libear/${lib} -- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear" - COMPONENT scan-build-py) - endforeach() - diff --git a/pkgs/development/compilers/llvm/git/clang/purity.patch b/pkgs/development/compilers/llvm/git/clang/purity.patch deleted file mode 100644 index 5ce14a3479a0..000000000000 --- a/pkgs/development/compilers/llvm/git/clang/purity.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Thu, 18 May 2017 11:56:12 -0500 -Subject: [PATCH] "purity" patch for 5.0 - ---- - lib/Driver/ToolChains/Gnu.cpp | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp -index fe3c0191bb..c6a482bece 100644 ---- a/lib/Driver/ToolChains/Gnu.cpp -+++ b/lib/Driver/ToolChains/Gnu.cpp -@@ -446,9 +446,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, - ToolChain.isPIEDefault(Args)); - if (IsPIE) - CmdArgs.push_back("-pie"); -- CmdArgs.push_back("-dynamic-linker"); -- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + -- ToolChain.getDynamicLinker(Args))); - } - } - --- -2.11.0 From 314cebce73926f110c4b1d214c5918bf425dd863 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 9 Aug 2024 12:34:48 -0700 Subject: [PATCH 053/357] llvmPackages_{13,14,15,16,17,18,git}.compiler-rt: commonify patches --- .../compiler-rt/X86-support-extension.patch | 21 ------ .../llvm/13/compiler-rt/normalize-var.patch | 16 ----- .../compiler-rt/X86-support-extension.patch | 21 ------ .../llvm/14/compiler-rt/armv7l.patch | 31 -------- .../llvm/14/compiler-rt/codesign.patch | 33 --------- .../darwin-targetconditionals.patch | 71 ------------------- .../llvm/14/compiler-rt/normalize-var.patch | 16 ----- .../darwin-targetconditionals.patch | 71 ------------------- .../llvm/15/compiler-rt/normalize-var.patch | 16 ----- .../compiler-rt/X86-support-extension.patch | 21 ------ .../darwin-targetconditionals.patch | 71 ------------------- .../16/compiler-rt/gnu-install-dirs.patch | 20 ------ .../compiler-rt/X86-support-extension.patch | 21 ------ .../darwin-targetconditionals.patch | 71 ------------------- .../llvm/17/compiler-rt/normalize-var.patch | 16 ----- .../compiler-rt/X86-support-extension.patch | 21 ------ .../darwin-targetconditionals.patch | 71 ------------------- .../llvm/18/compiler-rt/normalize-var.patch | 16 ----- .../compiler-rt/X86-support-extension.patch | 21 ------ .../darwin-targetconditionals.patch | 71 ------------------- .../llvm/19/compiler-rt/normalize-var.patch | 16 ----- .../compilers/llvm/common/default.nix | 65 ++++++++++------- .../compiler-rt/X86-support-extension.patch | 21 ------ .../darwin-targetconditionals.patch | 71 ------------------- .../llvm/git/compiler-rt/normalize-var.patch | 16 ----- 25 files changed, 38 insertions(+), 867 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/13/compiler-rt/X86-support-extension.patch delete mode 100644 pkgs/development/compilers/llvm/13/compiler-rt/normalize-var.patch delete mode 100644 pkgs/development/compilers/llvm/14/compiler-rt/X86-support-extension.patch delete mode 100644 pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch delete mode 100644 pkgs/development/compilers/llvm/14/compiler-rt/codesign.patch delete mode 100644 pkgs/development/compilers/llvm/14/compiler-rt/darwin-targetconditionals.patch delete mode 100644 pkgs/development/compilers/llvm/14/compiler-rt/normalize-var.patch delete mode 100644 pkgs/development/compilers/llvm/15/compiler-rt/darwin-targetconditionals.patch delete mode 100644 pkgs/development/compilers/llvm/15/compiler-rt/normalize-var.patch delete mode 100644 pkgs/development/compilers/llvm/16/compiler-rt/X86-support-extension.patch delete mode 100644 pkgs/development/compilers/llvm/16/compiler-rt/darwin-targetconditionals.patch delete mode 100644 pkgs/development/compilers/llvm/16/compiler-rt/gnu-install-dirs.patch delete mode 100644 pkgs/development/compilers/llvm/17/compiler-rt/X86-support-extension.patch delete mode 100644 pkgs/development/compilers/llvm/17/compiler-rt/darwin-targetconditionals.patch delete mode 100644 pkgs/development/compilers/llvm/17/compiler-rt/normalize-var.patch delete mode 100644 pkgs/development/compilers/llvm/18/compiler-rt/X86-support-extension.patch delete mode 100644 pkgs/development/compilers/llvm/18/compiler-rt/darwin-targetconditionals.patch delete mode 100644 pkgs/development/compilers/llvm/18/compiler-rt/normalize-var.patch delete mode 100644 pkgs/development/compilers/llvm/19/compiler-rt/X86-support-extension.patch delete mode 100644 pkgs/development/compilers/llvm/19/compiler-rt/darwin-targetconditionals.patch delete mode 100644 pkgs/development/compilers/llvm/19/compiler-rt/normalize-var.patch delete mode 100644 pkgs/development/compilers/llvm/git/compiler-rt/X86-support-extension.patch delete mode 100644 pkgs/development/compilers/llvm/git/compiler-rt/darwin-targetconditionals.patch delete mode 100644 pkgs/development/compilers/llvm/git/compiler-rt/normalize-var.patch diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/X86-support-extension.patch b/pkgs/development/compilers/llvm/13/compiler-rt/X86-support-extension.patch deleted file mode 100644 index 66742e5b1498..000000000000 --- a/pkgs/development/compilers/llvm/13/compiler-rt/X86-support-extension.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt -index 3a66dd9c3fb..7efc85d9f9f 100644 ---- a/lib/builtins/CMakeLists.txt -+++ b/lib/builtins/CMakeLists.txt -@@ -345,4 +345,8 @@ if (NOT MSVC) - -+ set(i486_SOURCES ${i386_SOURCES}) -+ set(i586_SOURCES ${i386_SOURCES}) -+ set(i686_SOURCES ${i386_SOURCES}) -+ - if (WIN32) - set(i386_SOURCES - ${i386_SOURCES} -@@ -608,6 +612,7 @@ else () - endif() - - foreach (arch ${BUILTIN_SUPPORTED_ARCH}) -+ message("arch: ${arch}") - if (CAN_TARGET_${arch}) - # For ARM archs, exclude any VFP builtins if VFP is not supported - if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/normalize-var.patch b/pkgs/development/compilers/llvm/13/compiler-rt/normalize-var.patch deleted file mode 100644 index 135cf625ef78..000000000000 --- a/pkgs/development/compilers/llvm/13/compiler-rt/normalize-var.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake -index f1f46fb9599c..6f19e69507ba 100644 ---- a/cmake/Modules/CompilerRTUtils.cmake -+++ b/cmake/Modules/CompilerRTUtils.cmake -@@ -302,8 +302,9 @@ macro(load_llvm_config) - # Get some LLVM variables from LLVMConfig. - include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake") - -- set(LLVM_LIBRARY_OUTPUT_INTDIR -- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -+ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR -+ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} -+ REALPATH) - endif() - endmacro() - diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/X86-support-extension.patch b/pkgs/development/compilers/llvm/14/compiler-rt/X86-support-extension.patch deleted file mode 100644 index 66742e5b1498..000000000000 --- a/pkgs/development/compilers/llvm/14/compiler-rt/X86-support-extension.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt -index 3a66dd9c3fb..7efc85d9f9f 100644 ---- a/lib/builtins/CMakeLists.txt -+++ b/lib/builtins/CMakeLists.txt -@@ -345,4 +345,8 @@ if (NOT MSVC) - -+ set(i486_SOURCES ${i386_SOURCES}) -+ set(i586_SOURCES ${i386_SOURCES}) -+ set(i686_SOURCES ${i386_SOURCES}) -+ - if (WIN32) - set(i386_SOURCES - ${i386_SOURCES} -@@ -608,6 +612,7 @@ else () - endif() - - foreach (arch ${BUILTIN_SUPPORTED_ARCH}) -+ message("arch: ${arch}") - if (CAN_TARGET_${arch}) - # For ARM archs, exclude any VFP builtins if VFP is not supported - if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch deleted file mode 100644 index 6818684e6a71..000000000000 --- a/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake ---- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake 2020-03-24 00:01:02.000000000 +0900 -+++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:42:00.883450706 +0900 -@@ -37,6 +37,6 @@ - - set(ARM64 aarch64) --set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv8m.main armv8.1m.main) -+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l armv8m.main armv8.1m.main) - set(HEXAGON hexagon) - set(X86 i386) - set(X86_64 x86_64) -diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt ---- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt 2020-03-24 00:01:02.000000000 +0900 -+++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:44:49.468579650 +0900 -@@ -555,6 +555,7 @@ - set(armv7_SOURCES ${arm_SOURCES}) - set(armv7s_SOURCES ${arm_SOURCES}) - set(armv7k_SOURCES ${arm_SOURCES}) -+set(armv7l_SOURCES ${arm_SOURCES}) - set(arm64_SOURCES ${aarch64_SOURCES}) - - # macho_embedded archs -@@ -705,7 +705,7 @@ - foreach (arch ${BUILTIN_SUPPORTED_ARCH}) - if (CAN_TARGET_${arch}) - # For ARM archs, exclude any VFP builtins if VFP is not supported -- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em|armv8m.main|armv8.1m.main)$") -+ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em|armv8m.main|armv8.1m.main)$") - string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") - check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) - if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/codesign.patch b/pkgs/development/compilers/llvm/14/compiler-rt/codesign.patch deleted file mode 100644 index 065959d14d46..000000000000 --- a/pkgs/development/compilers/llvm/14/compiler-rt/codesign.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Tue, 19 Sep 2017 13:13:06 -0500 -Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that - needs it - ---- - cmake/Modules/AddCompilerRT.cmake | 8 ------ - test/asan/CMakeLists.txt | 52 --------------------------------------- - test/tsan/CMakeLists.txt | 47 ----------------------------------- - 3 files changed, 107 deletions(-) - -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index bc69ec95c419..9f100fdcec2f 100644 ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -366,14 +366,6 @@ function(add_compiler_rt_runtime name type) - set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") - set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") - endif() -- if(APPLE) -- # Ad-hoc sign the dylibs -- add_custom_command(TARGET ${libname} -- POST_BUILD -- COMMAND codesign --sign - $ -- WORKING_DIRECTORY ${COMPILER_RT_OUTPUT_LIBRARY_DIR} -- ) -- endif() - endif() - - set(parent_target_arg) -2.14.1 - diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/14/compiler-rt/darwin-targetconditionals.patch deleted file mode 100644 index 425dc2af01e7..000000000000 --- a/pkgs/development/compilers/llvm/14/compiler-rt/darwin-targetconditionals.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp ---- a/lib/sanitizer_common/sanitizer_mac.cpp -+++ b/lib/sanitizer_common/sanitizer_mac.cpp -@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { - // Offset example: - // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 - constexpr u16 GetOSMajorKernelOffset() { -- if (TARGET_OS_OSX) return 4; -- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; -- if (TARGET_OS_WATCH) return 13; -+#if TARGET_OS_OSX -+ return 4; -+#endif -+#if TARGET_OS_IOS || TARGET_OS_TV -+ return 6; -+#endif -+#if TARGET_OS_WATCH -+ return 13; -+#endif - } - - using VersStr = char[64]; -@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { - u16 os_major = kernel_major - offset; - - const char *format = "%d.0"; -- if (TARGET_OS_OSX) { -- if (os_major >= 16) { // macOS 11+ -- os_major -= 5; -- } else { // macOS 10.15 and below -- format = "10.%d"; -- } -+#if TARGET_OS_OSX -+ if (os_major >= 16) { // macOS 11+ -+ os_major -= 5; -+ } else { // macOS 10.15 and below -+ format = "10.%d"; - } -+#endif - return internal_snprintf(vers, sizeof(VersStr), format, os_major); - } - -@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { - // Aligned versions example: - // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 - static void MapToMacos(u16 *major, u16 *minor) { -- if (TARGET_OS_OSX) -- return; -- -- if (TARGET_OS_IOS || TARGET_OS_TV) -+#if !TARGET_OS_OSX -+#if TARGET_OS_IOS || TARGET_OS_TV - *major += 2; -- else if (TARGET_OS_WATCH) -+#elif TARGET_OS_WATCH - *major += 9; -- else -+#else - UNREACHABLE("unsupported platform"); -+#endif - - if (*major >= 16) { // macOS 11+ - *major -= 5; -@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { - *minor = *major; - *major = 10; - } -+#endif - } - - static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/normalize-var.patch b/pkgs/development/compilers/llvm/14/compiler-rt/normalize-var.patch deleted file mode 100644 index 135cf625ef78..000000000000 --- a/pkgs/development/compilers/llvm/14/compiler-rt/normalize-var.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake -index f1f46fb9599c..6f19e69507ba 100644 ---- a/cmake/Modules/CompilerRTUtils.cmake -+++ b/cmake/Modules/CompilerRTUtils.cmake -@@ -302,8 +302,9 @@ macro(load_llvm_config) - # Get some LLVM variables from LLVMConfig. - include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake") - -- set(LLVM_LIBRARY_OUTPUT_INTDIR -- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -+ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR -+ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} -+ REALPATH) - endif() - endmacro() - diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/15/compiler-rt/darwin-targetconditionals.patch deleted file mode 100644 index 425dc2af01e7..000000000000 --- a/pkgs/development/compilers/llvm/15/compiler-rt/darwin-targetconditionals.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp ---- a/lib/sanitizer_common/sanitizer_mac.cpp -+++ b/lib/sanitizer_common/sanitizer_mac.cpp -@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { - // Offset example: - // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 - constexpr u16 GetOSMajorKernelOffset() { -- if (TARGET_OS_OSX) return 4; -- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; -- if (TARGET_OS_WATCH) return 13; -+#if TARGET_OS_OSX -+ return 4; -+#endif -+#if TARGET_OS_IOS || TARGET_OS_TV -+ return 6; -+#endif -+#if TARGET_OS_WATCH -+ return 13; -+#endif - } - - using VersStr = char[64]; -@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { - u16 os_major = kernel_major - offset; - - const char *format = "%d.0"; -- if (TARGET_OS_OSX) { -- if (os_major >= 16) { // macOS 11+ -- os_major -= 5; -- } else { // macOS 10.15 and below -- format = "10.%d"; -- } -+#if TARGET_OS_OSX -+ if (os_major >= 16) { // macOS 11+ -+ os_major -= 5; -+ } else { // macOS 10.15 and below -+ format = "10.%d"; - } -+#endif - return internal_snprintf(vers, sizeof(VersStr), format, os_major); - } - -@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { - // Aligned versions example: - // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 - static void MapToMacos(u16 *major, u16 *minor) { -- if (TARGET_OS_OSX) -- return; -- -- if (TARGET_OS_IOS || TARGET_OS_TV) -+#if !TARGET_OS_OSX -+#if TARGET_OS_IOS || TARGET_OS_TV - *major += 2; -- else if (TARGET_OS_WATCH) -+#elif TARGET_OS_WATCH - *major += 9; -- else -+#else - UNREACHABLE("unsupported platform"); -+#endif - - if (*major >= 16) { // macOS 11+ - *major -= 5; -@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { - *minor = *major; - *major = 10; - } -+#endif - } - - static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/normalize-var.patch b/pkgs/development/compilers/llvm/15/compiler-rt/normalize-var.patch deleted file mode 100644 index 135cf625ef78..000000000000 --- a/pkgs/development/compilers/llvm/15/compiler-rt/normalize-var.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake -index f1f46fb9599c..6f19e69507ba 100644 ---- a/cmake/Modules/CompilerRTUtils.cmake -+++ b/cmake/Modules/CompilerRTUtils.cmake -@@ -302,8 +302,9 @@ macro(load_llvm_config) - # Get some LLVM variables from LLVMConfig. - include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake") - -- set(LLVM_LIBRARY_OUTPUT_INTDIR -- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -+ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR -+ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} -+ REALPATH) - endif() - endmacro() - diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/X86-support-extension.patch b/pkgs/development/compilers/llvm/16/compiler-rt/X86-support-extension.patch deleted file mode 100644 index 07013e5a6825..000000000000 --- a/pkgs/development/compilers/llvm/16/compiler-rt/X86-support-extension.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt -index 3a66dd9c3fb..7efc85d9f9f 100644 ---- a/lib/builtins/CMakeLists.txt -+++ b/lib/builtins/CMakeLists.txt -@@ -348,4 +348,8 @@ if (NOT MSVC) - -+ set(i486_SOURCES ${i386_SOURCES}) -+ set(i586_SOURCES ${i386_SOURCES}) -+ set(i686_SOURCES ${i386_SOURCES}) -+ - if (WIN32) - set(i386_SOURCES - ${i386_SOURCES} -@@ -723,6 +723,7 @@ else () - endif() - - foreach (arch ${BUILTIN_SUPPORTED_ARCH}) -+ message("arch: ${arch}") - if (CAN_TARGET_${arch}) - # For ARM archs, exclude any VFP builtins if VFP is not supported - if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/16/compiler-rt/darwin-targetconditionals.patch deleted file mode 100644 index 425dc2af01e7..000000000000 --- a/pkgs/development/compilers/llvm/16/compiler-rt/darwin-targetconditionals.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp ---- a/lib/sanitizer_common/sanitizer_mac.cpp -+++ b/lib/sanitizer_common/sanitizer_mac.cpp -@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { - // Offset example: - // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 - constexpr u16 GetOSMajorKernelOffset() { -- if (TARGET_OS_OSX) return 4; -- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; -- if (TARGET_OS_WATCH) return 13; -+#if TARGET_OS_OSX -+ return 4; -+#endif -+#if TARGET_OS_IOS || TARGET_OS_TV -+ return 6; -+#endif -+#if TARGET_OS_WATCH -+ return 13; -+#endif - } - - using VersStr = char[64]; -@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { - u16 os_major = kernel_major - offset; - - const char *format = "%d.0"; -- if (TARGET_OS_OSX) { -- if (os_major >= 16) { // macOS 11+ -- os_major -= 5; -- } else { // macOS 10.15 and below -- format = "10.%d"; -- } -+#if TARGET_OS_OSX -+ if (os_major >= 16) { // macOS 11+ -+ os_major -= 5; -+ } else { // macOS 10.15 and below -+ format = "10.%d"; - } -+#endif - return internal_snprintf(vers, sizeof(VersStr), format, os_major); - } - -@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { - // Aligned versions example: - // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 - static void MapToMacos(u16 *major, u16 *minor) { -- if (TARGET_OS_OSX) -- return; -- -- if (TARGET_OS_IOS || TARGET_OS_TV) -+#if !TARGET_OS_OSX -+#if TARGET_OS_IOS || TARGET_OS_TV - *major += 2; -- else if (TARGET_OS_WATCH) -+#elif TARGET_OS_WATCH - *major += 9; -- else -+#else - UNREACHABLE("unsupported platform"); -+#endif - - if (*major >= 16) { // macOS 11+ - *major -= 5; -@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { - *minor = *major; - *major = 10; - } -+#endif - } - - static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/16/compiler-rt/gnu-install-dirs.patch deleted file mode 100644 index f3b1f63a7d71..000000000000 --- a/pkgs/development/compilers/llvm/16/compiler-rt/gnu-install-dirs.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake -index 8a6219568b3f..30ee68a47ccf 100644 ---- a/cmake/base-config-ix.cmake -+++ b/cmake/base-config-ix.cmake -@@ -100,13 +100,13 @@ endif() - if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - set(COMPILER_RT_OUTPUT_LIBRARY_DIR - ${COMPILER_RT_OUTPUT_DIR}/lib) -- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib) -+ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}") - set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH - "Path where built compiler-rt libraries should be installed.") - else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - set(COMPILER_RT_OUTPUT_LIBRARY_DIR - ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) -- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}") -+ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}") - set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH - "Path where built compiler-rt libraries should be installed.") - endif() diff --git a/pkgs/development/compilers/llvm/17/compiler-rt/X86-support-extension.patch b/pkgs/development/compilers/llvm/17/compiler-rt/X86-support-extension.patch deleted file mode 100644 index 07013e5a6825..000000000000 --- a/pkgs/development/compilers/llvm/17/compiler-rt/X86-support-extension.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt -index 3a66dd9c3fb..7efc85d9f9f 100644 ---- a/lib/builtins/CMakeLists.txt -+++ b/lib/builtins/CMakeLists.txt -@@ -348,4 +348,8 @@ if (NOT MSVC) - -+ set(i486_SOURCES ${i386_SOURCES}) -+ set(i586_SOURCES ${i386_SOURCES}) -+ set(i686_SOURCES ${i386_SOURCES}) -+ - if (WIN32) - set(i386_SOURCES - ${i386_SOURCES} -@@ -723,6 +723,7 @@ else () - endif() - - foreach (arch ${BUILTIN_SUPPORTED_ARCH}) -+ message("arch: ${arch}") - if (CAN_TARGET_${arch}) - # For ARM archs, exclude any VFP builtins if VFP is not supported - if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/pkgs/development/compilers/llvm/17/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/17/compiler-rt/darwin-targetconditionals.patch deleted file mode 100644 index 425dc2af01e7..000000000000 --- a/pkgs/development/compilers/llvm/17/compiler-rt/darwin-targetconditionals.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp ---- a/lib/sanitizer_common/sanitizer_mac.cpp -+++ b/lib/sanitizer_common/sanitizer_mac.cpp -@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { - // Offset example: - // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 - constexpr u16 GetOSMajorKernelOffset() { -- if (TARGET_OS_OSX) return 4; -- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; -- if (TARGET_OS_WATCH) return 13; -+#if TARGET_OS_OSX -+ return 4; -+#endif -+#if TARGET_OS_IOS || TARGET_OS_TV -+ return 6; -+#endif -+#if TARGET_OS_WATCH -+ return 13; -+#endif - } - - using VersStr = char[64]; -@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { - u16 os_major = kernel_major - offset; - - const char *format = "%d.0"; -- if (TARGET_OS_OSX) { -- if (os_major >= 16) { // macOS 11+ -- os_major -= 5; -- } else { // macOS 10.15 and below -- format = "10.%d"; -- } -+#if TARGET_OS_OSX -+ if (os_major >= 16) { // macOS 11+ -+ os_major -= 5; -+ } else { // macOS 10.15 and below -+ format = "10.%d"; - } -+#endif - return internal_snprintf(vers, sizeof(VersStr), format, os_major); - } - -@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { - // Aligned versions example: - // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 - static void MapToMacos(u16 *major, u16 *minor) { -- if (TARGET_OS_OSX) -- return; -- -- if (TARGET_OS_IOS || TARGET_OS_TV) -+#if !TARGET_OS_OSX -+#if TARGET_OS_IOS || TARGET_OS_TV - *major += 2; -- else if (TARGET_OS_WATCH) -+#elif TARGET_OS_WATCH - *major += 9; -- else -+#else - UNREACHABLE("unsupported platform"); -+#endif - - if (*major >= 16) { // macOS 11+ - *major -= 5; -@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { - *minor = *major; - *major = 10; - } -+#endif - } - - static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/pkgs/development/compilers/llvm/17/compiler-rt/normalize-var.patch b/pkgs/development/compilers/llvm/17/compiler-rt/normalize-var.patch deleted file mode 100644 index 2b25fd4a0744..000000000000 --- a/pkgs/development/compilers/llvm/17/compiler-rt/normalize-var.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake -index 4c85551d7766..297d7a47c54b 100644 ---- a/cmake/Modules/CompilerRTUtils.cmake -+++ b/cmake/Modules/CompilerRTUtils.cmake -@@ -328,8 +328,9 @@ macro(load_llvm_config) - endif() - endif() - -- set(LLVM_LIBRARY_OUTPUT_INTDIR -- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -+ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR -+ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} -+ REALPATH) - - set(LLVM_MAIN_SRC_DIR "${LLVM_MAIN_SRC_DIR_DEFAULT}" CACHE PATH "Path to LLVM source tree") - message(STATUS "LLVM_MAIN_SRC_DIR: \"${LLVM_MAIN_SRC_DIR}\"") diff --git a/pkgs/development/compilers/llvm/18/compiler-rt/X86-support-extension.patch b/pkgs/development/compilers/llvm/18/compiler-rt/X86-support-extension.patch deleted file mode 100644 index 07013e5a6825..000000000000 --- a/pkgs/development/compilers/llvm/18/compiler-rt/X86-support-extension.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt -index 3a66dd9c3fb..7efc85d9f9f 100644 ---- a/lib/builtins/CMakeLists.txt -+++ b/lib/builtins/CMakeLists.txt -@@ -348,4 +348,8 @@ if (NOT MSVC) - -+ set(i486_SOURCES ${i386_SOURCES}) -+ set(i586_SOURCES ${i386_SOURCES}) -+ set(i686_SOURCES ${i386_SOURCES}) -+ - if (WIN32) - set(i386_SOURCES - ${i386_SOURCES} -@@ -723,6 +723,7 @@ else () - endif() - - foreach (arch ${BUILTIN_SUPPORTED_ARCH}) -+ message("arch: ${arch}") - if (CAN_TARGET_${arch}) - # For ARM archs, exclude any VFP builtins if VFP is not supported - if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/pkgs/development/compilers/llvm/18/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/18/compiler-rt/darwin-targetconditionals.patch deleted file mode 100644 index 425dc2af01e7..000000000000 --- a/pkgs/development/compilers/llvm/18/compiler-rt/darwin-targetconditionals.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp ---- a/lib/sanitizer_common/sanitizer_mac.cpp -+++ b/lib/sanitizer_common/sanitizer_mac.cpp -@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { - // Offset example: - // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 - constexpr u16 GetOSMajorKernelOffset() { -- if (TARGET_OS_OSX) return 4; -- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; -- if (TARGET_OS_WATCH) return 13; -+#if TARGET_OS_OSX -+ return 4; -+#endif -+#if TARGET_OS_IOS || TARGET_OS_TV -+ return 6; -+#endif -+#if TARGET_OS_WATCH -+ return 13; -+#endif - } - - using VersStr = char[64]; -@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { - u16 os_major = kernel_major - offset; - - const char *format = "%d.0"; -- if (TARGET_OS_OSX) { -- if (os_major >= 16) { // macOS 11+ -- os_major -= 5; -- } else { // macOS 10.15 and below -- format = "10.%d"; -- } -+#if TARGET_OS_OSX -+ if (os_major >= 16) { // macOS 11+ -+ os_major -= 5; -+ } else { // macOS 10.15 and below -+ format = "10.%d"; - } -+#endif - return internal_snprintf(vers, sizeof(VersStr), format, os_major); - } - -@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { - // Aligned versions example: - // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 - static void MapToMacos(u16 *major, u16 *minor) { -- if (TARGET_OS_OSX) -- return; -- -- if (TARGET_OS_IOS || TARGET_OS_TV) -+#if !TARGET_OS_OSX -+#if TARGET_OS_IOS || TARGET_OS_TV - *major += 2; -- else if (TARGET_OS_WATCH) -+#elif TARGET_OS_WATCH - *major += 9; -- else -+#else - UNREACHABLE("unsupported platform"); -+#endif - - if (*major >= 16) { // macOS 11+ - *major -= 5; -@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { - *minor = *major; - *major = 10; - } -+#endif - } - - static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/pkgs/development/compilers/llvm/18/compiler-rt/normalize-var.patch b/pkgs/development/compilers/llvm/18/compiler-rt/normalize-var.patch deleted file mode 100644 index 2b25fd4a0744..000000000000 --- a/pkgs/development/compilers/llvm/18/compiler-rt/normalize-var.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake -index 4c85551d7766..297d7a47c54b 100644 ---- a/cmake/Modules/CompilerRTUtils.cmake -+++ b/cmake/Modules/CompilerRTUtils.cmake -@@ -328,8 +328,9 @@ macro(load_llvm_config) - endif() - endif() - -- set(LLVM_LIBRARY_OUTPUT_INTDIR -- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -+ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR -+ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} -+ REALPATH) - - set(LLVM_MAIN_SRC_DIR "${LLVM_MAIN_SRC_DIR_DEFAULT}" CACHE PATH "Path to LLVM source tree") - message(STATUS "LLVM_MAIN_SRC_DIR: \"${LLVM_MAIN_SRC_DIR}\"") diff --git a/pkgs/development/compilers/llvm/19/compiler-rt/X86-support-extension.patch b/pkgs/development/compilers/llvm/19/compiler-rt/X86-support-extension.patch deleted file mode 100644 index 07013e5a6825..000000000000 --- a/pkgs/development/compilers/llvm/19/compiler-rt/X86-support-extension.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt -index 3a66dd9c3fb..7efc85d9f9f 100644 ---- a/lib/builtins/CMakeLists.txt -+++ b/lib/builtins/CMakeLists.txt -@@ -348,4 +348,8 @@ if (NOT MSVC) - -+ set(i486_SOURCES ${i386_SOURCES}) -+ set(i586_SOURCES ${i386_SOURCES}) -+ set(i686_SOURCES ${i386_SOURCES}) -+ - if (WIN32) - set(i386_SOURCES - ${i386_SOURCES} -@@ -723,6 +723,7 @@ else () - endif() - - foreach (arch ${BUILTIN_SUPPORTED_ARCH}) -+ message("arch: ${arch}") - if (CAN_TARGET_${arch}) - # For ARM archs, exclude any VFP builtins if VFP is not supported - if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/pkgs/development/compilers/llvm/19/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/19/compiler-rt/darwin-targetconditionals.patch deleted file mode 100644 index 425dc2af01e7..000000000000 --- a/pkgs/development/compilers/llvm/19/compiler-rt/darwin-targetconditionals.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp ---- a/lib/sanitizer_common/sanitizer_mac.cpp -+++ b/lib/sanitizer_common/sanitizer_mac.cpp -@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { - // Offset example: - // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 - constexpr u16 GetOSMajorKernelOffset() { -- if (TARGET_OS_OSX) return 4; -- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; -- if (TARGET_OS_WATCH) return 13; -+#if TARGET_OS_OSX -+ return 4; -+#endif -+#if TARGET_OS_IOS || TARGET_OS_TV -+ return 6; -+#endif -+#if TARGET_OS_WATCH -+ return 13; -+#endif - } - - using VersStr = char[64]; -@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { - u16 os_major = kernel_major - offset; - - const char *format = "%d.0"; -- if (TARGET_OS_OSX) { -- if (os_major >= 16) { // macOS 11+ -- os_major -= 5; -- } else { // macOS 10.15 and below -- format = "10.%d"; -- } -+#if TARGET_OS_OSX -+ if (os_major >= 16) { // macOS 11+ -+ os_major -= 5; -+ } else { // macOS 10.15 and below -+ format = "10.%d"; - } -+#endif - return internal_snprintf(vers, sizeof(VersStr), format, os_major); - } - -@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { - // Aligned versions example: - // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 - static void MapToMacos(u16 *major, u16 *minor) { -- if (TARGET_OS_OSX) -- return; -- -- if (TARGET_OS_IOS || TARGET_OS_TV) -+#if !TARGET_OS_OSX -+#if TARGET_OS_IOS || TARGET_OS_TV - *major += 2; -- else if (TARGET_OS_WATCH) -+#elif TARGET_OS_WATCH - *major += 9; -- else -+#else - UNREACHABLE("unsupported platform"); -+#endif - - if (*major >= 16) { // macOS 11+ - *major -= 5; -@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { - *minor = *major; - *major = 10; - } -+#endif - } - - static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/pkgs/development/compilers/llvm/19/compiler-rt/normalize-var.patch b/pkgs/development/compilers/llvm/19/compiler-rt/normalize-var.patch deleted file mode 100644 index 2b25fd4a0744..000000000000 --- a/pkgs/development/compilers/llvm/19/compiler-rt/normalize-var.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake -index 4c85551d7766..297d7a47c54b 100644 ---- a/cmake/Modules/CompilerRTUtils.cmake -+++ b/cmake/Modules/CompilerRTUtils.cmake -@@ -328,8 +328,9 @@ macro(load_llvm_config) - endif() - endif() - -- set(LLVM_LIBRARY_OUTPUT_INTDIR -- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -+ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR -+ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} -+ REALPATH) - - set(LLVM_MAIN_SRC_DIR "${LLVM_MAIN_SRC_DIR_DEFAULT}" CACHE PATH "Path to LLVM source tree") - message(STATUS "LLVM_MAIN_SRC_DIR: \"${LLVM_MAIN_SRC_DIR}\"") diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 8aeffc5c8b12..92e1f4c6c7b9 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -72,33 +72,44 @@ let + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}"; getVersionFile = p: - if - (lib.versionOlder release_version "14" || lib.versionAtLeast release_version "19") - && p == "clang/gnu-install-dirs.patch" - then - builtins.path { - name = builtins.baseNameOf p; - path = if lib.versionAtLeast release_version "19" then ../19/${p} else ../12/${p}; - } - else if lib.versionAtLeast release_version "18" && p == "clang/purity.patch" then - builtins.path { - name = builtins.baseNameOf p; - path = ../18/${p}; - } - else if - lib.versionAtLeast release_version "15" - && lib.versionOlder release_version "17" - && p == "clang/purity.patch" - then - builtins.path { - name = builtins.baseNameOf p; - path = ../15/${p}; - } - else - builtins.path { - name = builtins.baseNameOf p; - path = "${metadata.versionDir}/${p}"; - }; + builtins.path { + name = builtins.baseNameOf p; + path = + if + (lib.versionOlder release_version "14" || lib.versionAtLeast release_version "19") + && p == "clang/gnu-install-dirs.patch" + then + (if lib.versionAtLeast release_version "19" then ../19/${p} else ../12/${p}) + else if lib.versionAtLeast release_version "18" && p == "clang/purity.patch" then + ../18/${p} + else if + lib.versionAtLeast release_version "15" + && lib.versionOlder release_version "17" + && p == "clang/purity.patch" + then + ../15/${p} + else if p == "compiler-rt/X86-support-extension.patch" then + (if lib.versionAtLeast release_version "15" then ../15/${p} else ../12/${p}) + else if + lib.versionAtLeast release_version "13" + && lib.versionOlder release_version "15" + && p == "compiler-rt/armv7l.patch" + then + ../13/${p} + else if p == "compiler-rt/gnu-install-dirs.patch" && lib.versionAtLeast release_version "15" then + (if lib.versionAtLeast release_version "15" then ../15/${p} else ../12/${p}) + else if + (p == "compiler-rt/darwin-targetconditionals.patch" || p == "compiler-rt/codesign.patch") + && lib.versionAtLeast release_version "13" + then + ../13/${p} + else if lib.versionAtLeast release_version "16" && p == "compiler-rt/normalize-var.patch" then + ../16/${p} + else if lib.versionOlder release_version "16" && p == "compiler-rt/normalize-var.patch" then + ../12/${p} + else + "${metadata.versionDir}/${p}"; + }; }; lldbPlugins = lib.makeExtensible ( diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/X86-support-extension.patch b/pkgs/development/compilers/llvm/git/compiler-rt/X86-support-extension.patch deleted file mode 100644 index 07013e5a6825..000000000000 --- a/pkgs/development/compilers/llvm/git/compiler-rt/X86-support-extension.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt -index 3a66dd9c3fb..7efc85d9f9f 100644 ---- a/lib/builtins/CMakeLists.txt -+++ b/lib/builtins/CMakeLists.txt -@@ -348,4 +348,8 @@ if (NOT MSVC) - -+ set(i486_SOURCES ${i386_SOURCES}) -+ set(i586_SOURCES ${i386_SOURCES}) -+ set(i686_SOURCES ${i386_SOURCES}) -+ - if (WIN32) - set(i386_SOURCES - ${i386_SOURCES} -@@ -723,6 +723,7 @@ else () - endif() - - foreach (arch ${BUILTIN_SUPPORTED_ARCH}) -+ message("arch: ${arch}") - if (CAN_TARGET_${arch}) - # For ARM archs, exclude any VFP builtins if VFP is not supported - if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/git/compiler-rt/darwin-targetconditionals.patch deleted file mode 100644 index 425dc2af01e7..000000000000 --- a/pkgs/development/compilers/llvm/git/compiler-rt/darwin-targetconditionals.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp ---- a/lib/sanitizer_common/sanitizer_mac.cpp -+++ b/lib/sanitizer_common/sanitizer_mac.cpp -@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { - // Offset example: - // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 - constexpr u16 GetOSMajorKernelOffset() { -- if (TARGET_OS_OSX) return 4; -- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; -- if (TARGET_OS_WATCH) return 13; -+#if TARGET_OS_OSX -+ return 4; -+#endif -+#if TARGET_OS_IOS || TARGET_OS_TV -+ return 6; -+#endif -+#if TARGET_OS_WATCH -+ return 13; -+#endif - } - - using VersStr = char[64]; -@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { - u16 os_major = kernel_major - offset; - - const char *format = "%d.0"; -- if (TARGET_OS_OSX) { -- if (os_major >= 16) { // macOS 11+ -- os_major -= 5; -- } else { // macOS 10.15 and below -- format = "10.%d"; -- } -+#if TARGET_OS_OSX -+ if (os_major >= 16) { // macOS 11+ -+ os_major -= 5; -+ } else { // macOS 10.15 and below -+ format = "10.%d"; - } -+#endif - return internal_snprintf(vers, sizeof(VersStr), format, os_major); - } - -@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { - // Aligned versions example: - // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 - static void MapToMacos(u16 *major, u16 *minor) { -- if (TARGET_OS_OSX) -- return; -- -- if (TARGET_OS_IOS || TARGET_OS_TV) -+#if !TARGET_OS_OSX -+#if TARGET_OS_IOS || TARGET_OS_TV - *major += 2; -- else if (TARGET_OS_WATCH) -+#elif TARGET_OS_WATCH - *major += 9; -- else -+#else - UNREACHABLE("unsupported platform"); -+#endif - - if (*major >= 16) { // macOS 11+ - *major -= 5; -@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { - *minor = *major; - *major = 10; - } -+#endif - } - - static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/normalize-var.patch b/pkgs/development/compilers/llvm/git/compiler-rt/normalize-var.patch deleted file mode 100644 index 2b25fd4a0744..000000000000 --- a/pkgs/development/compilers/llvm/git/compiler-rt/normalize-var.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake -index 4c85551d7766..297d7a47c54b 100644 ---- a/cmake/Modules/CompilerRTUtils.cmake -+++ b/cmake/Modules/CompilerRTUtils.cmake -@@ -328,8 +328,9 @@ macro(load_llvm_config) - endif() - endif() - -- set(LLVM_LIBRARY_OUTPUT_INTDIR -- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -+ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR -+ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} -+ REALPATH) - - set(LLVM_MAIN_SRC_DIR "${LLVM_MAIN_SRC_DIR_DEFAULT}" CACHE PATH "Path to LLVM source tree") - message(STATUS "LLVM_MAIN_SRC_DIR: \"${LLVM_MAIN_SRC_DIR}\"") From 93613836ca464bf758d82634840cf689f4252244 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 9 Aug 2024 12:39:02 -0700 Subject: [PATCH 054/357] llvmPackages_{15,16}.libunwind: commonify patches --- .../llvm/16/libunwind/gnu-install-dirs.patch | 22 ------------------- .../compilers/llvm/common/default.nix | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/16/libunwind/gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/16/libunwind/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/16/libunwind/gnu-install-dirs.patch deleted file mode 100644 index edfb2a8760bd..000000000000 --- a/pkgs/development/compilers/llvm/16/libunwind/gnu-install-dirs.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5a06805f05f1..86a50329e6a8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -117,7 +117,7 @@ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH - - if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) -- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH - "Path where built libunwind libraries should be installed.") - if(LIBCXX_LIBDIR_SUBDIR) - string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) -@@ -129,7 +129,7 @@ else() - else() - set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) - endif() -- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH - "Path where built libunwind libraries should be installed.") - endif() - diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 92e1f4c6c7b9..c22bd7de4900 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -85,7 +85,7 @@ let else if lib.versionAtLeast release_version "15" && lib.versionOlder release_version "17" - && p == "clang/purity.patch" + && (p == "clang/purity.patch" || p == "libunwind/gnu-install-dirs.patch") then ../15/${p} else if p == "compiler-rt/X86-support-extension.patch" then From 7b52fe74c707014445420c7639a30ec0a1f19d3e Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 9 Aug 2024 12:45:54 -0700 Subject: [PATCH 055/357] llvmPackages_{13,17,19,git}.lld: commonify patches --- .../llvm/13/lld/gnu-install-dirs.patch | 68 ------- .../llvm/17/lld/add-table-base.patch | 190 ------------------ .../llvm/19/lld/gnu-install-dirs.patch | 15 -- .../compilers/llvm/common/default.nix | 12 +- .../llvm/git/lld/gnu-install-dirs.patch | 15 -- 5 files changed, 10 insertions(+), 290 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/13/lld/gnu-install-dirs.patch delete mode 100644 pkgs/development/compilers/llvm/17/lld/add-table-base.patch delete mode 100644 pkgs/development/compilers/llvm/19/lld/gnu-install-dirs.patch delete mode 100644 pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/13/lld/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/13/lld/gnu-install-dirs.patch deleted file mode 100644 index 61e2f0e48653..000000000000 --- a/pkgs/development/compilers/llvm/13/lld/gnu-install-dirs.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d4e561b50d8f..cfa5bdd79c2a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(LLD_BUILT_STANDALONE TRUE) - -+ include(GNUInstallDirs) -+ - find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") - if(NOT LLVM_CONFIG_PATH) - message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") -@@ -179,7 +181,7 @@ include_directories(BEFORE - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - ) -diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake -index 23df41312403..d62372c88de7 100644 ---- a/cmake/modules/AddLLD.cmake -+++ b/cmake/modules/AddLLD.cmake -@@ -20,9 +20,9 @@ macro(add_lld_library name) - install(TARGETS ${name} - COMPONENT ${name} - ${export_to_lldtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- RUNTIME DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) - add_llvm_install_targets(install-${name} -@@ -54,7 +54,7 @@ macro(add_lld_tool name) - - install(TARGETS ${name} - ${export_to_lldtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT ${name}) - - if(NOT CMAKE_CONFIGURATION_TYPES) -@@ -69,5 +69,5 @@ endmacro() - macro(add_lld_symlink name dest) - add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) - # Always generate install targets -- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) -+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) - endmacro() -diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt -index 5cff736ff57f..64e775c771b9 100644 ---- a/tools/lld/CMakeLists.txt -+++ b/tools/lld/CMakeLists.txt -@@ -21,7 +21,7 @@ target_link_libraries(lld - ) - - install(TARGETS lld -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if(NOT LLD_SYMLINKS_TO_CREATE) - set(LLD_SYMLINKS_TO_CREATE diff --git a/pkgs/development/compilers/llvm/17/lld/add-table-base.patch b/pkgs/development/compilers/llvm/17/lld/add-table-base.patch deleted file mode 100644 index 15fc903a5e3f..000000000000 --- a/pkgs/development/compilers/llvm/17/lld/add-table-base.patch +++ /dev/null @@ -1,190 +0,0 @@ -From 93adcb770b99351b18553089c164fe3ef2119699 Mon Sep 17 00:00:00 2001 -From: Sam Clegg -Date: Fri, 25 Aug 2023 13:56:16 -0700 -Subject: [PATCH] [lld][WebAssembly] Add `--table-base` setting - -This is similar to `--global-base` but determines where to place the -table segments rather than that data segments. - -See https://github.com/emscripten-core/emscripten/issues/20097 - -Differential Revision: https://reviews.llvm.org/D158892 ---- - test/wasm/table-base.s | 72 ++++++++++++++++++++++++++++++++++++++ - wasm/Driver.cpp | 19 ++++++++-- - wasm/Options.td | 5 ++- - wasm/Writer.cpp | 8 ----- - 4 files changed, 93 insertions(+), 11 deletions(-) - create mode 100644 test/wasm/table-base.s - -diff --git a/test/wasm/table-base.s b/test/wasm/table-base.s -new file mode 100644 -index 000000000000000..56fff414fd31d96 ---- /dev/null -+++ b/test/wasm/table-base.s -@@ -0,0 +1,72 @@ -+# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown %s -o %t.o -+ -+# RUN: wasm-ld --export=__table_base -o %t.wasm %t.o -+# RUN: obj2yaml %t.wasm | FileCheck %s -check-prefix=CHECK-DEFAULT -+ -+# RUN: wasm-ld --table-base=100 --export=__table_base -o %t.wasm %t.o -+# RUN: obj2yaml %t.wasm | FileCheck %s -check-prefix=CHECK-100 -+ -+.globl _start -+_start: -+ .functype _start () -> () -+ i32.const _start -+ drop -+ end_function -+ -+# CHECK-DEFAULT: - Type: TABLE -+# CHECK-DEFAULT-NEXT: Tables: -+# CHECK-DEFAULT-NEXT: - Index: 0 -+# CHECK-DEFAULT-NEXT: ElemType: FUNCREF -+# CHECK-DEFAULT-NEXT: Limits: -+# CHECK-DEFAULT-NEXT: Flags: [ HAS_MAX ] -+# CHECK-DEFAULT-NEXT: Minimum: 0x2 -+# CHECK-DEFAULT-NEXT: Maximum: 0x2 -+ -+# CHECK-DEFAULT: - Type: GLOBAL -+# CHECK-DEFAULT-NEXT: Globals: -+# CHECK-DEFAULT-NEXT: - Index: 0 -+# CHECK-DEFAULT-NEXT: Type: I32 -+# CHECK-DEFAULT-NEXT: Mutable: true -+# CHECK-DEFAULT-NEXT: InitExpr: -+# CHECK-DEFAULT-NEXT: Opcode: I32_CONST -+# CHECK-DEFAULT-NEXT: Value: 66560 -+# CHECK-DEFAULT-NEXT: - Index: 1 -+# CHECK-DEFAULT-NEXT: Type: I32 -+# CHECK-DEFAULT-NEXT: Mutable: false -+# CHECK-DEFAULT-NEXT: InitExpr: -+# CHECK-DEFAULT-NEXT: Opcode: I32_CONST -+# CHECK-DEFAULT-NEXT: Value: 1 -+ -+# CHECK-DEFAULT: - Type: EXPORT -+# CHECK-DEFAULT: - Name: __table_base -+# CHECK-DEFAULT-NEXT: Kind: GLOBAL -+# CHECK-DEFAULT-NEXT: Index: 1 -+ -+# CHECK-100: - Type: TABLE -+# CHECK-100-NEXT: Tables: -+# CHECK-100-NEXT: - Index: 0 -+# CHECK-100-NEXT: ElemType: FUNCREF -+# CHECK-100-NEXT: Limits: -+# CHECK-100-NEXT: Flags: [ HAS_MAX ] -+# CHECK-100-NEXT: Minimum: 0x65 -+# CHECK-100-NEXT: Maximum: 0x65 -+ -+# CHECK-100: - Type: GLOBAL -+# CHECK-100-NEXT: Globals: -+# CHECK-100-NEXT: - Index: 0 -+# CHECK-100-NEXT: Type: I32 -+# CHECK-100-NEXT: Mutable: true -+# CHECK-100-NEXT: InitExpr: -+# CHECK-100-NEXT: Opcode: I32_CONST -+# CHECK-100-NEXT: Value: 66560 -+# CHECK-100-NEXT: - Index: 1 -+# CHECK-100-NEXT: Type: I32 -+# CHECK-100-NEXT: Mutable: false -+# CHECK-100-NEXT: InitExpr: -+# CHECK-100-NEXT: Opcode: I32_CONST -+# CHECK-100-NEXT: Value: 100 -+ -+# CHECK-100: - Type: EXPORT -+# CHECK-100: - Name: __table_base -+# CHECK-100-NEXT: Kind: GLOBAL -+# CHECK-100-NEXT: Index: 1 -diff --git a/wasm/Driver.cpp b/wasm/Driver.cpp -index 84304881f5ca34e..c2f5f0185781f36 100644 ---- a/wasm/Driver.cpp -+++ b/wasm/Driver.cpp -@@ -502,6 +502,7 @@ static void readConfigs(opt::InputArgList &args) { - - config->initialMemory = args::getInteger(args, OPT_initial_memory, 0); - config->globalBase = args::getInteger(args, OPT_global_base, 0); -+ config->tableBase = args::getInteger(args, OPT_table_base, 0); - config->maxMemory = args::getInteger(args, OPT_max_memory, 0); - config->zStackSize = - args::getZOptionValue(args, OPT_z, "stack-size", WasmPageSize); -@@ -573,6 +574,17 @@ static void setConfigs() { - if (config->exportTable) - error("-shared/-pie is incompatible with --export-table"); - config->importTable = true; -+ } else { -+ // Default table base. Defaults to 1, reserving 0 for the NULL function -+ // pointer. -+ if (!config->tableBase) -+ config->tableBase = 1; -+ // The default offset for static/global data, for when --global-base is -+ // not specified on the command line. The precise value of 1024 is -+ // somewhat arbitrary, and pre-dates wasm-ld (Its the value that -+ // emscripten used prior to wasm-ld). -+ if (!config->globalBase && !config->relocatable && !config->stackFirst) -+ config->globalBase = 1024; - } - - if (config->relocatable) { -@@ -666,8 +678,11 @@ static void checkOptions(opt::InputArgList &args) { - warn("-Bsymbolic is only meaningful when combined with -shared"); - } - -- if (config->globalBase && config->isPic) { -- error("--global-base may not be used with -shared/-pie"); -+ if (config->isPic) { -+ if (config->globalBase) -+ error("--global-base may not be used with -shared/-pie"); -+ if (config->tableBase) -+ error("--table-base may not be used with -shared/-pie"); - } - } - -diff --git a/wasm/Options.td b/wasm/Options.td -index 50417d2928e0a34..bb764396bf4df14 100644 ---- a/wasm/Options.td -+++ b/wasm/Options.td -@@ -191,7 +191,7 @@ def growable_table: FF<"growable-table">, - HelpText<"Remove maximum size from function table, allowing table to grow">; - - def global_base: JJ<"global-base=">, -- HelpText<"Where to start to place global data">; -+ HelpText<"Memory offset at which to place global data (Defaults to 1024)">; - - def import_memory: FF<"import-memory">, - HelpText<"Import the module's memory from the default module of \"env\" with the name \"memory\".">; -@@ -224,6 +224,9 @@ def no_entry: FF<"no-entry">, - def stack_first: FF<"stack-first">, - HelpText<"Place stack at start of linear memory rather than after data">; - -+def table_base: JJ<"table-base=">, -+ HelpText<"Table offset at which to place address taken functions (Defaults to 1)">; -+ - defm whole_archive: B<"whole-archive", - "Force load of all members in a static library", - "Do not force load of all members in a static library (default)">; -diff --git a/wasm/Writer.cpp b/wasm/Writer.cpp -index f25d358dc5bae6f..0576bf2907e49c4 100644 ---- a/wasm/Writer.cpp -+++ b/wasm/Writer.cpp -@@ -358,13 +358,6 @@ void Writer::layoutMemory() { - memoryPtr = config->globalBase; - } - } else { -- if (!config->globalBase && !config->relocatable && !config->isPic) { -- // The default offset for static/global data, for when --global-base is -- // not specified on the command line. The precise value of 1024 is -- // somewhat arbitrary, and pre-dates wasm-ld (Its the value that -- // emscripten used prior to wasm-ld). -- config->globalBase = 1024; -- } - memoryPtr = config->globalBase; - } - -@@ -1685,7 +1678,6 @@ void Writer::run() { - // For PIC code the table base is assigned dynamically by the loader. - // For non-PIC, we start at 1 so that accessing table index 0 always traps. - if (!config->isPic) { -- config->tableBase = 1; - if (WasmSym::definedTableBase) - WasmSym::definedTableBase->setVA(config->tableBase); - if (WasmSym::definedTableBase32) diff --git a/pkgs/development/compilers/llvm/19/lld/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/19/lld/gnu-install-dirs.patch deleted file mode 100644 index 6c73a240ab6d..000000000000 --- a/pkgs/development/compilers/llvm/19/lld/gnu-install-dirs.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake -index d3924f7243d4..42a7cd62281c 100644 ---- a/cmake/modules/AddLLD.cmake -+++ b/cmake/modules/AddLLD.cmake -@@ -18,8 +18,8 @@ macro(add_lld_library name) - install(TARGETS ${name} - COMPONENT ${name} - ${export_to_lldtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") - - if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index c22bd7de4900..4d72ded4d7be 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -80,7 +80,10 @@ let && p == "clang/gnu-install-dirs.patch" then (if lib.versionAtLeast release_version "19" then ../19/${p} else ../12/${p}) - else if lib.versionAtLeast release_version "18" && p == "clang/purity.patch" then + else if + lib.versionAtLeast release_version "18" + && (p == "clang/purity.patch" || p == "lld/gnu-install-dirs.patch") + then ../18/${p} else if lib.versionAtLeast release_version "15" @@ -103,10 +106,15 @@ let && lib.versionAtLeast release_version "13" then ../13/${p} - else if lib.versionAtLeast release_version "16" && p == "compiler-rt/normalize-var.patch" then + else if + lib.versionAtLeast release_version "16" + && (p == "lld/add-table-base.patch" || p == "compiler-rt/normalize-var.patch") + then ../16/${p} else if lib.versionOlder release_version "16" && p == "compiler-rt/normalize-var.patch" then ../12/${p} + else if lib.versionOlder release_version "14" && p == "lld/gnu-install-dirs.patch" then + ../12/${p} else "${metadata.versionDir}/${p}"; }; diff --git a/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch deleted file mode 100644 index 6c73a240ab6d..000000000000 --- a/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake -index d3924f7243d4..42a7cd62281c 100644 ---- a/cmake/modules/AddLLD.cmake -+++ b/cmake/modules/AddLLD.cmake -@@ -18,8 +18,8 @@ macro(add_lld_library name) - install(TARGETS ${name} - COMPONENT ${name} - ${export_to_lldtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") - - if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) From f95daad5d4768dbe5280aeb17e24bb6a9da7cb3e Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 9 Aug 2024 12:56:23 -0700 Subject: [PATCH 056/357] llvmPackages_{13,14,15,16,17,18,19,git}.lldb: commonify patches --- .../compilers/llvm/13/lldb/procfs.patch | 31 ------------- .../compilers/llvm/13/lldb/resource-dir.patch | 13 ------ .../lldb/cpu_subtype_arm64e_replacement.patch | 12 ----- .../compilers/llvm/14/lldb/procfs.patch | 31 ------------- .../compilers/llvm/14/lldb/resource-dir.patch | 13 ------ .../lldb/cpu_subtype_arm64e_replacement.patch | 12 ----- .../compilers/llvm/15/lldb/resource-dir.patch | 13 ------ .../lldb/cpu_subtype_arm64e_replacement.patch | 12 ----- .../compilers/llvm/16/lldb/procfs.patch | 46 ------------------- .../lldb/cpu_subtype_arm64e_replacement.patch | 12 ----- .../compilers/llvm/17/lldb/procfs.patch | 46 ------------------- .../lldb/cpu_subtype_arm64e_replacement.patch | 12 ----- .../compilers/llvm/18/lldb/procfs.patch | 46 ------------------- .../lldb/cpu_subtype_arm64e_replacement.patch | 12 ----- .../compilers/llvm/19/lldb/procfs.patch | 46 ------------------- .../compilers/llvm/common/default.nix | 13 ++++-- .../lldb/cpu_subtype_arm64e_replacement.patch | 12 ----- .../compilers/llvm/git/lldb/procfs.patch | 46 ------------------- 18 files changed, 10 insertions(+), 418 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/13/lldb/procfs.patch delete mode 100644 pkgs/development/compilers/llvm/13/lldb/resource-dir.patch delete mode 100644 pkgs/development/compilers/llvm/14/lldb/cpu_subtype_arm64e_replacement.patch delete mode 100644 pkgs/development/compilers/llvm/14/lldb/procfs.patch delete mode 100644 pkgs/development/compilers/llvm/14/lldb/resource-dir.patch delete mode 100644 pkgs/development/compilers/llvm/15/lldb/cpu_subtype_arm64e_replacement.patch delete mode 100644 pkgs/development/compilers/llvm/15/lldb/resource-dir.patch delete mode 100644 pkgs/development/compilers/llvm/16/lldb/cpu_subtype_arm64e_replacement.patch delete mode 100644 pkgs/development/compilers/llvm/16/lldb/procfs.patch delete mode 100644 pkgs/development/compilers/llvm/17/lldb/cpu_subtype_arm64e_replacement.patch delete mode 100644 pkgs/development/compilers/llvm/17/lldb/procfs.patch delete mode 100644 pkgs/development/compilers/llvm/18/lldb/cpu_subtype_arm64e_replacement.patch delete mode 100644 pkgs/development/compilers/llvm/18/lldb/procfs.patch delete mode 100644 pkgs/development/compilers/llvm/19/lldb/cpu_subtype_arm64e_replacement.patch delete mode 100644 pkgs/development/compilers/llvm/19/lldb/procfs.patch delete mode 100644 pkgs/development/compilers/llvm/git/lldb/cpu_subtype_arm64e_replacement.patch delete mode 100644 pkgs/development/compilers/llvm/git/lldb/procfs.patch diff --git a/pkgs/development/compilers/llvm/13/lldb/procfs.patch b/pkgs/development/compilers/llvm/13/lldb/procfs.patch deleted file mode 100644 index b075dbaeee0a..000000000000 --- a/pkgs/development/compilers/llvm/13/lldb/procfs.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/source/Plugins/Process/Linux/Procfs.h -+++ b/source/Plugins/Process/Linux/Procfs.h -@@ -11,21 +11,12 @@ - // sys/procfs.h on Android/Linux for all supported architectures. - - #include -+#include - --#ifdef __ANDROID__ --#if defined(__arm64__) || defined(__aarch64__) --typedef unsigned long elf_greg_t; --typedef elf_greg_t -- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; --typedef struct user_fpsimd_state elf_fpregset_t; --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#elif defined(__mips__) --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#endif --#else // __ANDROID__ -+#if !defined(__GLIBC__) && defined(__powerpc__) -+#define pt_regs musl_pt_regs -+#include -+#undef pt_regs -+#else - #include --#endif // __ANDROID__ -+#endif diff --git a/pkgs/development/compilers/llvm/13/lldb/resource-dir.patch b/pkgs/development/compilers/llvm/13/lldb/resource-dir.patch deleted file mode 100644 index e0db80afeb9f..000000000000 --- a/pkgs/development/compilers/llvm/13/lldb/resource-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake -index 37364341ff8b..7f74c1a3e257 100644 ---- a/cmake/modules/LLDBConfig.cmake -+++ b/cmake/modules/LLDBConfig.cmake -@@ -257,7 +257,7 @@ if (NOT TARGET clang-resource-headers) - # Iterate over the possible places where the external resource directory - # could be and pick the first that exists. - foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}" -- "${LLVM_BUILD_LIBRARY_DIR}" -+ "${LLVM_BUILD_LIBRARY_DIR}" "@clangLibDir@" - "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}") - # Build the resource directory path by appending 'clang/'. - set(CANDIDATE_RESOURCE_DIR "${CANDIDATE}/clang/${LLDB_CLANG_RESOURCE_DIR_NAME}") diff --git a/pkgs/development/compilers/llvm/14/lldb/cpu_subtype_arm64e_replacement.patch b/pkgs/development/compilers/llvm/14/lldb/cpu_subtype_arm64e_replacement.patch deleted file mode 100644 index 20d35c9f3ea9..000000000000 --- a/pkgs/development/compilers/llvm/14/lldb/cpu_subtype_arm64e_replacement.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm ---- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm -+++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm -@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32, - len = sizeof(is_64_bit_capable); - ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0); - -- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) { -+ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers - // The arm64e architecture is a preview. Pretend the host architecture - // is arm64. - cpusubtype = CPU_SUBTYPE_ARM64_ALL; diff --git a/pkgs/development/compilers/llvm/14/lldb/procfs.patch b/pkgs/development/compilers/llvm/14/lldb/procfs.patch deleted file mode 100644 index b075dbaeee0a..000000000000 --- a/pkgs/development/compilers/llvm/14/lldb/procfs.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/source/Plugins/Process/Linux/Procfs.h -+++ b/source/Plugins/Process/Linux/Procfs.h -@@ -11,21 +11,12 @@ - // sys/procfs.h on Android/Linux for all supported architectures. - - #include -+#include - --#ifdef __ANDROID__ --#if defined(__arm64__) || defined(__aarch64__) --typedef unsigned long elf_greg_t; --typedef elf_greg_t -- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; --typedef struct user_fpsimd_state elf_fpregset_t; --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#elif defined(__mips__) --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#endif --#else // __ANDROID__ -+#if !defined(__GLIBC__) && defined(__powerpc__) -+#define pt_regs musl_pt_regs -+#include -+#undef pt_regs -+#else - #include --#endif // __ANDROID__ -+#endif diff --git a/pkgs/development/compilers/llvm/14/lldb/resource-dir.patch b/pkgs/development/compilers/llvm/14/lldb/resource-dir.patch deleted file mode 100644 index e0db80afeb9f..000000000000 --- a/pkgs/development/compilers/llvm/14/lldb/resource-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake -index 37364341ff8b..7f74c1a3e257 100644 ---- a/cmake/modules/LLDBConfig.cmake -+++ b/cmake/modules/LLDBConfig.cmake -@@ -257,7 +257,7 @@ if (NOT TARGET clang-resource-headers) - # Iterate over the possible places where the external resource directory - # could be and pick the first that exists. - foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}" -- "${LLVM_BUILD_LIBRARY_DIR}" -+ "${LLVM_BUILD_LIBRARY_DIR}" "@clangLibDir@" - "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}") - # Build the resource directory path by appending 'clang/'. - set(CANDIDATE_RESOURCE_DIR "${CANDIDATE}/clang/${LLDB_CLANG_RESOURCE_DIR_NAME}") diff --git a/pkgs/development/compilers/llvm/15/lldb/cpu_subtype_arm64e_replacement.patch b/pkgs/development/compilers/llvm/15/lldb/cpu_subtype_arm64e_replacement.patch deleted file mode 100644 index 20d35c9f3ea9..000000000000 --- a/pkgs/development/compilers/llvm/15/lldb/cpu_subtype_arm64e_replacement.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm ---- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm -+++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm -@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32, - len = sizeof(is_64_bit_capable); - ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0); - -- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) { -+ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers - // The arm64e architecture is a preview. Pretend the host architecture - // is arm64. - cpusubtype = CPU_SUBTYPE_ARM64_ALL; diff --git a/pkgs/development/compilers/llvm/15/lldb/resource-dir.patch b/pkgs/development/compilers/llvm/15/lldb/resource-dir.patch deleted file mode 100644 index e0db80afeb9f..000000000000 --- a/pkgs/development/compilers/llvm/15/lldb/resource-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake -index 37364341ff8b..7f74c1a3e257 100644 ---- a/cmake/modules/LLDBConfig.cmake -+++ b/cmake/modules/LLDBConfig.cmake -@@ -257,7 +257,7 @@ if (NOT TARGET clang-resource-headers) - # Iterate over the possible places where the external resource directory - # could be and pick the first that exists. - foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}" -- "${LLVM_BUILD_LIBRARY_DIR}" -+ "${LLVM_BUILD_LIBRARY_DIR}" "@clangLibDir@" - "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}") - # Build the resource directory path by appending 'clang/'. - set(CANDIDATE_RESOURCE_DIR "${CANDIDATE}/clang/${LLDB_CLANG_RESOURCE_DIR_NAME}") diff --git a/pkgs/development/compilers/llvm/16/lldb/cpu_subtype_arm64e_replacement.patch b/pkgs/development/compilers/llvm/16/lldb/cpu_subtype_arm64e_replacement.patch deleted file mode 100644 index 20d35c9f3ea9..000000000000 --- a/pkgs/development/compilers/llvm/16/lldb/cpu_subtype_arm64e_replacement.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm ---- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm -+++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm -@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32, - len = sizeof(is_64_bit_capable); - ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0); - -- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) { -+ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers - // The arm64e architecture is a preview. Pretend the host architecture - // is arm64. - cpusubtype = CPU_SUBTYPE_ARM64_ALL; diff --git a/pkgs/development/compilers/llvm/16/lldb/procfs.patch b/pkgs/development/compilers/llvm/16/lldb/procfs.patch deleted file mode 100644 index 7b200e86505c..000000000000 --- a/pkgs/development/compilers/llvm/16/lldb/procfs.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/source/Plugins/Process/Linux/Procfs.h -+++ b/source/Plugins/Process/Linux/Procfs.h -@@ -10,6 +10,13 @@ - // sys/procfs.h on Android/Linux for all supported architectures. - - #include -+#include -+ -+// on i686 preprocessor symbols with these register names are defined as -+// numeric constants; these symbols clash with identifier names used in -+// `llvm/Support/VirtualFileSystem.h` and `llvm/ADT/SmallVector.h` -+#undef FS -+#undef CS - - #include "lldb/lldb-types.h" - -@@ -17,23 +24,13 @@ - - #include - --#ifdef __ANDROID__ --#if defined(__arm64__) || defined(__aarch64__) --typedef unsigned long elf_greg_t; --typedef elf_greg_t -- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; --typedef struct user_fpsimd_state elf_fpregset_t; --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#elif defined(__mips__) --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#endif --#else // __ANDROID__ -+#if !defined(__GLIBC__) && defined(__powerpc__) -+#define pt_regs musl_pt_regs -+#include -+#undef pt_regs -+#else - #include --#endif // __ANDROID__ -+#endif - - namespace lldb_private { - namespace process_linux { diff --git a/pkgs/development/compilers/llvm/17/lldb/cpu_subtype_arm64e_replacement.patch b/pkgs/development/compilers/llvm/17/lldb/cpu_subtype_arm64e_replacement.patch deleted file mode 100644 index 20d35c9f3ea9..000000000000 --- a/pkgs/development/compilers/llvm/17/lldb/cpu_subtype_arm64e_replacement.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm ---- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm -+++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm -@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32, - len = sizeof(is_64_bit_capable); - ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0); - -- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) { -+ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers - // The arm64e architecture is a preview. Pretend the host architecture - // is arm64. - cpusubtype = CPU_SUBTYPE_ARM64_ALL; diff --git a/pkgs/development/compilers/llvm/17/lldb/procfs.patch b/pkgs/development/compilers/llvm/17/lldb/procfs.patch deleted file mode 100644 index 7b200e86505c..000000000000 --- a/pkgs/development/compilers/llvm/17/lldb/procfs.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/source/Plugins/Process/Linux/Procfs.h -+++ b/source/Plugins/Process/Linux/Procfs.h -@@ -10,6 +10,13 @@ - // sys/procfs.h on Android/Linux for all supported architectures. - - #include -+#include -+ -+// on i686 preprocessor symbols with these register names are defined as -+// numeric constants; these symbols clash with identifier names used in -+// `llvm/Support/VirtualFileSystem.h` and `llvm/ADT/SmallVector.h` -+#undef FS -+#undef CS - - #include "lldb/lldb-types.h" - -@@ -17,23 +24,13 @@ - - #include - --#ifdef __ANDROID__ --#if defined(__arm64__) || defined(__aarch64__) --typedef unsigned long elf_greg_t; --typedef elf_greg_t -- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; --typedef struct user_fpsimd_state elf_fpregset_t; --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#elif defined(__mips__) --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#endif --#else // __ANDROID__ -+#if !defined(__GLIBC__) && defined(__powerpc__) -+#define pt_regs musl_pt_regs -+#include -+#undef pt_regs -+#else - #include --#endif // __ANDROID__ -+#endif - - namespace lldb_private { - namespace process_linux { diff --git a/pkgs/development/compilers/llvm/18/lldb/cpu_subtype_arm64e_replacement.patch b/pkgs/development/compilers/llvm/18/lldb/cpu_subtype_arm64e_replacement.patch deleted file mode 100644 index 20d35c9f3ea9..000000000000 --- a/pkgs/development/compilers/llvm/18/lldb/cpu_subtype_arm64e_replacement.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm ---- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm -+++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm -@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32, - len = sizeof(is_64_bit_capable); - ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0); - -- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) { -+ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers - // The arm64e architecture is a preview. Pretend the host architecture - // is arm64. - cpusubtype = CPU_SUBTYPE_ARM64_ALL; diff --git a/pkgs/development/compilers/llvm/18/lldb/procfs.patch b/pkgs/development/compilers/llvm/18/lldb/procfs.patch deleted file mode 100644 index 7b200e86505c..000000000000 --- a/pkgs/development/compilers/llvm/18/lldb/procfs.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/source/Plugins/Process/Linux/Procfs.h -+++ b/source/Plugins/Process/Linux/Procfs.h -@@ -10,6 +10,13 @@ - // sys/procfs.h on Android/Linux for all supported architectures. - - #include -+#include -+ -+// on i686 preprocessor symbols with these register names are defined as -+// numeric constants; these symbols clash with identifier names used in -+// `llvm/Support/VirtualFileSystem.h` and `llvm/ADT/SmallVector.h` -+#undef FS -+#undef CS - - #include "lldb/lldb-types.h" - -@@ -17,23 +24,13 @@ - - #include - --#ifdef __ANDROID__ --#if defined(__arm64__) || defined(__aarch64__) --typedef unsigned long elf_greg_t; --typedef elf_greg_t -- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; --typedef struct user_fpsimd_state elf_fpregset_t; --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#elif defined(__mips__) --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#endif --#else // __ANDROID__ -+#if !defined(__GLIBC__) && defined(__powerpc__) -+#define pt_regs musl_pt_regs -+#include -+#undef pt_regs -+#else - #include --#endif // __ANDROID__ -+#endif - - namespace lldb_private { - namespace process_linux { diff --git a/pkgs/development/compilers/llvm/19/lldb/cpu_subtype_arm64e_replacement.patch b/pkgs/development/compilers/llvm/19/lldb/cpu_subtype_arm64e_replacement.patch deleted file mode 100644 index 20d35c9f3ea9..000000000000 --- a/pkgs/development/compilers/llvm/19/lldb/cpu_subtype_arm64e_replacement.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm ---- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm -+++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm -@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32, - len = sizeof(is_64_bit_capable); - ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0); - -- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) { -+ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers - // The arm64e architecture is a preview. Pretend the host architecture - // is arm64. - cpusubtype = CPU_SUBTYPE_ARM64_ALL; diff --git a/pkgs/development/compilers/llvm/19/lldb/procfs.patch b/pkgs/development/compilers/llvm/19/lldb/procfs.patch deleted file mode 100644 index 7b200e86505c..000000000000 --- a/pkgs/development/compilers/llvm/19/lldb/procfs.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/source/Plugins/Process/Linux/Procfs.h -+++ b/source/Plugins/Process/Linux/Procfs.h -@@ -10,6 +10,13 @@ - // sys/procfs.h on Android/Linux for all supported architectures. - - #include -+#include -+ -+// on i686 preprocessor symbols with these register names are defined as -+// numeric constants; these symbols clash with identifier names used in -+// `llvm/Support/VirtualFileSystem.h` and `llvm/ADT/SmallVector.h` -+#undef FS -+#undef CS - - #include "lldb/lldb-types.h" - -@@ -17,23 +24,13 @@ - - #include - --#ifdef __ANDROID__ --#if defined(__arm64__) || defined(__aarch64__) --typedef unsigned long elf_greg_t; --typedef elf_greg_t -- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; --typedef struct user_fpsimd_state elf_fpregset_t; --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#elif defined(__mips__) --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#endif --#else // __ANDROID__ -+#if !defined(__GLIBC__) && defined(__powerpc__) -+#define pt_regs musl_pt_regs -+#include -+#undef pt_regs -+#else - #include --#endif // __ANDROID__ -+#endif - - namespace lldb_private { - namespace process_linux { diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 4d72ded4d7be..04cf48e2574e 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -91,7 +91,7 @@ let && (p == "clang/purity.patch" || p == "libunwind/gnu-install-dirs.patch") then ../15/${p} - else if p == "compiler-rt/X86-support-extension.patch" then + else if p == "compiler-rt/X86-support-extension.patch" || p == "lldb/procfs.patch" then (if lib.versionAtLeast release_version "15" then ../15/${p} else ../12/${p}) else if lib.versionAtLeast release_version "13" @@ -102,7 +102,11 @@ let else if p == "compiler-rt/gnu-install-dirs.patch" && lib.versionAtLeast release_version "15" then (if lib.versionAtLeast release_version "15" then ../15/${p} else ../12/${p}) else if - (p == "compiler-rt/darwin-targetconditionals.patch" || p == "compiler-rt/codesign.patch") + ( + p == "compiler-rt/darwin-targetconditionals.patch" + || p == "compiler-rt/codesign.patch" + || p == "lldb/cpu_subtype_arm64e_replacement.patch" + ) && lib.versionAtLeast release_version "13" then ../13/${p} @@ -111,7 +115,10 @@ let && (p == "lld/add-table-base.patch" || p == "compiler-rt/normalize-var.patch") then ../16/${p} - else if lib.versionOlder release_version "16" && p == "compiler-rt/normalize-var.patch" then + else if + lib.versionOlder release_version "16" + && (p == "compiler-rt/normalize-var.patch" || p == "lldb/resource-dir.patch") + then ../12/${p} else if lib.versionOlder release_version "14" && p == "lld/gnu-install-dirs.patch" then ../12/${p} diff --git a/pkgs/development/compilers/llvm/git/lldb/cpu_subtype_arm64e_replacement.patch b/pkgs/development/compilers/llvm/git/lldb/cpu_subtype_arm64e_replacement.patch deleted file mode 100644 index 20d35c9f3ea9..000000000000 --- a/pkgs/development/compilers/llvm/git/lldb/cpu_subtype_arm64e_replacement.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm ---- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm -+++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm -@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32, - len = sizeof(is_64_bit_capable); - ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0); - -- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) { -+ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers - // The arm64e architecture is a preview. Pretend the host architecture - // is arm64. - cpusubtype = CPU_SUBTYPE_ARM64_ALL; diff --git a/pkgs/development/compilers/llvm/git/lldb/procfs.patch b/pkgs/development/compilers/llvm/git/lldb/procfs.patch deleted file mode 100644 index 7b200e86505c..000000000000 --- a/pkgs/development/compilers/llvm/git/lldb/procfs.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/source/Plugins/Process/Linux/Procfs.h -+++ b/source/Plugins/Process/Linux/Procfs.h -@@ -10,6 +10,13 @@ - // sys/procfs.h on Android/Linux for all supported architectures. - - #include -+#include -+ -+// on i686 preprocessor symbols with these register names are defined as -+// numeric constants; these symbols clash with identifier names used in -+// `llvm/Support/VirtualFileSystem.h` and `llvm/ADT/SmallVector.h` -+#undef FS -+#undef CS - - #include "lldb/lldb-types.h" - -@@ -17,23 +24,13 @@ - - #include - --#ifdef __ANDROID__ --#if defined(__arm64__) || defined(__aarch64__) --typedef unsigned long elf_greg_t; --typedef elf_greg_t -- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; --typedef struct user_fpsimd_state elf_fpregset_t; --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#elif defined(__mips__) --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#endif --#else // __ANDROID__ -+#if !defined(__GLIBC__) && defined(__powerpc__) -+#define pt_regs musl_pt_regs -+#include -+#undef pt_regs -+#else - #include --#endif // __ANDROID__ -+#endif - - namespace lldb_private { - namespace process_linux { From 7b4be56d9cc2df6d48a6a0bf6dd957b6f3a4c8bc Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 9 Aug 2024 13:30:24 -0700 Subject: [PATCH 057/357] llvmPackages_{13,15,16,17,18,19,git}.llvm: commonify patches --- .../llvm/13/llvm/gnu-install-dirs-polly.patch | 105 -------------- .../llvm/15/llvm/gnu-install-dirs-polly.patch | 19 --- .../llvm/16/llvm/gnu-install-dirs-polly.patch | 19 --- ...polly-lit-cfg-add-libs-to-dylib-path.patch | 24 --- .../llvm/17/llvm/gnu-install-dirs-polly.patch | 19 --- ...-script-runner-set-dyld-library-path.patch | 17 --- ...polly-lit-cfg-add-libs-to-dylib-path.patch | 24 --- .../llvm-lit-cfg-add-libs-to-dylib-path.patch | 80 ---------- ...polly-lit-cfg-add-libs-to-dylib-path.patch | 24 --- .../llvm/19/llvm/gnu-install-dirs-polly.patch | 13 -- .../llvm/19/llvm/gnu-install-dirs.patch | 137 ------------------ ...-script-runner-set-dyld-library-path.patch | 12 -- .../llvm-lit-cfg-add-libs-to-dylib-path.patch | 80 ---------- ...polly-lit-cfg-add-libs-to-dylib-path.patch | 24 --- .../compilers/llvm/common/default.nix | 34 ++++- .../git/llvm/gnu-install-dirs-polly.patch | 13 -- .../llvm/git/llvm/gnu-install-dirs.patch | 137 ------------------ ...-script-runner-set-dyld-library-path.patch | 12 -- .../llvm-lit-cfg-add-libs-to-dylib-path.patch | 80 ---------- ...polly-lit-cfg-add-libs-to-dylib-path.patch | 24 --- 20 files changed, 32 insertions(+), 865 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/13/llvm/gnu-install-dirs-polly.patch delete mode 100644 pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs-polly.patch delete mode 100644 pkgs/development/compilers/llvm/16/llvm/gnu-install-dirs-polly.patch delete mode 100644 pkgs/development/compilers/llvm/16/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch delete mode 100644 pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs-polly.patch delete mode 100644 pkgs/development/compilers/llvm/17/llvm/lit-shell-script-runner-set-dyld-library-path.patch delete mode 100644 pkgs/development/compilers/llvm/17/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch delete mode 100644 pkgs/development/compilers/llvm/18/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch delete mode 100644 pkgs/development/compilers/llvm/18/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch delete mode 100644 pkgs/development/compilers/llvm/19/llvm/gnu-install-dirs-polly.patch delete mode 100644 pkgs/development/compilers/llvm/19/llvm/gnu-install-dirs.patch delete mode 100644 pkgs/development/compilers/llvm/19/llvm/lit-shell-script-runner-set-dyld-library-path.patch delete mode 100644 pkgs/development/compilers/llvm/19/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch delete mode 100644 pkgs/development/compilers/llvm/19/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch delete mode 100644 pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch delete mode 100644 pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch delete mode 100644 pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch delete mode 100644 pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch delete mode 100644 pkgs/development/compilers/llvm/git/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch diff --git a/pkgs/development/compilers/llvm/13/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/13/llvm/gnu-install-dirs-polly.patch deleted file mode 100644 index 68f3c45396f6..000000000000 --- a/pkgs/development/compilers/llvm/13/llvm/gnu-install-dirs-polly.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt -index ca7c04c565bb..6ed5db5dd4f8 100644 ---- a/tools/polly/CMakeLists.txt -+++ b/tools/polly/CMakeLists.txt -@@ -2,7 +2,11 @@ - if (NOT DEFINED LLVM_MAIN_SRC_DIR) - project(Polly) - cmake_minimum_required(VERSION 3.13.4) -+endif() -+ -+include(GNUInstallDirs) - -+if (NOT DEFINED LLVM_MAIN_SRC_DIR) - # Where is LLVM installed? - find_package(LLVM CONFIG REQUIRED) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) -@@ -122,13 +126,13 @@ include_directories( - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - ) - - install(DIRECTORY ${POLLY_BINARY_DIR}/include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN "CMakeFiles" EXCLUDE -diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt -index 7cc129ba2e90..137be25e4b80 100644 ---- a/tools/polly/cmake/CMakeLists.txt -+++ b/tools/polly/cmake/CMakeLists.txt -@@ -79,18 +79,18 @@ file(GENERATE - - # Generate PollyConfig.cmake for the install tree. - unset(POLLY_EXPORTS) --set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") -+set(POLLY_INSTALL_PREFIX "") - set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") --set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") --set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") -+set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") -+set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - if (POLLY_BUNDLED_ISL) - set(POLLY_CONFIG_INCLUDE_DIRS -- "${POLLY_INSTALL_PREFIX}/include" -- "${POLLY_INSTALL_PREFIX}/include/polly" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" - ) - else() - set(POLLY_CONFIG_INCLUDE_DIRS -- "${POLLY_INSTALL_PREFIX}/include" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" - ${ISL_INCLUDE_DIRS} - ) - endif() -@@ -100,12 +100,12 @@ endif() - foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) - get_target_property(tgt_type ${tgt} TYPE) - if (tgt_type STREQUAL "EXECUTABLE") -- set(tgt_prefix "bin/") -+ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") - else() -- set(tgt_prefix "lib/") -+ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") - endif() - -- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$") -+ set(tgt_path "${tgt_prefix}$") - file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) - - if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") -diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake -index 518a09b45a42..bd9d6f5542ad 100644 ---- a/tools/polly/cmake/polly_macros.cmake -+++ b/tools/polly/cmake/polly_macros.cmake -@@ -44,8 +44,8 @@ macro(add_polly_library name) - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") - install(TARGETS ${name} - EXPORT LLVMExports -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endmacro(add_polly_library) -diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt -index 8991094d92c7..178d8ad606bb 100644 ---- a/tools/polly/lib/External/CMakeLists.txt -+++ b/tools/polly/lib/External/CMakeLists.txt -@@ -275,7 +275,7 @@ if (POLLY_BUNDLED_ISL) - install(DIRECTORY - ${ISL_SOURCE_DIR}/include/ - ${ISL_BINARY_DIR}/include/ -- DESTINATION include/polly -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly - FILES_MATCHING - PATTERN "*.h" - PATTERN "CMakeFiles" EXCLUDE diff --git a/pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs-polly.patch deleted file mode 100644 index b01363e98aa0..000000000000 --- a/pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs-polly.patch +++ /dev/null @@ -1,19 +0,0 @@ -This is the one remaining Polly install dirs related change that hasn't made it -into upstream yet; previously this patch file also included: -https://reviews.llvm.org/D117541 - -diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake -index 518a09b45a42..bd9d6f5542ad 100644 ---- a/tools/polly/cmake/polly_macros.cmake -+++ b/tools/polly/cmake/polly_macros.cmake -@@ -44,8 +44,8 @@ macro(add_polly_library name) - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") - install(TARGETS ${name} - EXPORT LLVMExports -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endmacro(add_polly_library) diff --git a/pkgs/development/compilers/llvm/16/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/16/llvm/gnu-install-dirs-polly.patch deleted file mode 100644 index b01363e98aa0..000000000000 --- a/pkgs/development/compilers/llvm/16/llvm/gnu-install-dirs-polly.patch +++ /dev/null @@ -1,19 +0,0 @@ -This is the one remaining Polly install dirs related change that hasn't made it -into upstream yet; previously this patch file also included: -https://reviews.llvm.org/D117541 - -diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake -index 518a09b45a42..bd9d6f5542ad 100644 ---- a/tools/polly/cmake/polly_macros.cmake -+++ b/tools/polly/cmake/polly_macros.cmake -@@ -44,8 +44,8 @@ macro(add_polly_library name) - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") - install(TARGETS ${name} - EXPORT LLVMExports -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endmacro(add_polly_library) diff --git a/pkgs/development/compilers/llvm/16/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/16/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch deleted file mode 100644 index 1354ad267314..000000000000 --- a/pkgs/development/compilers/llvm/16/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/tools/polly/test/lit.cfg b/tools/polly/test/lit.cfg -index 41e3a589c61e..09f3b17498b0 100644 ---- a/tools/polly/test/lit.cfg -+++ b/tools/polly/test/lit.cfg -@@ -36,9 +36,17 @@ base_paths = [config.llvm_tools_dir, config.environment['PATH']] - path = os.path.pathsep.join(base_paths + config.extra_paths) - config.environment['PATH'] = path - -+# (Copied from polly/test/Unit/lit.cfg) -+if platform.system() == 'Darwin': -+ shlibpath_var = 'DYLD_LIBRARY_PATH' -+elif platform.system() == 'Windows': -+ shlibpath_var = 'PATH' -+else: -+ shlibpath_var = 'LD_LIBRARY_PATH' -+ - path = os.path.pathsep.join((config.llvm_libs_dir, -- config.environment.get('LD_LIBRARY_PATH',''))) --config.environment['LD_LIBRARY_PATH'] = path -+ config.environment.get(shlibpath_var,''))) -+config.environment[shlibpath_var] = path - - llvm_config.use_default_substitutions() - diff --git a/pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs-polly.patch deleted file mode 100644 index b01363e98aa0..000000000000 --- a/pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs-polly.patch +++ /dev/null @@ -1,19 +0,0 @@ -This is the one remaining Polly install dirs related change that hasn't made it -into upstream yet; previously this patch file also included: -https://reviews.llvm.org/D117541 - -diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake -index 518a09b45a42..bd9d6f5542ad 100644 ---- a/tools/polly/cmake/polly_macros.cmake -+++ b/tools/polly/cmake/polly_macros.cmake -@@ -44,8 +44,8 @@ macro(add_polly_library name) - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") - install(TARGETS ${name} - EXPORT LLVMExports -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endmacro(add_polly_library) diff --git a/pkgs/development/compilers/llvm/17/llvm/lit-shell-script-runner-set-dyld-library-path.patch b/pkgs/development/compilers/llvm/17/llvm/lit-shell-script-runner-set-dyld-library-path.patch deleted file mode 100644 index 82b7b21c55fb..000000000000 --- a/pkgs/development/compilers/llvm/17/llvm/lit-shell-script-runner-set-dyld-library-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py -index 0242e0b75af3..d732011306f7 100644 ---- a/utils/lit/lit/TestRunner.py -+++ b/utils/lit/lit/TestRunner.py -@@ -1029,6 +1029,12 @@ def executeScript(test, litConfig, tmpBase, commands, cwd): - f.write('@echo off\n') - f.write('\n@if %ERRORLEVEL% NEQ 0 EXIT\n'.join(commands)) - else: -+ # This env var is *purged* when invoking subprocesses so we have to -+ # manually set it from within the bash script in order for the commands -+ # in run lines to see this var: -+ if "DYLD_LIBRARY_PATH" in test.config.environment: -+ f.write(f'export DYLD_LIBRARY_PATH="{test.config.environment["DYLD_LIBRARY_PATH"]}"\n') -+ - for i, ln in enumerate(commands): - match = re.match(kPdbgRegex, ln) - if match: diff --git a/pkgs/development/compilers/llvm/17/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/17/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch deleted file mode 100644 index 1354ad267314..000000000000 --- a/pkgs/development/compilers/llvm/17/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/tools/polly/test/lit.cfg b/tools/polly/test/lit.cfg -index 41e3a589c61e..09f3b17498b0 100644 ---- a/tools/polly/test/lit.cfg -+++ b/tools/polly/test/lit.cfg -@@ -36,9 +36,17 @@ base_paths = [config.llvm_tools_dir, config.environment['PATH']] - path = os.path.pathsep.join(base_paths + config.extra_paths) - config.environment['PATH'] = path - -+# (Copied from polly/test/Unit/lit.cfg) -+if platform.system() == 'Darwin': -+ shlibpath_var = 'DYLD_LIBRARY_PATH' -+elif platform.system() == 'Windows': -+ shlibpath_var = 'PATH' -+else: -+ shlibpath_var = 'LD_LIBRARY_PATH' -+ - path = os.path.pathsep.join((config.llvm_libs_dir, -- config.environment.get('LD_LIBRARY_PATH',''))) --config.environment['LD_LIBRARY_PATH'] = path -+ config.environment.get(shlibpath_var,''))) -+config.environment[shlibpath_var] = path - - llvm_config.use_default_substitutions() - diff --git a/pkgs/development/compilers/llvm/18/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/18/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch deleted file mode 100644 index d4ccb2ae9822..000000000000 --- a/pkgs/development/compilers/llvm/18/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/test/Unit/lit.cfg.py b/test/Unit/lit.cfg.py -index 81e8dc04acea..479ff95681e2 100644 ---- a/test/Unit/lit.cfg.py -+++ b/test/Unit/lit.cfg.py -@@ -3,6 +3,7 @@ - # Configuration file for the 'lit' test runner. - - import os -+import platform - import subprocess - - import lit.formats -@@ -55,3 +56,26 @@ if sys.platform in ["win32", "cygwin"] and os.path.isdir(config.shlibdir): - # Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate. - if sys.platform == "win32" and "SYSTEMDRIVE" in os.environ: - config.environment["SYSTEMDRIVE"] = os.environ["SYSTEMDRIVE"] -+ -+# Add the LLVM dynamic libs to the platform-specific loader search path env var: -+# -+# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. -+def find_shlibpath_var(): -+ if platform.system() in ["Linux", "FreeBSD", "NetBSD", "OpenBSD", "SunOS"]: -+ yield "LD_LIBRARY_PATH" -+ elif platform.system() == "Darwin": -+ yield "DYLD_LIBRARY_PATH" -+ elif platform.system() == "Windows": -+ yield "PATH" -+ elif platform.system() == "AIX": -+ yield "LIBPATH" -+ -+for shlibpath_var in find_shlibpath_var(): -+ shlibpath = os.path.pathsep.join( -+ (config.shlibdir, -+ config.environment.get(shlibpath_var, ''))) -+ config.environment[shlibpath_var] = shlibpath -+ break -+else: -+ lit_config.warning("unable to inject shared library path on '{}'" -+ .format(platform.system())) -diff --git a/test/lit.cfg.py b/test/lit.cfg.py -index 75a38b4c5dad..856fc75c9d74 100644 ---- a/test/lit.cfg.py -+++ b/test/lit.cfg.py -@@ -42,6 +42,26 @@ llvm_config.with_environment("PATH", config.llvm_tools_dir, append_path=True) - llvm_config.with_system_environment( - ["HOME", "INCLUDE", "LIB", "TMP", "TEMP"]) - -+# Add the LLVM dynamic libs to the platform-specific loader search path env var: -+# -+# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. -+def find_shlibpath_var(): -+ if platform.system() in ["Linux", "FreeBSD", "NetBSD", "OpenBSD", "SunOS"]: -+ yield "LD_LIBRARY_PATH" -+ elif platform.system() == "Darwin": -+ yield "DYLD_LIBRARY_PATH" -+ elif platform.system() == "Windows": -+ yield "PATH" -+ elif platform.system() == "AIX": -+ yield "LIBPATH" -+ -+for shlibpath_var in find_shlibpath_var(): -+ shlibpath = config.llvm_shlib_dir -+ llvm_config.with_environment(shlibpath_var, shlibpath, append_path = True) -+ break -+else: -+ lit_config.warning("unable to inject shared library path on '{}'" -+ .format(platform.system())) - - # Set up OCAMLPATH to include newly built OCaml libraries. - top_ocaml_lib = os.path.join(config.llvm_lib_dir, "ocaml") -@@ -318,7 +338,7 @@ def have_cxx_shared_library(): - - try: - readobj_cmd = subprocess.Popen( -- [readobj_exe, "--needed-libs", readobj_exe], stdout=subprocess.PIPE -+ [readobj_exe, "--needed-libs", readobj_exe], stdout=subprocess.PIPE, env=config.environment - ) - except OSError: - print("could not exec llvm-readobj") - diff --git a/pkgs/development/compilers/llvm/18/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/18/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch deleted file mode 100644 index 1354ad267314..000000000000 --- a/pkgs/development/compilers/llvm/18/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/tools/polly/test/lit.cfg b/tools/polly/test/lit.cfg -index 41e3a589c61e..09f3b17498b0 100644 ---- a/tools/polly/test/lit.cfg -+++ b/tools/polly/test/lit.cfg -@@ -36,9 +36,17 @@ base_paths = [config.llvm_tools_dir, config.environment['PATH']] - path = os.path.pathsep.join(base_paths + config.extra_paths) - config.environment['PATH'] = path - -+# (Copied from polly/test/Unit/lit.cfg) -+if platform.system() == 'Darwin': -+ shlibpath_var = 'DYLD_LIBRARY_PATH' -+elif platform.system() == 'Windows': -+ shlibpath_var = 'PATH' -+else: -+ shlibpath_var = 'LD_LIBRARY_PATH' -+ - path = os.path.pathsep.join((config.llvm_libs_dir, -- config.environment.get('LD_LIBRARY_PATH',''))) --config.environment['LD_LIBRARY_PATH'] = path -+ config.environment.get(shlibpath_var,''))) -+config.environment[shlibpath_var] = path - - llvm_config.use_default_substitutions() - diff --git a/pkgs/development/compilers/llvm/19/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/19/llvm/gnu-install-dirs-polly.patch deleted file mode 100644 index 6a359bdbefde..000000000000 --- a/pkgs/development/compilers/llvm/19/llvm/gnu-install-dirs-polly.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/tools/polly/cmake/polly_macros.cmake 2024-03-15 17:36:20.550893344 -0700 -+++ b/tools/polly/cmake/polly_macros.cmake 2024-03-15 17:37:06.277332960 -0700 -@@ -45,8 +45,8 @@ - install(TARGETS ${name} - COMPONENT ${name} - EXPORT LLVMExports -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - add_llvm_install_targets(install-${name} - COMPONENT ${name}) - endif() diff --git a/pkgs/development/compilers/llvm/19/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/19/llvm/gnu-install-dirs.patch deleted file mode 100644 index 8b89839490ba..000000000000 --- a/pkgs/development/compilers/llvm/19/llvm/gnu-install-dirs.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 471817d68286..c51463304159 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1010,7 +1010,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") - add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src - ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime) - install(TARGETS tf_xla_runtime EXPORT LLVMExports -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime) - # Once we add more modules, we should handle this more automatically. - if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL) -diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 230620c37027..dd16cab1835e 100644 ---- a/cmake/modules/AddLLVM.cmake -+++ b/cmake/modules/AddLLVM.cmake -@@ -876,8 +876,8 @@ macro(add_llvm_library name) - get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) - install(TARGETS ${name} - ${export_to_llvmexports} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) - - if (NOT LLVM_ENABLE_IDE) -@@ -2069,7 +2069,7 @@ function(llvm_install_library_symlink name dest type) - set(LLVM_LINK_OR_COPY copy) - endif() - -- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) -+ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - if(WIN32 AND "${type}" STREQUAL "SHARED") - set(output_dir "${CMAKE_INSTALL_BINDIR}") - endif() -@@ -2344,16 +2344,37 @@ function(llvm_setup_rpath name) - - if (APPLE) - set(_install_name_dir INSTALL_NAME_DIR "@rpath") -- set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -+ set(_install_rpath ${extra_libdir}) - elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS) - # $ORIGIN is not interpreted at link time by aix ld. - # Since BUILD_SHARED_LIBS is only recommended for use by developers, - # hardcode the rpath to build/install lib dir first in this mode. - # FIXME: update this when there is better solution. -- set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -+ set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) - elseif(UNIX) -- set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}") -+ # Note that we add `extra_libdir` (aka `LLVM_LIBRARY_DIR` in our case) back -+ # to `_install_rpath` here. -+ # -+ # In nixpkgs we do not build and install LLVM alongside rdeps of LLVM (i.e. -+ # clang); instead LLVM is its own package and thus lands at its own nix -+ # store path. This makes it so that the default relative rpath (`../lib/`) -+ # does not point at the LLVM shared objects. -+ # -+ # More discussion here: -+ # - https://github.com/NixOS/nixpkgs/pull/235624#discussion_r1220150329 -+ # - https://reviews.llvm.org/D146918 (16.0.5+) -+ # -+ # Note that we leave `extra_libdir` in `_build_rpath`: without FHS there is -+ # no potential that this will result in us pulling in the "wrong" LLVM. -+ # Adding this to the build rpath means we aren't forced to use -+ # `installCheckPhase` instead of `checkPhase` (i.e. binaries in the build -+ # dir, pre-install, will have the right rpath for LLVM). -+ # -+ # As noted in the differential above, an alternative solution is to have -+ # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set -+ # `CMAKE_INSTALL_RPATH`. -+ set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -+ set(_install_rpath ${extra_libdir}) - if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") - set_property(TARGET ${name} APPEND_STRING PROPERTY - LINK_FLAGS " -Wl,-z,origin ") -diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake -index 891c9e6d618c..8d963f3b0069 100644 ---- a/cmake/modules/AddOCaml.cmake -+++ b/cmake/modules/AddOCaml.cmake -@@ -147,9 +147,9 @@ function(add_ocaml_library name) - endforeach() - - if( APPLE ) -- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath ${LLVM_LIBRARY_DIR}) - elseif( UNIX ) -- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath ${LLVM_LIBRARY_DIR}) - endif() - list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") - -diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt -index d99af79aa38e..21e794224b99 100644 ---- a/cmake/modules/CMakeLists.txt -+++ b/cmake/modules/CMakeLists.txt -@@ -127,7 +127,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS - ) - list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS) - --extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}") -+extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") - set(LLVM_CONFIG_LIBRARY_DIRS - "${LLVM_CONFIG_LIBRARY_DIR}" - # FIXME: Should there be other entries here? -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index 370005cd8d7d..7e790bc52111 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -23,6 +23,7 @@ - #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" - #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" - #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" -+#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" - #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" - #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@" - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index e86eb2b44b10..f63e207e792e 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -366,7 +366,11 @@ int main(int argc, char **argv) { - sys::fs::make_absolute(ActivePrefix, Path); - ActiveBinDir = std::string(Path.str()); - } -- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; -+ { -+ SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX); -+ sys::fs::make_absolute(ActivePrefix, Path); -+ ActiveLibDir = std::string(Path.str()); -+ } - { - SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR); - sys::fs::make_absolute(ActivePrefix, Path); diff --git a/pkgs/development/compilers/llvm/19/llvm/lit-shell-script-runner-set-dyld-library-path.patch b/pkgs/development/compilers/llvm/19/llvm/lit-shell-script-runner-set-dyld-library-path.patch deleted file mode 100644 index e4f049f4b177..000000000000 --- a/pkgs/development/compilers/llvm/19/llvm/lit-shell-script-runner-set-dyld-library-path.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/utils/lit/lit/TestRunner.py 2024-03-15 17:27:53.170780798 -0700 -+++ b/utils/lit/lit/TestRunner.py 2024-03-15 17:28:43.277447791 -0700 -@@ -1183,6 +1183,9 @@ - f.write("@echo on\n") - f.write("\n@if %ERRORLEVEL% NEQ 0 EXIT\n".join(commands)) - else: -+ if "DYLD_LIBRARY_PATH" in test.config.environment: -+ f.write(f'export DYLD_LIBRARY_PATH="{test.config.environment["DYLD_LIBRARY_PATH"]}"\n') -+ - for i, ln in enumerate(commands): - match = re.fullmatch(kPdbgRegex, ln) - if match: diff --git a/pkgs/development/compilers/llvm/19/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/19/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch deleted file mode 100644 index d4ccb2ae9822..000000000000 --- a/pkgs/development/compilers/llvm/19/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/test/Unit/lit.cfg.py b/test/Unit/lit.cfg.py -index 81e8dc04acea..479ff95681e2 100644 ---- a/test/Unit/lit.cfg.py -+++ b/test/Unit/lit.cfg.py -@@ -3,6 +3,7 @@ - # Configuration file for the 'lit' test runner. - - import os -+import platform - import subprocess - - import lit.formats -@@ -55,3 +56,26 @@ if sys.platform in ["win32", "cygwin"] and os.path.isdir(config.shlibdir): - # Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate. - if sys.platform == "win32" and "SYSTEMDRIVE" in os.environ: - config.environment["SYSTEMDRIVE"] = os.environ["SYSTEMDRIVE"] -+ -+# Add the LLVM dynamic libs to the platform-specific loader search path env var: -+# -+# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. -+def find_shlibpath_var(): -+ if platform.system() in ["Linux", "FreeBSD", "NetBSD", "OpenBSD", "SunOS"]: -+ yield "LD_LIBRARY_PATH" -+ elif platform.system() == "Darwin": -+ yield "DYLD_LIBRARY_PATH" -+ elif platform.system() == "Windows": -+ yield "PATH" -+ elif platform.system() == "AIX": -+ yield "LIBPATH" -+ -+for shlibpath_var in find_shlibpath_var(): -+ shlibpath = os.path.pathsep.join( -+ (config.shlibdir, -+ config.environment.get(shlibpath_var, ''))) -+ config.environment[shlibpath_var] = shlibpath -+ break -+else: -+ lit_config.warning("unable to inject shared library path on '{}'" -+ .format(platform.system())) -diff --git a/test/lit.cfg.py b/test/lit.cfg.py -index 75a38b4c5dad..856fc75c9d74 100644 ---- a/test/lit.cfg.py -+++ b/test/lit.cfg.py -@@ -42,6 +42,26 @@ llvm_config.with_environment("PATH", config.llvm_tools_dir, append_path=True) - llvm_config.with_system_environment( - ["HOME", "INCLUDE", "LIB", "TMP", "TEMP"]) - -+# Add the LLVM dynamic libs to the platform-specific loader search path env var: -+# -+# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. -+def find_shlibpath_var(): -+ if platform.system() in ["Linux", "FreeBSD", "NetBSD", "OpenBSD", "SunOS"]: -+ yield "LD_LIBRARY_PATH" -+ elif platform.system() == "Darwin": -+ yield "DYLD_LIBRARY_PATH" -+ elif platform.system() == "Windows": -+ yield "PATH" -+ elif platform.system() == "AIX": -+ yield "LIBPATH" -+ -+for shlibpath_var in find_shlibpath_var(): -+ shlibpath = config.llvm_shlib_dir -+ llvm_config.with_environment(shlibpath_var, shlibpath, append_path = True) -+ break -+else: -+ lit_config.warning("unable to inject shared library path on '{}'" -+ .format(platform.system())) - - # Set up OCAMLPATH to include newly built OCaml libraries. - top_ocaml_lib = os.path.join(config.llvm_lib_dir, "ocaml") -@@ -318,7 +338,7 @@ def have_cxx_shared_library(): - - try: - readobj_cmd = subprocess.Popen( -- [readobj_exe, "--needed-libs", readobj_exe], stdout=subprocess.PIPE -+ [readobj_exe, "--needed-libs", readobj_exe], stdout=subprocess.PIPE, env=config.environment - ) - except OSError: - print("could not exec llvm-readobj") - diff --git a/pkgs/development/compilers/llvm/19/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/19/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch deleted file mode 100644 index 1354ad267314..000000000000 --- a/pkgs/development/compilers/llvm/19/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/tools/polly/test/lit.cfg b/tools/polly/test/lit.cfg -index 41e3a589c61e..09f3b17498b0 100644 ---- a/tools/polly/test/lit.cfg -+++ b/tools/polly/test/lit.cfg -@@ -36,9 +36,17 @@ base_paths = [config.llvm_tools_dir, config.environment['PATH']] - path = os.path.pathsep.join(base_paths + config.extra_paths) - config.environment['PATH'] = path - -+# (Copied from polly/test/Unit/lit.cfg) -+if platform.system() == 'Darwin': -+ shlibpath_var = 'DYLD_LIBRARY_PATH' -+elif platform.system() == 'Windows': -+ shlibpath_var = 'PATH' -+else: -+ shlibpath_var = 'LD_LIBRARY_PATH' -+ - path = os.path.pathsep.join((config.llvm_libs_dir, -- config.environment.get('LD_LIBRARY_PATH',''))) --config.environment['LD_LIBRARY_PATH'] = path -+ config.environment.get(shlibpath_var,''))) -+config.environment[shlibpath_var] = path - - llvm_config.use_default_substitutions() - diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 04cf48e2574e..b427e3bdf99e 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -82,13 +82,23 @@ let (if lib.versionAtLeast release_version "19" then ../19/${p} else ../12/${p}) else if lib.versionAtLeast release_version "18" - && (p == "clang/purity.patch" || p == "lld/gnu-install-dirs.patch") + && ( + p == "clang/purity.patch" + || p == "lld/gnu-install-dirs.patch" + || p == "llvm/gnu-install-dirs.patch" + || p == "llvm/gnu-install-dirs-polly.patch" + || p == "llvm/lit-shell-script-runner-set-dyld-library-path.patch" + ) then ../18/${p} else if lib.versionAtLeast release_version "15" && lib.versionOlder release_version "17" - && (p == "clang/purity.patch" || p == "libunwind/gnu-install-dirs.patch") + && ( + p == "clang/purity.patch" + || p == "libunwind/gnu-install-dirs.patch" + || p == "llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch" + ) then ../15/${p} else if p == "compiler-rt/X86-support-extension.patch" || p == "lldb/procfs.patch" then @@ -122,6 +132,26 @@ let ../12/${p} else if lib.versionOlder release_version "14" && p == "lld/gnu-install-dirs.patch" then ../12/${p} + else if + lib.versionAtLeast release_version "14" + && lib.versionOlder release_version "18" + && p == "llvm/gnu-install-dirs-polly.patch" + then + ../14/${p} + else if + lib.versionAtLeast release_version "16" + && lib.versionOlder release_version "18" + && p == "llvm/lit-shell-script-runner-set-dyld-library-path.patch" + then + ../16/${p} + else if + lib.versionAtLeast release_version "17" && p == "llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch" + then + ../17/${p} + else if + lib.versionAtLeast release_version "15" && p == "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch" + then + ../15/${p} else "${metadata.versionDir}/${p}"; }; diff --git a/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch deleted file mode 100644 index 6a359bdbefde..000000000000 --- a/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/tools/polly/cmake/polly_macros.cmake 2024-03-15 17:36:20.550893344 -0700 -+++ b/tools/polly/cmake/polly_macros.cmake 2024-03-15 17:37:06.277332960 -0700 -@@ -45,8 +45,8 @@ - install(TARGETS ${name} - COMPONENT ${name} - EXPORT LLVMExports -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - add_llvm_install_targets(install-${name} - COMPONENT ${name}) - endif() diff --git a/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch deleted file mode 100644 index 8b89839490ba..000000000000 --- a/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 471817d68286..c51463304159 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1010,7 +1010,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") - add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src - ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime) - install(TARGETS tf_xla_runtime EXPORT LLVMExports -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime) - # Once we add more modules, we should handle this more automatically. - if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL) -diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 230620c37027..dd16cab1835e 100644 ---- a/cmake/modules/AddLLVM.cmake -+++ b/cmake/modules/AddLLVM.cmake -@@ -876,8 +876,8 @@ macro(add_llvm_library name) - get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) - install(TARGETS ${name} - ${export_to_llvmexports} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) - - if (NOT LLVM_ENABLE_IDE) -@@ -2069,7 +2069,7 @@ function(llvm_install_library_symlink name dest type) - set(LLVM_LINK_OR_COPY copy) - endif() - -- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) -+ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - if(WIN32 AND "${type}" STREQUAL "SHARED") - set(output_dir "${CMAKE_INSTALL_BINDIR}") - endif() -@@ -2344,16 +2344,37 @@ function(llvm_setup_rpath name) - - if (APPLE) - set(_install_name_dir INSTALL_NAME_DIR "@rpath") -- set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -+ set(_install_rpath ${extra_libdir}) - elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS) - # $ORIGIN is not interpreted at link time by aix ld. - # Since BUILD_SHARED_LIBS is only recommended for use by developers, - # hardcode the rpath to build/install lib dir first in this mode. - # FIXME: update this when there is better solution. -- set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -+ set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) - elseif(UNIX) -- set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}") -+ # Note that we add `extra_libdir` (aka `LLVM_LIBRARY_DIR` in our case) back -+ # to `_install_rpath` here. -+ # -+ # In nixpkgs we do not build and install LLVM alongside rdeps of LLVM (i.e. -+ # clang); instead LLVM is its own package and thus lands at its own nix -+ # store path. This makes it so that the default relative rpath (`../lib/`) -+ # does not point at the LLVM shared objects. -+ # -+ # More discussion here: -+ # - https://github.com/NixOS/nixpkgs/pull/235624#discussion_r1220150329 -+ # - https://reviews.llvm.org/D146918 (16.0.5+) -+ # -+ # Note that we leave `extra_libdir` in `_build_rpath`: without FHS there is -+ # no potential that this will result in us pulling in the "wrong" LLVM. -+ # Adding this to the build rpath means we aren't forced to use -+ # `installCheckPhase` instead of `checkPhase` (i.e. binaries in the build -+ # dir, pre-install, will have the right rpath for LLVM). -+ # -+ # As noted in the differential above, an alternative solution is to have -+ # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set -+ # `CMAKE_INSTALL_RPATH`. -+ set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -+ set(_install_rpath ${extra_libdir}) - if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") - set_property(TARGET ${name} APPEND_STRING PROPERTY - LINK_FLAGS " -Wl,-z,origin ") -diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake -index 891c9e6d618c..8d963f3b0069 100644 ---- a/cmake/modules/AddOCaml.cmake -+++ b/cmake/modules/AddOCaml.cmake -@@ -147,9 +147,9 @@ function(add_ocaml_library name) - endforeach() - - if( APPLE ) -- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath ${LLVM_LIBRARY_DIR}) - elseif( UNIX ) -- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath ${LLVM_LIBRARY_DIR}) - endif() - list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") - -diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt -index d99af79aa38e..21e794224b99 100644 ---- a/cmake/modules/CMakeLists.txt -+++ b/cmake/modules/CMakeLists.txt -@@ -127,7 +127,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS - ) - list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS) - --extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}") -+extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") - set(LLVM_CONFIG_LIBRARY_DIRS - "${LLVM_CONFIG_LIBRARY_DIR}" - # FIXME: Should there be other entries here? -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index 370005cd8d7d..7e790bc52111 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -23,6 +23,7 @@ - #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" - #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" - #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" -+#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" - #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" - #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@" - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index e86eb2b44b10..f63e207e792e 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -366,7 +366,11 @@ int main(int argc, char **argv) { - sys::fs::make_absolute(ActivePrefix, Path); - ActiveBinDir = std::string(Path.str()); - } -- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; -+ { -+ SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX); -+ sys::fs::make_absolute(ActivePrefix, Path); -+ ActiveLibDir = std::string(Path.str()); -+ } - { - SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR); - sys::fs::make_absolute(ActivePrefix, Path); diff --git a/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch b/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch deleted file mode 100644 index e4f049f4b177..000000000000 --- a/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/utils/lit/lit/TestRunner.py 2024-03-15 17:27:53.170780798 -0700 -+++ b/utils/lit/lit/TestRunner.py 2024-03-15 17:28:43.277447791 -0700 -@@ -1183,6 +1183,9 @@ - f.write("@echo on\n") - f.write("\n@if %ERRORLEVEL% NEQ 0 EXIT\n".join(commands)) - else: -+ if "DYLD_LIBRARY_PATH" in test.config.environment: -+ f.write(f'export DYLD_LIBRARY_PATH="{test.config.environment["DYLD_LIBRARY_PATH"]}"\n') -+ - for i, ln in enumerate(commands): - match = re.fullmatch(kPdbgRegex, ln) - if match: diff --git a/pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch deleted file mode 100644 index d4ccb2ae9822..000000000000 --- a/pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/test/Unit/lit.cfg.py b/test/Unit/lit.cfg.py -index 81e8dc04acea..479ff95681e2 100644 ---- a/test/Unit/lit.cfg.py -+++ b/test/Unit/lit.cfg.py -@@ -3,6 +3,7 @@ - # Configuration file for the 'lit' test runner. - - import os -+import platform - import subprocess - - import lit.formats -@@ -55,3 +56,26 @@ if sys.platform in ["win32", "cygwin"] and os.path.isdir(config.shlibdir): - # Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate. - if sys.platform == "win32" and "SYSTEMDRIVE" in os.environ: - config.environment["SYSTEMDRIVE"] = os.environ["SYSTEMDRIVE"] -+ -+# Add the LLVM dynamic libs to the platform-specific loader search path env var: -+# -+# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. -+def find_shlibpath_var(): -+ if platform.system() in ["Linux", "FreeBSD", "NetBSD", "OpenBSD", "SunOS"]: -+ yield "LD_LIBRARY_PATH" -+ elif platform.system() == "Darwin": -+ yield "DYLD_LIBRARY_PATH" -+ elif platform.system() == "Windows": -+ yield "PATH" -+ elif platform.system() == "AIX": -+ yield "LIBPATH" -+ -+for shlibpath_var in find_shlibpath_var(): -+ shlibpath = os.path.pathsep.join( -+ (config.shlibdir, -+ config.environment.get(shlibpath_var, ''))) -+ config.environment[shlibpath_var] = shlibpath -+ break -+else: -+ lit_config.warning("unable to inject shared library path on '{}'" -+ .format(platform.system())) -diff --git a/test/lit.cfg.py b/test/lit.cfg.py -index 75a38b4c5dad..856fc75c9d74 100644 ---- a/test/lit.cfg.py -+++ b/test/lit.cfg.py -@@ -42,6 +42,26 @@ llvm_config.with_environment("PATH", config.llvm_tools_dir, append_path=True) - llvm_config.with_system_environment( - ["HOME", "INCLUDE", "LIB", "TMP", "TEMP"]) - -+# Add the LLVM dynamic libs to the platform-specific loader search path env var: -+# -+# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. -+def find_shlibpath_var(): -+ if platform.system() in ["Linux", "FreeBSD", "NetBSD", "OpenBSD", "SunOS"]: -+ yield "LD_LIBRARY_PATH" -+ elif platform.system() == "Darwin": -+ yield "DYLD_LIBRARY_PATH" -+ elif platform.system() == "Windows": -+ yield "PATH" -+ elif platform.system() == "AIX": -+ yield "LIBPATH" -+ -+for shlibpath_var in find_shlibpath_var(): -+ shlibpath = config.llvm_shlib_dir -+ llvm_config.with_environment(shlibpath_var, shlibpath, append_path = True) -+ break -+else: -+ lit_config.warning("unable to inject shared library path on '{}'" -+ .format(platform.system())) - - # Set up OCAMLPATH to include newly built OCaml libraries. - top_ocaml_lib = os.path.join(config.llvm_lib_dir, "ocaml") -@@ -318,7 +338,7 @@ def have_cxx_shared_library(): - - try: - readobj_cmd = subprocess.Popen( -- [readobj_exe, "--needed-libs", readobj_exe], stdout=subprocess.PIPE -+ [readobj_exe, "--needed-libs", readobj_exe], stdout=subprocess.PIPE, env=config.environment - ) - except OSError: - print("could not exec llvm-readobj") - diff --git a/pkgs/development/compilers/llvm/git/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/git/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch deleted file mode 100644 index 1354ad267314..000000000000 --- a/pkgs/development/compilers/llvm/git/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/tools/polly/test/lit.cfg b/tools/polly/test/lit.cfg -index 41e3a589c61e..09f3b17498b0 100644 ---- a/tools/polly/test/lit.cfg -+++ b/tools/polly/test/lit.cfg -@@ -36,9 +36,17 @@ base_paths = [config.llvm_tools_dir, config.environment['PATH']] - path = os.path.pathsep.join(base_paths + config.extra_paths) - config.environment['PATH'] = path - -+# (Copied from polly/test/Unit/lit.cfg) -+if platform.system() == 'Darwin': -+ shlibpath_var = 'DYLD_LIBRARY_PATH' -+elif platform.system() == 'Windows': -+ shlibpath_var = 'PATH' -+else: -+ shlibpath_var = 'LD_LIBRARY_PATH' -+ - path = os.path.pathsep.join((config.llvm_libs_dir, -- config.environment.get('LD_LIBRARY_PATH',''))) --config.environment['LD_LIBRARY_PATH'] = path -+ config.environment.get(shlibpath_var,''))) -+config.environment[shlibpath_var] = path - - llvm_config.use_default_substitutions() - From 76f48d38f820c7af8516d039d70a8ddb131d928e Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 9 Aug 2024 13:37:58 -0700 Subject: [PATCH 058/357] llvmPackages_{15,17,18,19,git}.openmp: commonify patches --- .../llvm/15/openmp/run-lit-directly.patch | 12 ---------- .../llvm/17/openmp/run-lit-directly.patch | 0 .../llvm/18/openmp/fix-find-tool.patch | 17 ------------- .../llvm/18/openmp/run-lit-directly.patch | 0 .../llvm/19/openmp/fix-find-tool.patch | 17 ------------- .../llvm/19/openmp/run-lit-directly.patch | 0 .../compilers/llvm/common/default.nix | 24 ++++++++++++++----- .../llvm/git/openmp/fix-find-tool.patch | 17 ------------- .../llvm/git/openmp/run-lit-directly.patch | 0 9 files changed, 18 insertions(+), 69 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/15/openmp/run-lit-directly.patch delete mode 100644 pkgs/development/compilers/llvm/17/openmp/run-lit-directly.patch delete mode 100644 pkgs/development/compilers/llvm/18/openmp/fix-find-tool.patch delete mode 100644 pkgs/development/compilers/llvm/18/openmp/run-lit-directly.patch delete mode 100644 pkgs/development/compilers/llvm/19/openmp/fix-find-tool.patch delete mode 100644 pkgs/development/compilers/llvm/19/openmp/run-lit-directly.patch delete mode 100644 pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch delete mode 100644 pkgs/development/compilers/llvm/git/openmp/run-lit-directly.patch diff --git a/pkgs/development/compilers/llvm/15/openmp/run-lit-directly.patch b/pkgs/development/compilers/llvm/15/openmp/run-lit-directly.patch deleted file mode 100644 index 1e952fdc36a8..000000000000 --- a/pkgs/development/compilers/llvm/15/openmp/run-lit-directly.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/OpenMPTesting.cmake b/cmake/OpenMPTesting.cmake ---- a/cmake/OpenMPTesting.cmake -+++ b/cmake/OpenMPTesting.cmake -@@ -185,7 +185,7 @@ function(add_openmp_testsuite target comment) - if (${OPENMP_STANDALONE_BUILD}) - set(LIT_ARGS ${OPENMP_LIT_ARGS} ${ARG_ARGS}) - add_custom_target(${target} -- COMMAND ${PYTHON_EXECUTABLE} ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} -+ COMMAND ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} - COMMENT ${comment} - DEPENDS ${ARG_DEPENDS} - USES_TERMINAL diff --git a/pkgs/development/compilers/llvm/17/openmp/run-lit-directly.patch b/pkgs/development/compilers/llvm/17/openmp/run-lit-directly.patch deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkgs/development/compilers/llvm/18/openmp/fix-find-tool.patch b/pkgs/development/compilers/llvm/18/openmp/fix-find-tool.patch deleted file mode 100644 index b7f51196f7ba..000000000000 --- a/pkgs/development/compilers/llvm/18/openmp/fix-find-tool.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt -index 630947abec7e..9f032dc7bd3f 100644 ---- a/libomptarget/DeviceRTL/CMakeLists.txt -+++ b/libomptarget/DeviceRTL/CMakeLists.txt -@@ -27,10 +27,10 @@ endif() - if (LLVM_DIR) - # Builds that use pre-installed LLVM have LLVM_DIR set. - # A standalone or LLVM_ENABLE_RUNTIMES=openmp build takes this route -- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR}) - find_program(PACKAGER_TOOL clang-offload-packager PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) - find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR}) - if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL) OR (NOT PACKAGER_TOOL)) - libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL}, opt: ${OPT_TOOL}, or clang-offload-packager: ${PACKAGER_TOOL}") - return() diff --git a/pkgs/development/compilers/llvm/18/openmp/run-lit-directly.patch b/pkgs/development/compilers/llvm/18/openmp/run-lit-directly.patch deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkgs/development/compilers/llvm/19/openmp/fix-find-tool.patch b/pkgs/development/compilers/llvm/19/openmp/fix-find-tool.patch deleted file mode 100644 index b7f51196f7ba..000000000000 --- a/pkgs/development/compilers/llvm/19/openmp/fix-find-tool.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt -index 630947abec7e..9f032dc7bd3f 100644 ---- a/libomptarget/DeviceRTL/CMakeLists.txt -+++ b/libomptarget/DeviceRTL/CMakeLists.txt -@@ -27,10 +27,10 @@ endif() - if (LLVM_DIR) - # Builds that use pre-installed LLVM have LLVM_DIR set. - # A standalone or LLVM_ENABLE_RUNTIMES=openmp build takes this route -- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR}) - find_program(PACKAGER_TOOL clang-offload-packager PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) - find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR}) - if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL) OR (NOT PACKAGER_TOOL)) - libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL}, opt: ${OPT_TOOL}, or clang-offload-packager: ${PACKAGER_TOOL}") - return() diff --git a/pkgs/development/compilers/llvm/19/openmp/run-lit-directly.patch b/pkgs/development/compilers/llvm/19/openmp/run-lit-directly.patch deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index b427e3bdf99e..53afeda12c64 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -122,7 +122,11 @@ let ../13/${p} else if lib.versionAtLeast release_version "16" - && (p == "lld/add-table-base.patch" || p == "compiler-rt/normalize-var.patch") + && ( + p == "lld/add-table-base.patch" + || p == "compiler-rt/normalize-var.patch" + || p == "openmp/run-lit-directly.patch" + ) then ../16/${p} else if @@ -134,18 +138,26 @@ let ../12/${p} else if lib.versionAtLeast release_version "14" - && lib.versionOlder release_version "18" - && p == "llvm/gnu-install-dirs-polly.patch" + && ( + (lib.versionOlder release_version "18" && p == "llvm/gnu-install-dirs-polly.patch") + || (lib.versionOlder release_version "16" && p == "openmp/run-lit-directly.patch") + ) then ../14/${p} else if lib.versionAtLeast release_version "16" - && lib.versionOlder release_version "18" - && p == "llvm/lit-shell-script-runner-set-dyld-library-path.patch" + && ( + ( + lib.versionOlder release_version "18" + && p == "llvm/lit-shell-script-runner-set-dyld-library-path.patch" + ) + || p == "openmp/run-lit-directly.patch" + ) then ../16/${p} else if - lib.versionAtLeast release_version "17" && p == "llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch" + lib.versionAtLeast release_version "17" + && (p == "llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch" || p == "openmp/fix-find-tool.patch") then ../17/${p} else if diff --git a/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch b/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch deleted file mode 100644 index b7f51196f7ba..000000000000 --- a/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt -index 630947abec7e..9f032dc7bd3f 100644 ---- a/libomptarget/DeviceRTL/CMakeLists.txt -+++ b/libomptarget/DeviceRTL/CMakeLists.txt -@@ -27,10 +27,10 @@ endif() - if (LLVM_DIR) - # Builds that use pre-installed LLVM have LLVM_DIR set. - # A standalone or LLVM_ENABLE_RUNTIMES=openmp build takes this route -- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR}) - find_program(PACKAGER_TOOL clang-offload-packager PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) - find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR}) - if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL) OR (NOT PACKAGER_TOOL)) - libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL}, opt: ${OPT_TOOL}, or clang-offload-packager: ${PACKAGER_TOOL}") - return() diff --git a/pkgs/development/compilers/llvm/git/openmp/run-lit-directly.patch b/pkgs/development/compilers/llvm/git/openmp/run-lit-directly.patch deleted file mode 100644 index e69de29bb2d1..000000000000 From 4fb416db89838901d699abf9d634d7c6365d3c4f Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 9 Aug 2024 13:40:39 -0700 Subject: [PATCH 059/357] llvmPackages_{19,git}.libcxx: commonify patches --- .../0001-darwin-10.12-mbstate_t-fix.patch | 31 ------------------- .../compilers/llvm/common/default.nix | 16 +++++----- .../0001-darwin-10.12-mbstate_t-fix.patch | 31 ------------------- 3 files changed, 8 insertions(+), 70 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/19/libcxx/0001-darwin-10.12-mbstate_t-fix.patch delete mode 100644 pkgs/development/compilers/llvm/git/libcxx/0001-darwin-10.12-mbstate_t-fix.patch diff --git a/pkgs/development/compilers/llvm/19/libcxx/0001-darwin-10.12-mbstate_t-fix.patch b/pkgs/development/compilers/llvm/19/libcxx/0001-darwin-10.12-mbstate_t-fix.patch deleted file mode 100644 index 29942f8ed03d..000000000000 --- a/pkgs/development/compilers/llvm/19/libcxx/0001-darwin-10.12-mbstate_t-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9c1cb26c1dd3f92d1c1177e548107d2cd3c5e616 Mon Sep 17 00:00:00 2001 -From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> -Date: Fri, 23 Feb 2024 22:58:58 +0000 -Subject: [PATCH] darwin 10.12 mbstate_t fix - -https://github.com/llvm/llvm-project/issues/64226 - -removes space from -https://github.com/macports/macports-ports/raw/acd8acb171f1658596ed1cf25da48d5b932e2d19/lang/llvm-17/files/0042-mbstate_t-not-defined.patch -so it applies cleanly ---- - libcxx/include/__mbstate_t.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/libcxx/include/__mbstate_t.h b/libcxx/include/__mbstate_t.h -index bfa6d61..5f51112 100644 ---- a/libcxx/include/__mbstate_t.h -+++ b/libcxx/include/__mbstate_t.h -@@ -42,6 +42,9 @@ - #elif __has_include() - # include // works on most Unixes - #elif __has_include() -+# if __has_include() -+# include -+# endif - # include // works on Darwin - #elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next() - # include_next // fall back to the C standard provider of mbstate_t --- -2.43.0 - diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 53afeda12c64..6ae37502d47b 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -88,6 +88,7 @@ let || p == "llvm/gnu-install-dirs.patch" || p == "llvm/gnu-install-dirs-polly.patch" || p == "llvm/lit-shell-script-runner-set-dyld-library-path.patch" + || p == "libcxx/0001-darwin-10.12-mbstate_t-fix.patch" ) then ../18/${p} @@ -131,7 +132,11 @@ let ../16/${p} else if lib.versionOlder release_version "16" - && (p == "compiler-rt/normalize-var.patch" || p == "lldb/resource-dir.patch") + && ( + p == "compiler-rt/normalize-var.patch" + || p == "lldb/resource-dir.patch" + || p == "clang/purity.patch" + ) then ../12/${p} else if lib.versionOlder release_version "14" && p == "lld/gnu-install-dirs.patch" then @@ -146,13 +151,8 @@ let ../14/${p} else if lib.versionAtLeast release_version "16" - && ( - ( - lib.versionOlder release_version "18" - && p == "llvm/lit-shell-script-runner-set-dyld-library-path.patch" - ) - || p == "openmp/run-lit-directly.patch" - ) + && lib.versionOlder release_version "18" + && p == "llvm/lit-shell-script-runner-set-dyld-library-path.patch" then ../16/${p} else if diff --git a/pkgs/development/compilers/llvm/git/libcxx/0001-darwin-10.12-mbstate_t-fix.patch b/pkgs/development/compilers/llvm/git/libcxx/0001-darwin-10.12-mbstate_t-fix.patch deleted file mode 100644 index 29942f8ed03d..000000000000 --- a/pkgs/development/compilers/llvm/git/libcxx/0001-darwin-10.12-mbstate_t-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9c1cb26c1dd3f92d1c1177e548107d2cd3c5e616 Mon Sep 17 00:00:00 2001 -From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> -Date: Fri, 23 Feb 2024 22:58:58 +0000 -Subject: [PATCH] darwin 10.12 mbstate_t fix - -https://github.com/llvm/llvm-project/issues/64226 - -removes space from -https://github.com/macports/macports-ports/raw/acd8acb171f1658596ed1cf25da48d5b932e2d19/lang/llvm-17/files/0042-mbstate_t-not-defined.patch -so it applies cleanly ---- - libcxx/include/__mbstate_t.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/libcxx/include/__mbstate_t.h b/libcxx/include/__mbstate_t.h -index bfa6d61..5f51112 100644 ---- a/libcxx/include/__mbstate_t.h -+++ b/libcxx/include/__mbstate_t.h -@@ -42,6 +42,9 @@ - #elif __has_include() - # include // works on most Unixes - #elif __has_include() -+# if __has_include() -+# include -+# endif - # include // works on Darwin - #elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next() - # include_next // fall back to the C standard provider of mbstate_t --- -2.43.0 - From f9c6960071badc3ca6f33feea4ce8493ef36bbda Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 9 Aug 2024 15:20:52 -0700 Subject: [PATCH 060/357] swift: use clang 12 purity patch LLVM 14's clang purity patch was removed as it is a duplicate of 12's. --- pkgs/development/compilers/swift/compiler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 2b2f636feef6..31cbd298603a 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -304,7 +304,7 @@ in stdenv.mkDerivation { patch -p1 -d llvm-project/clang -i ${./patches/clang-toolchain-dir.patch} patch -p1 -d llvm-project/clang -i ${./patches/clang-wrap.patch} - patch -p1 -d llvm-project/clang -i ${../../llvm/14/clang/purity.patch} + patch -p1 -d llvm-project/clang -i ${../../llvm/12/clang/purity.patch} patch -p2 -d llvm-project/clang -i ${fetchpatch { name = "clang-cmake-fix-interpreter.patch"; url = "https://github.com/llvm/llvm-project/commit/b5eaf500f2441eff2277ea2973878fb1f171fd0a.patch"; From 13a5c653b61e95df55fcd4299c62d40cb9a01552 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sat, 10 Aug 2024 12:30:09 +1000 Subject: [PATCH 061/357] cewler: release retagged by upstream --- pkgs/by-name/ce/cewler/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ce/cewler/package.nix b/pkgs/by-name/ce/cewler/package.nix index d0a4a2b15dea..f4f96039b9f6 100644 --- a/pkgs/by-name/ce/cewler/package.nix +++ b/pkgs/by-name/ce/cewler/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "roys"; repo = "cewler"; rev = "v${version}"; - hash = "sha256-nlF+B7Z1GRo3ZrGhG58c0vLcJAW+PvXT2tfFoyElw7w="; + hash = "sha256-lVI3p6YMugQ3yKHFNxISmUY7XZMuX/TXvVUoZfIeJog="; }; nativeBuildInputs = with python3.pkgs; [ From 38b3245901c5dff170a05214334f5243a9eac370 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Aug 2024 06:37:53 +0000 Subject: [PATCH 062/357] jitsi-videobridge: 2.3-149-g793df5a9 -> 2.3-160-g97a1f15b --- pkgs/servers/jitsi-videobridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 4e258192c886..7a78a1cf3eff 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.3-149-g793df5a9"; + version = "2.3-160-g97a1f15b"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "NI38XuBWSf+JoPCzAAd7Bma3PjprPw8CnE0W4VlqaVM="; + sha256 = "fxAmpsScNTwSrITZYE2dsKTlGqlMcAAf8RVixpmcqvI="; }; in stdenv.mkDerivation { From 1817b508705e43c4d7bc55eaaeead838ac9a2d79 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Wed, 7 Aug 2024 22:43:54 +0200 Subject: [PATCH 063/357] fastddsgen: add missing C preprocessor dependency to wrapper fastddsgen internally calls 'cpp' (the C preprocessor) to resolve include directives, include guards, etc. See https://github.com/eProsima/Fast-DDS-Gen/blob/541129f6e7365b6b789fd2d41fa6efd94503a6b4/src/main/java/com/eprosima/fastdds/fastddsgen.java#L1423 Make 'cpp' available from the fastddsgen wrapper script. Use the unwrapped 'cpp', because the wrapped one passes additional parameters, which make the produced output incompatible with fastddsgen (string out of bounds exception). Fixes the error when using IDL files with includes: ``` Processing the file build/foo.idl... ERROR: Cannot generate the files begin -3, end 1, length 1 java.lang.StringIndexOutOfBoundsException: begin -3, end 1, length 1 at java.base/java.lang.String.checkBoundsBeginEnd(String.java:4602) at java.base/java.lang.String.substring(String.java:2705) at com.eprosima.idl.context.Context.processPreprocessorLine(Context.java:955) at com.eprosima.idl.parser.grammar.IDLLexer.PREPROC_DIRECTIVE_action(IDLLexer.java:223) at com.eprosima.idl.parser.grammar.IDLLexer.action(IDLLexer.java:215) at org.antlr.v4.runtime.atn.LexerCustomAction.execute(LexerCustomAction.java:97) at org.antlr.v4.runtime.atn.LexerActionExecutor.execute(LexerActionExecutor.java:168) at org.antlr.v4.runtime.atn.LexerATNSimulator.accept(LexerATNSimulator.java:366) at org.antlr.v4.runtime.atn.LexerATNSimulator.failOrAccept(LexerATNSimulator.java:299) at org.antlr.v4.runtime.atn.LexerATNSimulator.execATN(LexerATNSimulator.java:230) at org.antlr.v4.runtime.atn.LexerATNSimulator.match(LexerATNSimulator.java:114) at org.antlr.v4.runtime.Lexer.nextToken(Lexer.java:141) at org.antlr.v4.runtime.BufferedTokenStream.fetch(BufferedTokenStream.java:169) at org.antlr.v4.runtime.BufferedTokenStream.sync(BufferedTokenStream.java:152) at org.antlr.v4.runtime.BufferedTokenStream.setup(BufferedTokenStream.java:254) at org.antlr.v4.runtime.BufferedTokenStream.lazyInit(BufferedTokenStream.java:249) at org.antlr.v4.runtime.CommonTokenStream.LT(CommonTokenStream.java:92) at org.antlr.v4.runtime.Parser.enterRule(Parser.java:628) at com.eprosima.idl.parser.grammar.IDLParser.specification(IDLParser.java:304) at com.eprosima.fastdds.fastddsgen.parseIDL(fastddsgen.java:809) at com.eprosima.fastdds.fastddsgen.process(fastddsgen.java:640) at com.eprosima.fastdds.fastddsgen.execute(fastddsgen.java:458) at com.eprosima.fastdds.fastddsgen.main(fastddsgen.java:1581) ``` --- pkgs/development/tools/fastddsgen/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/development/tools/fastddsgen/default.nix index 1a38ca3050ce..8d1110334f45 100644 --- a/pkgs/development/tools/fastddsgen/default.nix +++ b/pkgs/development/tools/fastddsgen/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, runtimeShell, fetchFromGitHub, gradle_7, openjdk17 }: +{ lib +, stdenv +, makeWrapper +, fetchFromGitHub +, gradle_7 +, openjdk17 +}: + let pname = "fastddsgen"; version = "3.3.0"; @@ -17,7 +24,11 @@ stdenv.mkDerivation { hash = "sha256-oqbSIzsYUwD8bTqGKZ9he9d18EDq9mHZFoNUp0RK0qU="; }; - nativeBuildInputs = [ gradle openjdk17 ]; + nativeBuildInputs = [ + gradle + openjdk17 + makeWrapper + ]; mitmCache = gradle.fetchDeps { inherit pname; @@ -33,12 +44,12 @@ stdenv.mkDerivation { gradle install --install_path=$out - # Override the default start script to use absolute java path - cat <$out/bin/fastddsgen - #!${runtimeShell} - exec ${openjdk17}/bin/java -jar "$out/share/fastddsgen/java/fastddsgen.jar" "\$@" - EOF - chmod a+x "$out/bin/fastddsgen" + # Override the default start script to use absolute java path. + # Make the unwrapped "cpp" available in the path, since the wrapped "cpp" + # passes additional flags and produces output incompatible with fastddsgen. + makeWrapper ${openjdk17}/bin/java $out/bin/fastddsgen \ + --add-flags "-jar $out/share/fastddsgen/java/fastddsgen.jar" \ + --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc ]} runHook postInstall ''; From 9b82f8625b87f4485a4df8d404c7844bc655a86f Mon Sep 17 00:00:00 2001 From: David Cox Date: Fri, 9 Aug 2024 16:19:53 -0700 Subject: [PATCH 064/357] 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 065/357] 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 066/357] 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 067/357] 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 068/357] 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 069/357] 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 070/357] 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 071/357] 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 072/357] 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 073/357] 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 074/357] 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 075/357] 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 076/357] 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 396badef6fac3ed50af0a144e0179a0f883521f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 09:39:28 +0000 Subject: [PATCH 077/357] buf: 1.34.0 -> 1.36.0 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index be6c65faec9b..8c54682ca676 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.34.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-a2OuxstfZcN49CLn4Tk6DeCXUKZOrMQ7pNDicmNxVRA="; + hash = "sha256-Y3rcp/bSbPHCocq1gy9ytzwF10+vOUMX4hBAw4dJpHI="; }; - vendorHash = "sha256-rAuFXXoC0zp/n+2Ogxrj7Ji3wpQ45XloOs7nI8K41eo="; + vendorHash = "sha256-TrAisrKBM8beccya0o8WO4AatKsPiXzeR46213ZBi38="; patches = [ # Skip a test that requires networking to be available to work. From 713b076c47eecc026d631d8c5937df07d7c03575 Mon Sep 17 00:00:00 2001 From: Owen Shepherd Date: Mon, 12 Aug 2024 22:40:47 +0100 Subject: [PATCH 078/357] c3c: fix source hash In 842a15bf096f, c3c was updated to version 0.6.1, but the source hash wasn't changed, the upshot of which seems to be that users with access to a cache get the old version, and users that don't get sha mismatches. --- pkgs/development/compilers/c3c/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix index cbaac08ba6c8..6187b75cc874 100644 --- a/pkgs/development/compilers/c3c/default.nix +++ b/pkgs/development/compilers/c3c/default.nix @@ -19,7 +19,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { owner = "c3lang"; repo = "c3c"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-iOljE1BRVc92NJZj+nr1G6KkBTCwJEUOadXHUDNoPGk="; + hash = "sha256-PKeQOVByNvhUq7QBhnNsl3LfR48MWhRC2rhiD58fVHY="; }; postPatch = '' From f67d395af8b7e5f3293a5d4e0aed73c13d0ab850 Mon Sep 17 00:00:00 2001 From: oddlama Date: Sun, 10 Mar 2024 17:43:09 +0100 Subject: [PATCH 079/357] kanidm-provision: init at 1.1.0 --- pkgs/by-name/ka/kanidm-provision/package.nix | 29 ++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/by-name/ka/kanidm-provision/package.nix diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix new file mode 100644 index 000000000000..47ccb70f86f6 --- /dev/null +++ b/pkgs/by-name/ka/kanidm-provision/package.nix @@ -0,0 +1,29 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage rec { + pname = "kanidm-provision"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "oddlama"; + repo = "kanidm-provision"; + rev = "v${version}"; + hash = "sha256-tX24cszmWu7kB5Eoa3OrPqU1bayD62OpAV12U0ayoEo="; + }; + + cargoHash = "sha256-Ok8A47z5Z3QW4teql/4RyDlox/nrhkdA6IN/qJm13bM="; + + meta = with lib; { + description = "A small utility to help with kanidm provisioning"; + homepage = "https://github.com/oddlama/kanidm-provision"; + license = with licenses; [ + asl20 + mit + ]; + maintainers = with maintainers; [ oddlama ]; + mainProgram = "kanidm-provision"; + }; +} From 59a463f5935c2dc34d2ebbe9fef6df5d91ddd7f3 Mon Sep 17 00:00:00 2001 From: oddlama Date: Sun, 10 Mar 2024 19:03:53 +0100 Subject: [PATCH 080/357] kanidm: add optional secret provisioning patches --- pkgs/by-name/ka/kanidm/package.nix | 15 + .../patches/oauth2-basic-secret-modify.patch | 303 ++++++++++++++++++ .../ka/kanidm/patches/recover-account.patch | 173 ++++++++++ 3 files changed, 491 insertions(+) create mode 100644 pkgs/by-name/ka/kanidm/patches/oauth2-basic-secret-modify.patch create mode 100644 pkgs/by-name/ka/kanidm/patches/recover-account.patch diff --git a/pkgs/by-name/ka/kanidm/package.nix b/pkgs/by-name/ka/kanidm/package.nix index febfec0c16f9..cc80eb99ada3 100644 --- a/pkgs/by-name/ka/kanidm/package.nix +++ b/pkgs/by-name/ka/kanidm/package.nix @@ -13,6 +13,14 @@ , pam , bashInteractive , rust-jemalloc-sys +, kanidm +# If this is enabled, kanidm will be built with two patches allowing both +# oauth2 basic secrets and admin credentials to be provisioned. +# This is NOT officially supported (and will likely never be), +# see https://github.com/kanidm/kanidm/issues/1747. +# Please report any provisioning-related errors to +# https://github.com/oddlama/kanidm-provision/issues/ instead. +, enableSecretProvisioning ? false }: let @@ -33,6 +41,11 @@ rustPlatform.buildRustPackage rec { KANIDM_BUILD_PROFILE = "release_nixos_${arch}"; + patches = lib.optionals enableSecretProvisioning [ + ./patches/oauth2-basic-secret-modify.patch + ./patches/recover-account.patch + ]; + postPatch = let format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml"; @@ -98,6 +111,8 @@ rustPlatform.buildRustPackage rec { }; updateScript = nix-update-script { }; + inherit enableSecretProvisioning; + withSecretProvisioning = kanidm.override { enableSecretProvisioning = true; }; }; meta = with lib; { diff --git a/pkgs/by-name/ka/kanidm/patches/oauth2-basic-secret-modify.patch b/pkgs/by-name/ka/kanidm/patches/oauth2-basic-secret-modify.patch new file mode 100644 index 000000000000..afff94ca51e9 --- /dev/null +++ b/pkgs/by-name/ka/kanidm/patches/oauth2-basic-secret-modify.patch @@ -0,0 +1,303 @@ +From 44dfbc2b9dccce86c7d7e7b54db4c989344b8c56 Mon Sep 17 00:00:00 2001 +From: oddlama +Date: Mon, 12 Aug 2024 23:17:25 +0200 +Subject: [PATCH 1/2] oauth2 basic secret modify + +--- + server/core/src/actors/v1_write.rs | 42 ++++++++++++++++++++++++++++++ + server/core/src/https/v1.rs | 6 ++++- + server/core/src/https/v1_oauth2.rs | 29 +++++++++++++++++++++ + server/lib/src/constants/acp.rs | 6 +++++ + 4 files changed, 82 insertions(+), 1 deletion(-) + +diff --git a/server/core/src/actors/v1_write.rs b/server/core/src/actors/v1_write.rs +index e00a969fb..1cacc67b8 100644 +--- a/server/core/src/actors/v1_write.rs ++++ b/server/core/src/actors/v1_write.rs +@@ -315,20 +315,62 @@ impl QueryServerWriteV1 { + }; + + trace!(?del, "Begin delete event"); + + idms_prox_write + .qs_write + .delete(&del) + .and_then(|_| idms_prox_write.commit().map(|_| ())) + } + ++ #[instrument( ++ level = "info", ++ skip_all, ++ fields(uuid = ?eventid) ++ )] ++ pub async fn handle_oauth2_basic_secret_write( ++ &self, ++ client_auth_info: ClientAuthInfo, ++ filter: Filter, ++ new_secret: String, ++ eventid: Uuid, ++ ) -> Result<(), OperationError> { ++ // Given a protoEntry, turn this into a modification set. ++ let ct = duration_from_epoch_now(); ++ let mut idms_prox_write = self.idms.proxy_write(ct).await; ++ let ident = idms_prox_write ++ .validate_client_auth_info_to_ident(client_auth_info, ct) ++ .map_err(|e| { ++ admin_error!(err = ?e, "Invalid identity"); ++ e ++ })?; ++ ++ let modlist = ModifyList::new_purge_and_set( ++ Attribute::OAuth2RsBasicSecret, ++ Value::SecretValue(new_secret), ++ ); ++ ++ let mdf = ++ ModifyEvent::from_internal_parts(ident, &modlist, &filter, &idms_prox_write.qs_write) ++ .map_err(|e| { ++ admin_error!(err = ?e, "Failed to begin modify during handle_oauth2_basic_secret_write"); ++ e ++ })?; ++ ++ trace!(?mdf, "Begin modify event"); ++ ++ idms_prox_write ++ .qs_write ++ .modify(&mdf) ++ .and_then(|_| idms_prox_write.commit()) ++ } ++ + #[instrument( + level = "info", + skip_all, + fields(uuid = ?eventid) + )] + pub async fn handle_reviverecycled( + &self, + client_auth_info: ClientAuthInfo, + filter: Filter, + eventid: Uuid, +diff --git a/server/core/src/https/v1.rs b/server/core/src/https/v1.rs +index 8aba83bb2..f1f815026 100644 +--- a/server/core/src/https/v1.rs ++++ b/server/core/src/https/v1.rs +@@ -1,17 +1,17 @@ + //! The V1 API things! + + use axum::extract::{Path, State}; + use axum::http::{HeaderMap, HeaderValue}; + use axum::middleware::from_fn; + use axum::response::{IntoResponse, Response}; +-use axum::routing::{delete, get, post, put}; ++use axum::routing::{delete, get, post, put, patch}; + use axum::{Extension, Json, Router}; + use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite}; + use compact_jwt::{Jwk, Jws, JwsSigner}; + use kanidm_proto::constants::uri::V1_AUTH_VALID; + use std::net::IpAddr; + use uuid::Uuid; + + use kanidm_proto::internal::{ + ApiToken, AppLink, CUIntentToken, CURequest, CUSessionToken, CUStatus, CreateRequest, + CredentialStatus, DeleteRequest, IdentifyUserRequest, IdentifyUserResponse, ModifyRequest, +@@ -3119,20 +3119,24 @@ pub(crate) fn route_setup(state: ServerState) -> Router { + ) + .route( + "/v1/oauth2/:rs_name/_image", + post(super::v1_oauth2::oauth2_id_image_post) + .delete(super::v1_oauth2::oauth2_id_image_delete), + ) + .route( + "/v1/oauth2/:rs_name/_basic_secret", + get(super::v1_oauth2::oauth2_id_get_basic_secret), + ) ++ .route( ++ "/v1/oauth2/:rs_name/_basic_secret", ++ patch(super::v1_oauth2::oauth2_id_patch_basic_secret), ++ ) + .route( + "/v1/oauth2/:rs_name/_scopemap/:group", + post(super::v1_oauth2::oauth2_id_scopemap_post) + .delete(super::v1_oauth2::oauth2_id_scopemap_delete), + ) + .route( + "/v1/oauth2/:rs_name/_sup_scopemap/:group", + post(super::v1_oauth2::oauth2_id_sup_scopemap_post) + .delete(super::v1_oauth2::oauth2_id_sup_scopemap_delete), + ) +diff --git a/server/core/src/https/v1_oauth2.rs b/server/core/src/https/v1_oauth2.rs +index 5e481afab..a771aed04 100644 +--- a/server/core/src/https/v1_oauth2.rs ++++ b/server/core/src/https/v1_oauth2.rs +@@ -144,20 +144,49 @@ pub(crate) async fn oauth2_id_get_basic_secret( + ) -> Result>, WebError> { + let filter = oauth2_id(&rs_name); + state + .qe_r_ref + .handle_oauth2_basic_secret_read(client_auth_info, filter, kopid.eventid) + .await + .map(Json::from) + .map_err(WebError::from) + } + ++#[utoipa::path( ++ patch, ++ path = "/v1/oauth2/{rs_name}/_basic_secret", ++ request_body=ProtoEntry, ++ responses( ++ DefaultApiResponse, ++ ), ++ security(("token_jwt" = [])), ++ tag = "v1/oauth2", ++ operation_id = "oauth2_id_patch_basic_secret" ++)] ++/// Overwrite the basic secret for a given OAuth2 Resource Server. ++#[instrument(level = "info", skip(state, new_secret))] ++pub(crate) async fn oauth2_id_patch_basic_secret( ++ State(state): State, ++ Extension(kopid): Extension, ++ VerifiedClientInformation(client_auth_info): VerifiedClientInformation, ++ Path(rs_name): Path, ++ Json(new_secret): Json, ++) -> Result, WebError> { ++ let filter = oauth2_id(&rs_name); ++ state ++ .qe_w_ref ++ .handle_oauth2_basic_secret_write(client_auth_info, filter, new_secret, kopid.eventid) ++ .await ++ .map(Json::from) ++ .map_err(WebError::from) ++} ++ + #[utoipa::path( + patch, + path = "/v1/oauth2/{rs_name}", + request_body=ProtoEntry, + responses( + DefaultApiResponse, + ), + security(("token_jwt" = [])), + tag = "v1/oauth2", + operation_id = "oauth2_id_patch" +diff --git a/server/lib/src/constants/acp.rs b/server/lib/src/constants/acp.rs +index f3409649d..42e407b7d 100644 +--- a/server/lib/src/constants/acp.rs ++++ b/server/lib/src/constants/acp.rs +@@ -645,34 +645,36 @@ lazy_static! { + Attribute::Image, + ], + modify_present_attrs: vec![ + Attribute::Description, + Attribute::DisplayName, + Attribute::OAuth2RsName, + Attribute::OAuth2RsOrigin, + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, + Attribute::Image, + ], + create_attrs: vec![ + Attribute::Class, + Attribute::Description, + Attribute::DisplayName, + Attribute::OAuth2RsName, + Attribute::OAuth2RsOrigin, + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, + Attribute::Image, + ], + create_classes: vec![ + EntryClass::Object, + EntryClass::OAuth2ResourceServer, + EntryClass::OAuth2ResourceServerBasic, + EntryClass::OAuth2ResourceServerPublic, +@@ -739,36 +741,38 @@ lazy_static! { + Attribute::Image, + ], + modify_present_attrs: vec![ + Attribute::Description, + Attribute::DisplayName, + Attribute::OAuth2RsName, + Attribute::OAuth2RsOrigin, + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, + Attribute::OAuth2AllowLocalhostRedirect, + Attribute::OAuth2RsClaimMap, + Attribute::Image, + ], + create_attrs: vec![ + Attribute::Class, + Attribute::Description, + Attribute::DisplayName, + Attribute::OAuth2RsName, + Attribute::OAuth2RsOrigin, + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, + Attribute::OAuth2AllowLocalhostRedirect, + Attribute::OAuth2RsClaimMap, + Attribute::Image, + ], + create_classes: vec![ + EntryClass::Object, + EntryClass::OAuth2ResourceServer, +@@ -840,36 +844,38 @@ lazy_static! { + Attribute::Image, + ], + modify_present_attrs: vec![ + Attribute::Description, + Attribute::DisplayName, + Attribute::Name, + Attribute::OAuth2RsOrigin, + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, + Attribute::OAuth2AllowLocalhostRedirect, + Attribute::OAuth2RsClaimMap, + Attribute::Image, + ], + create_attrs: vec![ + Attribute::Class, + Attribute::Description, + Attribute::Name, + Attribute::OAuth2RsName, + Attribute::OAuth2RsOrigin, + Attribute::OAuth2RsOriginLanding, + Attribute::OAuth2RsSupScopeMap, + Attribute::OAuth2RsScopeMap, ++ Attribute::OAuth2RsBasicSecret, + Attribute::OAuth2AllowInsecureClientDisablePkce, + Attribute::OAuth2JwtLegacyCryptoEnable, + Attribute::OAuth2PreferShortUsername, + Attribute::OAuth2AllowLocalhostRedirect, + Attribute::OAuth2RsClaimMap, + Attribute::Image, + ], + create_classes: vec![ + EntryClass::Object, + EntryClass::Account, +-- +2.45.2 + diff --git a/pkgs/by-name/ka/kanidm/patches/recover-account.patch b/pkgs/by-name/ka/kanidm/patches/recover-account.patch new file mode 100644 index 000000000000..a344f5a2086f --- /dev/null +++ b/pkgs/by-name/ka/kanidm/patches/recover-account.patch @@ -0,0 +1,173 @@ +From cc8269489b56755714f07eee4671f8aa2659c014 Mon Sep 17 00:00:00 2001 +From: oddlama +Date: Mon, 12 Aug 2024 23:17:42 +0200 +Subject: [PATCH 2/2] recover account + +--- + server/core/src/actors/internal.rs | 3 ++- + server/core/src/admin.rs | 6 +++--- + server/daemon/src/main.rs | 14 +++++++++++++- + server/daemon/src/opt.rs | 4 ++++ + 4 files changed, 22 insertions(+), 5 deletions(-) + +diff --git a/server/core/src/actors/internal.rs b/server/core/src/actors/internal.rs +index 40c18777f..40d553b40 100644 +--- a/server/core/src/actors/internal.rs ++++ b/server/core/src/actors/internal.rs +@@ -153,25 +153,26 @@ impl QueryServerWriteV1 { + } + + #[instrument( + level = "info", + skip(self, eventid), + fields(uuid = ?eventid) + )] + pub(crate) async fn handle_admin_recover_account( + &self, + name: String, ++ password: Option, + eventid: Uuid, + ) -> Result { + let ct = duration_from_epoch_now(); + let mut idms_prox_write = self.idms.proxy_write(ct).await; +- let pw = idms_prox_write.recover_account(name.as_str(), None)?; ++ let pw = idms_prox_write.recover_account(name.as_str(), password.as_deref())?; + + idms_prox_write.commit().map(|()| pw) + } + + #[instrument( + level = "info", + skip_all, + fields(uuid = ?eventid) + )] + pub(crate) async fn handle_domain_raise(&self, eventid: Uuid) -> Result { +diff --git a/server/core/src/admin.rs b/server/core/src/admin.rs +index 90ccb1927..85e31ddef 100644 +--- a/server/core/src/admin.rs ++++ b/server/core/src/admin.rs +@@ -17,21 +17,21 @@ use tokio_util::codec::{Decoder, Encoder, Framed}; + use tracing::{span, Instrument, Level}; + use uuid::Uuid; + + pub use kanidm_proto::internal::{ + DomainInfo as ProtoDomainInfo, DomainUpgradeCheckReport as ProtoDomainUpgradeCheckReport, + DomainUpgradeCheckStatus as ProtoDomainUpgradeCheckStatus, + }; + + #[derive(Serialize, Deserialize, Debug)] + pub enum AdminTaskRequest { +- RecoverAccount { name: String }, ++ RecoverAccount { name: String, password: Option }, + ShowReplicationCertificate, + RenewReplicationCertificate, + RefreshReplicationConsumer, + DomainShow, + DomainUpgradeCheck, + DomainRaise, + DomainRemigrate { level: Option }, + } + + #[derive(Serialize, Deserialize, Debug)] +@@ -302,22 +302,22 @@ async fn handle_client( + let mut reqs = Framed::new(sock, ServerCodec); + + trace!("Waiting for requests ..."); + while let Some(Ok(req)) = reqs.next().await { + // Setup the logging span + let eventid = Uuid::new_v4(); + let nspan = span!(Level::INFO, "handle_admin_client_request", uuid = ?eventid); + + let resp = async { + match req { +- AdminTaskRequest::RecoverAccount { name } => { +- match server_rw.handle_admin_recover_account(name, eventid).await { ++ AdminTaskRequest::RecoverAccount { name, password } => { ++ match server_rw.handle_admin_recover_account(name, password, eventid).await { + Ok(password) => AdminTaskResponse::RecoverAccount { password }, + Err(e) => { + error!(err = ?e, "error during recover-account"); + AdminTaskResponse::Error + } + } + } + AdminTaskRequest::ShowReplicationCertificate => match repl_ctrl_tx.as_mut() { + Some(ctrl_tx) => show_replication_certificate(ctrl_tx).await, + None => { +diff --git a/server/daemon/src/main.rs b/server/daemon/src/main.rs +index 577995615..a967928c9 100644 +--- a/server/daemon/src/main.rs ++++ b/server/daemon/src/main.rs +@@ -894,27 +894,39 @@ async fn kanidm_main( + } else { + let output_mode: ConsoleOutputMode = commonopts.output_mode.to_owned().into(); + submit_admin_req( + config.adminbindpath.as_str(), + AdminTaskRequest::RefreshReplicationConsumer, + output_mode, + ) + .await; + } + } +- KanidmdOpt::RecoverAccount { name, commonopts } => { ++ KanidmdOpt::RecoverAccount { name, from_environment, commonopts } => { + info!("Running account recovery ..."); + let output_mode: ConsoleOutputMode = commonopts.output_mode.to_owned().into(); ++ let password = if *from_environment { ++ match std::env::var("KANIDM_RECOVER_ACCOUNT_PASSWORD") { ++ Ok(val) => Some(val), ++ _ => { ++ error!("Environment variable KANIDM_RECOVER_ACCOUNT_PASSWORD not set"); ++ return ExitCode::FAILURE; ++ } ++ } ++ } else { ++ None ++ }; + submit_admin_req( + config.adminbindpath.as_str(), + AdminTaskRequest::RecoverAccount { + name: name.to_owned(), ++ password, + }, + output_mode, + ) + .await; + } + KanidmdOpt::Database { + commands: DbCommands::Reindex(_copt), + } => { + info!("Running in reindex mode ..."); + reindex_server_core(&config).await; +diff --git a/server/daemon/src/opt.rs b/server/daemon/src/opt.rs +index f1b45a5b3..9c013e32e 100644 +--- a/server/daemon/src/opt.rs ++++ b/server/daemon/src/opt.rs +@@ -229,20 +229,24 @@ enum KanidmdOpt { + /// Create a self-signed ca and tls certificate in the locations listed from the + /// configuration. These certificates should *not* be used in production, they + /// are for testing and evaluation only! + CertGenerate(CommonOpt), + #[clap(name = "recover-account")] + /// Recover an account's password + RecoverAccount { + #[clap(value_parser)] + /// The account name to recover credentials for. + name: String, ++ /// Use the password given in the environment variable ++ /// `KANIDM_RECOVER_ACCOUNT_PASSWORD` instead of generating one. ++ #[clap(long = "from-environment")] ++ from_environment: bool, + #[clap(flatten)] + commonopts: CommonOpt, + }, + /// Display this server's replication certificate + ShowReplicationCertificate { + #[clap(flatten)] + commonopts: CommonOpt, + }, + /// Renew this server's replication certificate + RenewReplicationCertificate { +-- +2.45.2 + From d07c3c3cd48418e55b08fd87ac6d3223a62014ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 13 Aug 2024 05:24:44 -0700 Subject: [PATCH 081/357] node-gyp: init at 10.2.0 --- pkgs/by-name/no/node-gyp/package-lock.json | 5034 ++++++++++++++++++++ pkgs/by-name/no/node-gyp/package.nix | 41 + pkgs/by-name/no/node-gyp/update.sh | 26 + 3 files changed, 5101 insertions(+) create mode 100644 pkgs/by-name/no/node-gyp/package-lock.json create mode 100644 pkgs/by-name/no/node-gyp/package.nix create mode 100755 pkgs/by-name/no/node-gyp/update.sh diff --git a/pkgs/by-name/no/node-gyp/package-lock.json b/pkgs/by-name/no/node-gyp/package-lock.json new file mode 100644 index 000000000000..89f26db44b3e --- /dev/null +++ b/pkgs/by-name/no/node-gyp/package-lock.json @@ -0,0 +1,5034 @@ +{ + "name": "node-gyp", + "version": "10.2.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "node-gyp", + "version": "10.2.0", + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^10.3.10", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^13.0.0", + "nopt": "^7.0.0", + "proc-log": "^4.1.0", + "semver": "^7.3.5", + "tar": "^6.2.1", + "which": "^4.0.0" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "devDependencies": { + "bindings": "^1.5.0", + "cross-env": "^7.0.3", + "mocha": "^10.2.0", + "nan": "^2.14.2", + "require-inject": "^1.4.4", + "standard": "^17.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", + "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/eslintrc/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.2", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@npmcli/agent": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz", + "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==", + "dependencies": { + "agent-base": "^7.1.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.1", + "lru-cache": "^10.0.1", + "socks-proxy-agent": "^8.0.3" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/fs": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", + "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true + }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, + "node_modules/abbrev": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/acorn": { + "version": "8.12.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", + "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-includes": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlast": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", + "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz", + "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", + "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.2.1", + "get-intrinsic": "^1.2.3", + "is-array-buffer": "^3.0.4", + "is-shared-array-buffer": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "dependencies": { + "file-uri-to-path": "1.0.0" + } + }, + "node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "node_modules/builtins": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", + "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", + "dev": true, + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/cacache": { + "version": "18.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", + "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^10.0.1", + "minipass": "^7.0.3", + "minipass-collect": "^2.0.1", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/call-bind": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "dev": true, + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/caller": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/caller/-/caller-1.1.0.tgz", + "integrity": "sha512-n+21IZC3j06YpCWaxmUy5AnVqhmCIM2bQtqQyy00HJlmStRt6kwDX5F9Z97pqwAB+G/tgSz6q/kUBbNyQzIubw==", + "dev": true + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chalk/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "engines": { + "node": ">=10" + } + }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "engines": { + "node": ">=6" + } + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/cross-env": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", + "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.1" + }, + "bin": { + "cross-env": "src/bin/cross-env.js", + "cross-env-shell": "src/bin/cross-env-shell.js" + }, + "engines": { + "node": ">=10.14", + "npm": ">=6", + "yarn": ">=1" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/cross-spawn/node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "node_modules/cross-spawn/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/data-view-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", + "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", + "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", + "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/debug": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dev": true, + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/diff": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + }, + "node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + }, + "node_modules/encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "optional": true, + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "engines": { + "node": ">=6" + } + }, + "node_modules/err-code": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/es-abstract": { + "version": "1.23.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", + "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.3", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "data-view-buffer": "^1.0.1", + "data-view-byte-length": "^1.0.1", + "data-view-byte-offset": "^1.0.0", + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.0.3", + "es-to-primitive": "^1.2.1", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.4", + "get-symbol-description": "^1.0.2", + "globalthis": "^1.0.3", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", + "has-symbols": "^1.0.3", + "hasown": "^2.0.2", + "internal-slot": "^1.0.7", + "is-array-buffer": "^3.0.4", + "is-callable": "^1.2.7", + "is-data-view": "^1.0.1", + "is-negative-zero": "^2.0.3", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.3", + "is-string": "^1.0.7", + "is-typed-array": "^1.1.13", + "is-weakref": "^1.0.2", + "object-inspect": "^1.13.1", + "object-keys": "^1.1.1", + "object.assign": "^4.1.5", + "regexp.prototype.flags": "^1.5.2", + "safe-array-concat": "^1.1.2", + "safe-regex-test": "^1.0.3", + "string.prototype.trim": "^1.2.9", + "string.prototype.trimend": "^1.0.8", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.2", + "typed-array-byte-length": "^1.0.1", + "typed-array-byte-offset": "^1.0.2", + "typed-array-length": "^1.0.6", + "unbox-primitive": "^1.0.2", + "which-typed-array": "^1.1.15" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-iterator-helpers": { + "version": "1.0.19", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz", + "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.3", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "globalthis": "^1.0.3", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.7", + "iterator.prototype": "^1.1.2", + "safe-array-concat": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", + "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.4", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", + "dev": true, + "dependencies": { + "hasown": "^2.0.0" + } + }, + "node_modules/es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/escalade": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-standard": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": "^8.0.1", + "eslint-plugin-import": "^2.25.2", + "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", + "eslint-plugin-promise": "^6.0.0" + } + }, + "node_modules/eslint-config-standard-jsx": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz", + "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "peerDependencies": { + "eslint": "^8.8.0", + "eslint-plugin-react": "^7.28.0" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", + "dev": true, + "dependencies": { + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-module-utils": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz", + "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==", + "dev": true, + "dependencies": { + "debug": "^3.2.7" + }, + "engines": { + "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } + } + }, + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-es": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", + "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", + "dev": true, + "dependencies": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=4.19.1" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", + "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.7", + "array.prototype.findlastindex": "^1.2.3", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.8.0", + "hasown": "^2.0.0", + "is-core-module": "^2.13.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.7", + "object.groupby": "^1.0.1", + "object.values": "^1.1.7", + "semver": "^6.3.1", + "tsconfig-paths": "^3.15.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" + } + }, + "node_modules/eslint-plugin-import/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-import/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/eslint-plugin-import/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/eslint-plugin-n": { + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", + "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", + "dev": true, + "dependencies": { + "builtins": "^5.0.1", + "eslint-plugin-es": "^4.1.0", + "eslint-utils": "^3.0.0", + "ignore": "^5.1.1", + "is-core-module": "^2.11.0", + "minimatch": "^3.1.2", + "resolve": "^1.22.1", + "semver": "^7.3.8" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-n/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/eslint-plugin-n/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/eslint-plugin-promise": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz", + "integrity": "sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-react": { + "version": "7.35.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz", + "integrity": "sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.8", + "array.prototype.findlast": "^1.2.5", + "array.prototype.flatmap": "^1.3.2", + "array.prototype.tosorted": "^1.1.4", + "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.0.19", + "estraverse": "^5.3.0", + "hasown": "^2.0.2", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.1.2", + "object.entries": "^1.1.8", + "object.fromentries": "^2.0.8", + "object.values": "^1.2.0", + "prop-types": "^15.8.1", + "resolve": "^2.0.0-next.5", + "semver": "^6.3.1", + "string.prototype.matchall": "^4.0.11", + "string.prototype.repeat": "^1.0.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7" + } + }, + "node_modules/eslint-plugin-react/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/eslint-plugin-react/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "dev": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/eslint-plugin-react/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/eslint/node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/eslint/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/eslint/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/exponential-backoff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==" + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "bin": { + "flat": "cli.js" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "dev": true + }, + "node_modules/for-each": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.3" + } + }, + "node_modules/foreground-child": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", + "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/function.prototype.name": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-stdin": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-symbol-description": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globalthis": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", + "dev": true, + "dependencies": { + "define-properties": "^1.2.1", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true + }, + "node_modules/has-bigints": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "bin": { + "he": "bin/he" + } + }, + "node_modules/http-cache-semantics": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" + }, + "node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/https-proxy-agent": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "optional": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/internal-slot": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0", + "hasown": "^2.0.0", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ip-address": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "dependencies": { + "jsbn": "1.1.0", + "sprintf-js": "^1.1.3" + }, + "engines": { + "node": ">= 12" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, + "node_modules/is-async-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", + "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, + "dependencies": { + "has-bigints": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-boolean-object": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz", + "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==", + "dev": true, + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-data-view": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", + "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", + "dev": true, + "dependencies": { + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-finalizationregistry": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", + "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-generator-function": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", + "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-lambda": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==" + }, + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-negative-zero": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-number-object": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", + "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", + "dev": true, + "dependencies": { + "which-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", + "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, + "node_modules/isexe": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", + "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", + "engines": { + "node": ">=16" + } + }, + "node_modules/iterator.prototype": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", + "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", + "dev": true, + "dependencies": { + "define-properties": "^1.2.1", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "reflect.getprototypeof": "^1.0.4", + "set-function-name": "^2.0.1" + } + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsbn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, + "node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/jsx-ast-utils": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/load-json-file": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", + "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.15", + "parse-json": "^4.0.0", + "pify": "^4.0.1", + "strip-bom": "^3.0.0", + "type-fest": "^0.3.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/load-json-file/node_modules/type-fest": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", + "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" + }, + "node_modules/make-fetch-happen": { + "version": "13.0.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz", + "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==", + "dependencies": { + "@npmcli/agent": "^2.0.0", + "cacache": "^18.0.0", + "http-cache-semantics": "^4.1.1", + "is-lambda": "^1.0.1", + "minipass": "^7.0.2", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "proc-log": "^4.2.0", + "promise-retry": "^2.0.1", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minipass-collect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", + "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minipass-fetch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-flush/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", + "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha": { + "version": "10.7.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz", + "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==", + "dev": true, + "dependencies": { + "ansi-colors": "^4.1.3", + "browser-stdout": "^1.3.1", + "chokidar": "^3.5.3", + "debug": "^4.3.5", + "diff": "^5.2.0", + "escape-string-regexp": "^4.0.0", + "find-up": "^5.0.0", + "glob": "^8.1.0", + "he": "^1.2.0", + "js-yaml": "^4.1.0", + "log-symbols": "^4.1.0", + "minimatch": "^5.1.6", + "ms": "^2.1.3", + "serialize-javascript": "^6.0.2", + "strip-json-comments": "^3.1.1", + "supports-color": "^8.1.1", + "workerpool": "^6.5.1", + "yargs": "^16.2.0", + "yargs-parser": "^20.2.9", + "yargs-unparser": "^2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha.js" + }, + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/mocha/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/mocha/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/nan": { + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz", + "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", + "dev": true + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/nopt": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", + "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "dependencies": { + "abbrev": "^2.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "has-symbols": "^1.0.3", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.entries": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", + "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.fromentries": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", + "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.values": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", + "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==" + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "dev": true, + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz", + "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==", + "dev": true, + "dependencies": { + "find-up": "^3.0.0", + "load-json-file": "^5.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-conf/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/proc-log": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz", + "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/promise-retry": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", + "dependencies": { + "err-code": "^2.0.2", + "retry": "^0.12.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dev": true, + "dependencies": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz", + "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.1", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "globalthis": "^1.0.3", + "which-builtin-type": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", + "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "set-function-name": "^2.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-inject": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/require-inject/-/require-inject-1.4.4.tgz", + "integrity": "sha512-5Y5ctRN84+I4iOZO61gm+48tgP/6Hcd3VZydkaEM3MCuOvnHRsTJYQBOc01faI/Z9at5nsCAJVHhlfPA6Pc0Og==", + "dev": true, + "dependencies": { + "caller": "^1.0.1" + } + }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dev": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", + "engines": { + "node": ">= 4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/rimraf/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-array-concat": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", + "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/safe-regex-test": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-regex": "^1.1.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "optional": true + }, + "node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/serialize-javascript": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "engines": { + "node": ">=8" + } + }, + "node_modules/side-channel": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", + "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", + "dependencies": { + "ip-address": "^9.0.5", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks-proxy-agent": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", + "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", + "dependencies": { + "agent-base": "^7.1.1", + "debug": "^4.3.4", + "socks": "^2.8.3" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" + }, + "node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/standard": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz", + "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "eslint": "^8.41.0", + "eslint-config-standard": "17.1.0", + "eslint-config-standard-jsx": "^11.0.0", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-n": "^15.7.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-react": "^7.32.2", + "standard-engine": "^15.0.0", + "version-guard": "^1.1.1" + }, + "bin": { + "standard": "bin/cmd.cjs" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/standard-engine": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz", + "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "get-stdin": "^8.0.0", + "minimist": "^1.2.6", + "pkg-conf": "^3.1.0", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/string-width-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string.prototype.matchall": { + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", + "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.7", + "regexp.prototype.flags": "^1.5.2", + "set-function-name": "^2.0.2", + "side-channel": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.repeat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz", + "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", + "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", + "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/tar": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tar/node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/tar/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tsconfig-paths": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", + "dev": true, + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", + "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", + "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", + "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", + "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/unbox-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", + "which-boxed-primitive": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "dependencies": { + "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/version-guard": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.2.tgz", + "integrity": "sha512-D8d+YxCUpoqtCnQzDxm6SF7DLU3gr2535T4khAtMq4osBahsQnmSxuwXFdrbAdDGG8Uokzfis/jvyeFPdmlc7w==", + "dev": true, + "engines": { + "node": ">=0.10.48" + } + }, + "node_modules/which": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", + "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "dependencies": { + "isexe": "^3.1.1" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^16.13.0 || >=18.0.0" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, + "dependencies": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.4.tgz", + "integrity": "sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==", + "dev": true, + "dependencies": { + "function.prototype.name": "^1.1.6", + "has-tostringtag": "^1.0.2", + "is-async-function": "^2.0.0", + "is-date-object": "^1.0.5", + "is-finalizationregistry": "^1.0.2", + "is-generator-function": "^1.0.10", + "is-regex": "^1.1.4", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.2", + "which-typed-array": "^1.1.15" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", + "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/workerpool": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", + "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", + "dev": true + }, + "node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "node_modules/xdg-basedir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/pkgs/by-name/no/node-gyp/package.nix b/pkgs/by-name/no/node-gyp/package.nix new file mode 100644 index 000000000000..ece8bb172e95 --- /dev/null +++ b/pkgs/by-name/no/node-gyp/package.nix @@ -0,0 +1,41 @@ +{ + buildNpmPackage, + fetchFromGitHub, + lib, + nodejs, +}: + +(buildNpmPackage.override { inherit nodejs; }) rec { + pname = "node-gyp"; + version = "10.2.0"; + + src = fetchFromGitHub { + owner = "nodejs"; + repo = "node-gyp"; + rev = "refs/tags/v${version}"; + hash = "sha256-AxyGE86nuU9VkbLLR/8GKM6bcTgayYodQ0mWiQhQtA0="; + }; + + npmDepsHash = "sha256-LCm1gF7GfjT13k3fe1A+DNNwP48OtFVbYgwCCLH3eHA="; + + postPatch = '' + ln -s ${./package-lock.json} package-lock.json + ''; + + dontNpmBuild = true; + + # Teach node-gyp to use nodejs headers locally rather that download them form https://nodejs.org. + # This is important when build nodejs packages in sandbox. + makeWrapperArgs = [ "--set npm_config_nodedir ${nodejs}" ]; + + passthru.updateScript = ./update.sh; + + meta = { + changelog = "https://github.com/nodejs/node-gyp/blob/${src.rev}/CHANGELOG.md"; + description = "Node.js native addon build tool"; + homepage = "https://github.com/nodejs/node-gyp"; + license = lib.licenses.mit; + mainProgram = "node-gyp"; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/by-name/no/node-gyp/update.sh b/pkgs/by-name/no/node-gyp/update.sh new file mode 100755 index 000000000000..6b61bacd49f7 --- /dev/null +++ b/pkgs/by-name/no/node-gyp/update.sh @@ -0,0 +1,26 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p gnused jq nix-prefetch-github nodejs prefetch-npm-deps wget + +set -euo pipefail +pushd "$(dirname "${BASH_SOURCE[0]}")" + +version=$(npm view node-gyp version) + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then + echo "Already up to date!" + exit 0 +fi + +sed -i 's#version = "[^"]*"#version = "'"$version"'"#' package.nix + +src_hash=$(nix-prefetch-github nodejs node-gyp --rev "v$version" | jq --raw-output .hash) +sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix + +rm -f package-lock.json package.json +wget "https://github.com/nodejs/node-gyp/raw/v$version/package.json" +npm i --package-lock-only --ignore-scripts +npm_hash=$(prefetch-npm-deps package-lock.json) +sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix +rm package.json + +popd From 000f83e17c6f3b88ddfe9915c68362828671734e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 13 Aug 2024 05:34:26 -0700 Subject: [PATCH 082/357] nodePackages.node-gyp: drop --- pkgs/by-name/n8/n8n/package.nix | 4 +- pkgs/by-name/vs/vscode-js-debug/package.nix | 4 +- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 147 ------------------ pkgs/development/node-packages/overrides.nix | 10 -- pkgs/development/tools/nodehun/default.nix | 4 +- pkgs/tools/admin/balena-cli/default.nix | 4 +- pkgs/tools/security/cdxgen/default.nix | 4 +- pkgs/top-level/all-packages.nix | 2 - 10 files changed, 11 insertions(+), 170 deletions(-) diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index b2bfe9cad3a7..f25979352c47 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -6,7 +6,7 @@ nodejs, pnpm, python3, - nodePackages, + node-gyp, cacert, xcbuild, libkrb5, @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pnpm.configHook python3 # required to build sqlite3 bindings - nodePackages.node-gyp # required to build sqlite3 bindings + node-gyp # required to build sqlite3 bindings cacert # required for rustls-native-certs (dependency of turbo build tool) makeWrapper ] ++ lib.optional stdenv.isDarwin [ xcbuild ]; diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix index 48d92ffb67e3..5df0356f0637 100644 --- a/pkgs/by-name/vs/vscode-js-debug/package.nix +++ b/pkgs/by-name/vs/vscode-js-debug/package.nix @@ -8,7 +8,7 @@ , Security , AppKit , pkg-config -, nodePackages +, node-gyp , runCommand , vscode-js-debug , nix-update-script @@ -29,7 +29,7 @@ buildNpmPackage rec { nativeBuildInputs = [ pkg-config - nodePackages.node-gyp + node-gyp ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; buildInputs = diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index abea58697515..faad356052f0 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -126,6 +126,7 @@ mapAliases { musescore-downloader = pkgs.dl-librescore; # added 2023-08-19 inherit (pkgs) near-cli; # added 2023-09-09 node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) node-gyp; # added 2024-08-13 inherit (pkgs) node-pre-gyp; # added 2024-08-05 inherit (pkgs) nodemon; # added 2024-06-28 inherit (pkgs) npm-check-updates; # added 2023-08-22 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index f3e45e80c716..3009d4f6673e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -150,7 +150,6 @@ , "multi-file-swagger" , "neovim" , "nijs" -, "node-gyp" , "node-gyp-build" , "node-red" , "node2nix" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index add29d5b90dc..062cfc6af9cf 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -78254,153 +78254,6 @@ in bypassCache = true; reconstructLock = true; }; - node-gyp = nodeEnv.buildNodePackage { - name = "node-gyp"; - packageName = "node-gyp"; - version = "10.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz"; - sha512 = "sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw=="; - }; - dependencies = [ - sources."@isaacs/cliui-8.0.2" - sources."@npmcli/agent-2.2.2" - sources."@npmcli/fs-3.1.1" - sources."abbrev-2.0.0" - sources."agent-base-7.1.1" - sources."aggregate-error-3.1.0" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."balanced-match-1.0.2" - sources."brace-expansion-2.0.1" - sources."cacache-18.0.4" - sources."chownr-2.0.0" - sources."clean-stack-2.2.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - (sources."cross-spawn-7.0.3" // { - dependencies = [ - sources."which-2.0.2" - ]; - }) - sources."debug-4.3.5" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - sources."env-paths-2.2.1" - sources."err-code-2.0.3" - sources."exponential-backoff-3.1.1" - sources."foreground-child-3.2.1" - sources."fs-minipass-3.0.3" - sources."glob-10.4.5" - sources."graceful-fs-4.2.11" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-7.0.2" - sources."https-proxy-agent-7.0.5" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."ip-address-9.0.5" - sources."is-fullwidth-code-point-3.0.0" - sources."is-lambda-1.0.1" - sources."isexe-2.0.0" - sources."jackspeak-3.4.3" - sources."jsbn-1.1.0" - sources."lru-cache-10.4.3" - sources."make-fetch-happen-13.0.1" - sources."minimatch-9.0.5" - sources."minipass-7.1.2" - sources."minipass-collect-2.0.1" - sources."minipass-fetch-3.0.5" - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."ms-2.1.2" - sources."negotiator-0.6.3" - sources."nopt-7.2.1" - sources."p-map-4.0.0" - sources."package-json-from-dist-1.0.0" - sources."path-key-3.1.1" - sources."path-scurry-1.11.1" - sources."proc-log-4.2.0" - sources."promise-retry-2.0.1" - sources."retry-0.12.0" - sources."semver-7.6.3" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."smart-buffer-4.2.0" - sources."socks-2.8.3" - sources."socks-proxy-agent-8.0.4" - sources."sprintf-js-1.1.3" - sources."ssri-10.0.6" - sources."string-width-5.1.2" - (sources."string-width-cjs-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - }) - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - ]; - }) - sources."strip-ansi-cjs-6.0.1" - (sources."tar-6.2.1" // { - dependencies = [ - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."minipass-5.0.0" - ]; - }) - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - (sources."which-4.0.0" // { - dependencies = [ - sources."isexe-3.1.1" - ]; - }) - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."yallist-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Node.js native addon build tool"; - homepage = "https://github.com/nodejs/node-gyp#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 82f19774f06c..355e262ab06f 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -168,16 +168,6 @@ final: prev: { ''; }; - node-gyp = prev.node-gyp.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - # Teach node-gyp to use nodejs headers locally rather that download them form https://nodejs.org. - # This is important when build nodejs packages in sandbox. - postInstall = '' - wrapProgram "$out/bin/node-gyp" \ - --set npm_config_nodedir ${nodejs} - ''; - }; - node-red = prev.node-red.override { buildInputs = [ pkgs.node-pre-gyp ]; }; diff --git a/pkgs/development/tools/nodehun/default.nix b/pkgs/development/tools/nodehun/default.nix index ec5587273db2..83ba3fe2e494 100644 --- a/pkgs/development/tools/nodehun/default.nix +++ b/pkgs/development/tools/nodehun/default.nix @@ -3,7 +3,7 @@ , darwin , fetchFromGitHub , lib -, nodePackages +, node-gyp , nodejs , python3 , stdenv @@ -31,7 +31,7 @@ buildNpmPackage { npmDepsHash = "sha256-mV6rWNf2p2w4H0ESUT0/Ybtx9YEdvO5l2gCvlWFXK+U="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; - nativeBuildInputs = [ nodePackages.node-gyp python3 ] + nativeBuildInputs = [ node-gyp python3 ] ++ lib.optionals stdenv.isDarwin [ cctools ]; postInstall = '' diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index 47e5eb49ef8e..6daeaaf05a1e 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -5,7 +5,7 @@ , fetchFromGitHub , testers , balena-cli -, nodePackages +, node-gyp , python3 , udev , cctools @@ -36,7 +36,7 @@ in buildNpmPackage' rec { makeCacheWritable = true; nativeBuildInputs = [ - nodePackages.node-gyp + node-gyp python3 ] ++ lib.optionals stdenv.isDarwin [ cctools diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/tools/security/cdxgen/default.nix index 4a641a7a5261..c494598c10d2 100644 --- a/pkgs/tools/security/cdxgen/default.nix +++ b/pkgs/tools/security/cdxgen/default.nix @@ -2,7 +2,7 @@ , lib , makeWrapper , nodejs -, nodePackages +, node-gyp , pnpm_9 , python3 , stdenv @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper nodejs - nodePackages.node-gyp # required for sqlite3 bindings + node-gyp # required for sqlite3 bindings pnpm_9.configHook python3 # required for sqlite3 bindings ] ++ lib.optional stdenv.isDarwin [ xcbuild ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a8e717d4047..2a46c061a4d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34455,13 +34455,11 @@ with pkgs; openvscode-server = callPackage ../servers/openvscode-server { nodejs = nodejs_18; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; - inherit (nodePackages) node-gyp; }; code-server = callPackage ../servers/code-server { nodejs = nodejs_20; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security; - inherit (nodePackages) node-gyp; }; vue = callPackage ../applications/misc/vue { }; From 3f7a7124b8f4d6aaa21818edf1085083afad838a Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Tue, 13 Aug 2024 10:24:54 -0400 Subject: [PATCH 083/357] open-vm-tools: move to package by name and format --- .../op/open-vm-tools/package.nix} | 164 ++++++++++-------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 92 insertions(+), 73 deletions(-) rename pkgs/{applications/virtualization/open-vm-tools/default.nix => by-name/op/open-vm-tools/package.nix} (68%) diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/by-name/op/open-vm-tools/package.nix similarity index 68% rename from pkgs/applications/virtualization/open-vm-tools/default.nix rename to pkgs/by-name/op/open-vm-tools/package.nix index 63abcad60a5d..d660cd64bb34 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/by-name/op/open-vm-tools/package.nix @@ -1,42 +1,43 @@ -{ stdenv -, lib -, fetchFromGitHub -, makeWrapper -, autoreconfHook -, bash -, fuse3 -, libmspack -, openssl -, pam -, xercesc -, icu -, libdnet -, procps -, libtirpc -, rpcsvc-proto -, libX11 -, libXext -, libXinerama -, libXi -, libXrender -, libXrandr -, libXtst -, libxcrypt -, libxml2 -, pkg-config -, glib -, gdk-pixbuf-xlib -, gtk3 -, gtkmm3 -, iproute2 -, dbus -, systemd -, which -, libdrm -, udev -, util-linux -, xmlsec -, withX ? true +{ + stdenv, + lib, + fetchFromGitHub, + makeWrapper, + autoreconfHook, + bash, + fuse3, + libmspack, + openssl, + pam, + xercesc, + icu, + libdnet, + procps, + libtirpc, + rpcsvc-proto, + libX11, + libXext, + libXinerama, + libXi, + libXrender, + libXrandr, + libXtst, + libxcrypt, + libxml2, + pkg-config, + glib, + gdk-pixbuf-xlib, + gtk3, + gtkmm3, + iproute2, + dbus, + systemd, + which, + libdrm, + udev, + util-linux, + xmlsec, + withX ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -52,7 +53,10 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/open-vm-tools"; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; nativeBuildInputs = [ autoreconfHook @@ -60,35 +64,37 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = [ - fuse3 - glib - icu - libdnet - libdrm - libmspack - libtirpc - libxcrypt - libxml2 - openssl - pam - procps - rpcsvc-proto - udev - xercesc - xmlsec - ] ++ lib.optionals withX [ - gdk-pixbuf-xlib - gtk3 - gtkmm3 - libX11 - libXext - libXinerama - libXi - libXrender - libXrandr - libXtst - ]; + buildInputs = + [ + fuse3 + glib + icu + libdnet + libdrm + libmspack + libtirpc + libxcrypt + libxml2 + openssl + pam + procps + rpcsvc-proto + udev + xercesc + xmlsec + ] + ++ lib.optionals withX [ + gdk-pixbuf-xlib + gtk3 + gtkmm3 + libX11 + libXext + libXinerama + libXi + libXrender + libXrandr + libXtst + ]; postPatch = '' sed -i Makefile.am \ @@ -131,7 +137,14 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ - --prefix PATH ':' "${lib.makeBinPath [ iproute2 dbus systemd which ]}" + --prefix PATH ':' "${ + lib.makeBinPath [ + iproute2 + dbus + systemd + which + ] + }" substituteInPlace "$out/lib/udev/rules.d/99-vmware-scsi-udev.rules" --replace "/bin/sh" "${bash}/bin/sh" ''; @@ -144,7 +157,14 @@ stdenv.mkDerivation (finalAttrs: { better management of, and seamless user interactions with, guests. ''; license = licenses.gpl2; - platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ joamaki kjeremy ]; + platforms = [ + "x86_64-linux" + "i686-linux" + "aarch64-linux" + ]; + maintainers = with maintainers; [ + joamaki + kjeremy + ]; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac8a7d3cce8b..f786ef1ca9a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26878,7 +26878,6 @@ with pkgs; ocf-resource-agents = callPackage ../os-specific/linux/ocf-resource-agents { }; - open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; oxtools = callPackage ../os-specific/linux/oxtools { }; From 13068a8eb513926e450891807ad427e75131719a Mon Sep 17 00:00:00 2001 From: "Winston R. Milling" Date: Tue, 13 Aug 2024 10:43:42 -0500 Subject: [PATCH 084/357] k3s: 1.30.2+k3s2 -> 1.30.3+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.30.3%2Bk3s1 --- .../cluster/k3s/1_30/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_30/versions.nix | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json index 1d4819006cb2..e65329390325 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.2%2Bk3s2/k3s-airgap-images-amd64.tar.zst", - "sha256": "1d1adpjxxgkflm4xqzynsib67pga85r1qmhkhh540nl0rppbq7gr" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "1ym7cdm3a2f05wgh4vba2g7q1zihrfvvm2zngcs0gm8djj7hy4d9" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.2%2Bk3s2/k3s-airgap-images-arm.tar.zst", - "sha256": "1hjhlj4b5ddaqhpmqbbvhvgzryi5j84i8bmpl3yij87yjkz3kld7" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "15mj949msrd30xhqryhpsvx1bi3pywm1z5bmi0h40qyzc1mcfvjk" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.2%2Bk3s2/k3s-airgap-images-arm64.tar.zst", - "sha256": "1r9rd70qp8x57j3hdpgwgkzchykphw0x4yd8c1jwjfaqm5df1w0d" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "1k2q6rzczajnrkj57p97fdr7lgmrfv7x54by2syngfwb5in8fhd5" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.2%2Bk3s2/k3s-images.txt", - "sha256": "0245zra2h8756kq2v8nwl6gji749xlvy1y1bkab8vz5b0vpqhfxy" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-images.txt", + "sha256": "1my3lfs5rfazcnnpsc9dj84dfnxx88xydrl86z6yw5n5p84x4nif" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix index 2646c3454136..31b14892bab6 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix @@ -1,12 +1,12 @@ { - k3sVersion = "1.30.2+k3s2"; - k3sCommit = "faeaf1b01b2a708a46cae2a67c1b4d381ee1ba6b"; - k3sRepoSha256 = "0hy0f44hj5n5nscr0p52dbklvj2ki2vs7k0cgh1r8xlg4p6fn1b0"; - k3sVendorHash = "sha256-Mj9Q3TgqZoJluG4/nyuw2WHnB3OJ+/mlV7duzWt1B1A="; + k3sVersion = "1.30.3+k3s1"; + k3sCommit = "f646604010affc6a1d3233a8a0870bca46bf80cf"; + k3sRepoSha256 = "1sqa4cx5rihrqcnriq7if7sm4hx73ma975yyr5k9nvhg71dvlig3"; + k3sVendorHash = "sha256-HMlYdWDUoELpwsfCtyCxVIcFULdvu5gna83lc79AUWc="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.13.0"; - k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj"; + k3sRootVersion = "0.14.0"; + k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; containerdVersion = "1.7.17-k3s1"; From bc6f638fa084f90e06eb692fc07b983847109031 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 12 Aug 2024 02:32:14 +0200 Subject: [PATCH 085/357] 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 086/357] 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 087/357] 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 088/357] 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 089/357] 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 090/357] 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 091/357] 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 092/357] 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 093/357] 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 094/357] 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 095/357] 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 096/357] 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 097/357] 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 098/357] 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 099/357] 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 100/357] 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 101/357] 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 102/357] 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 103/357] 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 104/357] 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 105/357] 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 106/357] 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 107/357] 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 108/357] 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 109/357] 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 110/357] 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 111/357] 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 112/357] 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 113/357] 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 114/357] 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 115/357] 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 116/357] 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 117/357] 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 118/357] 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 119/357] 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 120/357] 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 121/357] 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 122/357] 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 123/357] 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 124/357] 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 125/357] 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 126/357] 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 127/357] 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 128/357] 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 129/357] 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 130/357] 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 131/357] 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 efc6a51e74762c3d69368ca61157570d34aa16ad Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Wed, 14 Aug 2024 19:33:41 +0200 Subject: [PATCH 132/357] Revert "linux_xanmod: set RCU_BOOST_DELAY to 100ms" This reverts commit 5e098f6fac47182cb512346b9a11f1a9338b6ce1. Follows https://gitlab.com/xanmod/linux/-/commit/5cf7ba43e60b31229d3bb5c83b64b5a5a981f681 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 875a5e1f87b9..04be8b131111 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -52,7 +52,7 @@ let RCU_FANOUT = freeform "64"; RCU_FANOUT_LEAF = freeform "16"; RCU_BOOST = yes; - RCU_BOOST_DELAY = freeform "100"; + RCU_BOOST_DELAY = freeform "0"; RCU_EXP_KTHREAD = yes; }; From d5322442e62570f0fdf785ae900f2a27cb92f562 Mon Sep 17 00:00:00 2001 From: Guillaume Racicot Date: Thu, 25 Jul 2024 11:46:54 -0400 Subject: [PATCH 133/357] vcpkg: support builtin-baseline without git --- pkgs/by-name/vc/vcpkg-tool/package.nix | 1 + .../read-bundle-info-from-root.patch | 43 +++++++++++++++++++ pkgs/by-name/vc/vcpkg/package.nix | 21 ++++++++- 3 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/vc/vcpkg-tool/read-bundle-info-from-root.patch diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index 97e0c22ada73..f21dfc76a69c 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./change-lock-location.patch + ./read-bundle-info-from-root.patch ]; cmakeFlags = [ diff --git a/pkgs/by-name/vc/vcpkg-tool/read-bundle-info-from-root.patch b/pkgs/by-name/vc/vcpkg-tool/read-bundle-info-from-root.patch new file mode 100644 index 000000000000..cc9e3bc9ef9a --- /dev/null +++ b/pkgs/by-name/vc/vcpkg-tool/read-bundle-info-from-root.patch @@ -0,0 +1,43 @@ +diff --git a/include/vcpkg/vcpkgpaths.h b/include/vcpkg/vcpkgpaths.h +index 90fd4d09..ebc6342b 100644 +--- a/include/vcpkg/vcpkgpaths.h ++++ b/include/vcpkg/vcpkgpaths.h +@@ -28,6 +28,8 @@ + + namespace vcpkg + { ++ Path exported_determine_root(const ReadOnlyFilesystem& fs, const Path& original_cwd, const VcpkgCmdArguments& args); ++ + struct ToolsetArchOption + { + ZStringView name; +diff --git a/src/vcpkg.cpp b/src/vcpkg.cpp +index 2b62cb55..d7b8ead5 100644 +--- a/src/vcpkg.cpp ++++ b/src/vcpkg.cpp +@@ -296,7 +296,8 @@ int main(const int argc, const char* const* const argv) + Debug::println("To include the environment variables in debug output, pass --debug-env"); + } + args.check_feature_flag_consistency(); +- const auto current_exe_path = get_exe_path_of_current_process(); ++ const auto current_exe_path = ++ exported_determine_root(real_filesystem, real_filesystem.current_path(VCPKG_LINE_INFO), args) / "vcpkg"; + + bool to_enable_metrics = true; + { +diff --git a/src/vcpkg/vcpkgpaths.cpp b/src/vcpkg/vcpkgpaths.cpp +index 77e107f5..132050ba 100644 +--- a/src/vcpkg/vcpkgpaths.cpp ++++ b/src/vcpkg/vcpkgpaths.cpp +@@ -518,6 +518,11 @@ namespace + + namespace vcpkg + { ++ Path exported_determine_root(const ReadOnlyFilesystem& fs, const Path& original_cwd, const VcpkgCmdArguments& args) ++ { ++ return determine_root(fs, original_cwd, args); ++ } ++ + Path InstalledPaths::listfile_path(const BinaryParagraph& pgh) const + { + return this->vcpkg_dir_info() / (pgh.fullstem() + ".list"); diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index 24966edf4264..73711310f96f 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -14,7 +14,24 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "microsoft"; repo = "vcpkg"; rev = finalAttrs.version; - hash = "sha256-HT7IcznN5W+Innzg0aeOvZnpVUTf/uJFlYflE91YJQA="; + hash = "sha256-WE+BeF9BYR9/Gmi60g6ApXsWQ2vch2N6XhH1A9HAHsc="; + leaveDotGit = true; + postFetch = '' + cd "$out" + VCPKG_BASELINE_COMMIT_SHA=$(git rev-parse --verify HEAD) + # We only needed the .git folder for that previous command, so we can safely delete it now. + # If we don’t delete it, then we might run into problems (see #8567). + rm -r .git + # Here's the code that Creates this json file in Visual Studio deployment and the code that reads it: + # https://github.com/microsoft/vcpkg-tool/blob/f098d3e0aaa7e46ea84a1f7079586e1ec5af8ab5/vcpkg-init/mint-standalone-bundle.ps1#L21 + # https://github.com/microsoft/vcpkg-tool/blob/f098d3e0aaa7e46ea84a1f7079586e1ec5af8ab5/src/vcpkg/bundlesettings.cpp#L87 + # + # Here's the code that we target with this setting. If we use embeddedsha combined with usegitregistry, vcpkg + # will checkout a remote instead of trying to do git operation in the vcpkg root + # https://github.com/microsoft/vcpkg-tool/blob/d272c0d4f5175b26bd56c6109d4c4935b791a157/src/vcpkg/vcpkgpaths.cpp#L920 + # https://github.com/microsoft/vcpkg-tool/blob/d272c0d4f5175b26bd56c6109d4c4935b791a157/src/vcpkg/configuration.cpp#L718 + echo '{ "readonly": true, "usegitregistry": true, "deployment": "Git", "embeddedsha": "'"$VCPKG_BASELINE_COMMIT_SHA"'" }' > vcpkg-bundle.json + ''; }; nativeBuildInputs = [ makeWrapper ]; @@ -36,7 +53,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook preInstall mkdir -p "$out/bin" "$out/share/vcpkg/scripts/buildsystems" - cp --preserve=mode -r ./{docs,ports,triplets,scripts,.vcpkg-root,versions,LICENSE.txt} "$out/share/vcpkg/" + cp --preserve=mode -r ./{docs,ports,triplets,scripts,.vcpkg-root,versions,LICENSE.txt,vcpkg-bundle.json} "$out/share/vcpkg/" ${lib.optionalString doWrap '' makeWrapper "${vcpkg-tool}/bin/vcpkg" "$out/bin/vcpkg" \ From 9443df541aa715402886f43c279471f24200ec8c Mon Sep 17 00:00:00 2001 From: Guillaume Racicot Date: Tue, 30 Jul 2024 10:34:35 -0400 Subject: [PATCH 134/357] vcpkg: update description --- pkgs/by-name/vc/vcpkg/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index 73711310f96f..98c040af0d25 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -67,7 +67,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; meta = { - description = "C++ Library Manager"; + description = "C++ Library Manager for Windows, Linux, and macOS"; mainProgram = "vcpkg"; homepage = "https://vcpkg.io/"; license = lib.licenses.mit; From 19014d1d45ec5e9d96d34cac56f18929fd53dbd2 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 14 Aug 2024 21:19:19 +0200 Subject: [PATCH 135/357] python312Packages.openusd: fix build add env variable to let package find osl Signed-off-by: Florian Brandes --- pkgs/development/python-modules/openusd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index d20bcf4c1f1c..d72612bc0720 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -74,6 +74,8 @@ buildPythonPackage rec { }) ]; + env.OSL_LOCATION = "${osl}"; + cmakeFlags = [ "-DPXR_BUILD_ALEMBIC_PLUGIN=ON" "-DPXR_BUILD_DRACO_PLUGIN=ON" From 1a091813f9672481df733caaef9e231486fbc67f Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Wed, 14 Aug 2024 15:37:41 +0200 Subject: [PATCH 136/357] k3s_1_29: 1.29.6+k3s2 -> 1.29.7+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.29.7%2Bk3s1 --- .../cluster/k3s/1_29/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_29/versions.nix | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json index fdf9d967d516..39b6faf17a46 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.6%2Bk3s2/k3s-airgap-images-amd64.tar.zst", - "sha256": "1d1adpjxxgkflm4xqzynsib67pga85r1qmhkhh540nl0rppbq7gr" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "1dyh107ygnlv9gyq2f9jdgrwjiyg25a61id69z48vc60gq480888" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.6%2Bk3s2/k3s-airgap-images-arm.tar.zst", - "sha256": "07c085y5qy8h5ja2ms3np61d7wkp6gic82snx70qlsm5fm3ak3z7" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "16l6d1ix3ri1l2wr2k5brg11a1snbkqhqasrk69wrix6diddklrn" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.6%2Bk3s2/k3s-airgap-images-arm64.tar.zst", - "sha256": "0ljajvz0n0mmwkdl1rwpwqmhgxqivakdpfyaqsascdzfk0qpv5gp" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "0pg4nzh1rf28003yxhl3jklxs41vjjgldviybvnqqp146ib6hy0r" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.6%2Bk3s2/k3s-images.txt", - "sha256": "0245zra2h8756kq2v8nwl6gji749xlvy1y1bkab8vz5b0vpqhfxy" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-images.txt", + "sha256": "1my3lfs5rfazcnnpsc9dj84dfnxx88xydrl86z6yw5n5p84x4nif" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix index 4b05d0a07f72..f27ea9030173 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -1,12 +1,12 @@ { - k3sVersion = "1.29.6+k3s2"; - k3sCommit = "b4b156d9d14eeb475e789718b3a6b78aba00019e"; - k3sRepoSha256 = "0wagfh4vbvyi62np6zx7b4p6myn0xavw691y78rnbl32jckiy14f"; - k3sVendorHash = "sha256-o36gf3q7Vv+RoY681cL44rU2QFrdFW3EbRpw3dLcVTI="; + k3sVersion = "1.29.7+k3s1"; + k3sCommit = "f246bbc390a05f45431e49617b58013fe06a460d"; + k3sRepoSha256 = "0fv628rxxavqmb2gv0ncsx4m8ghn3v6ddn2n06x8q4ar27d9gijg"; + k3sVendorHash = "sha256-pAOyGgEaO6ewNv+6yhDt83NZl95rmLseFUs4vlXNH6Q="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.13.0"; - k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj"; + k3sRootVersion = "0.14.0"; + k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; containerdVersion = "1.7.17-k3s1"; From 1b6efd0fca4d6960e5b1a0a751855efd308b7e7b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 25 Jul 2024 08:05:09 +0200 Subject: [PATCH 137/357] 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 138/357] 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 139/357] 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 140/357] 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 141/357] 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 142/357] 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 bb2010319f05b95617d4a6f11e00dc36e0d9ba27 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Wed, 14 Aug 2024 19:36:13 +0200 Subject: [PATCH 143/357] linux_xanmod: 6.6.45 -> 6.6.46 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 04be8b131111..4e0e9eac03b9 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,8 +6,8 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.45"; - hash = "sha256-sYAa/uIi076XJMHOSjOSQO/rK/wUWIpAfWb/EYDXvD0="; + version = "6.6.46"; + hash = "sha256-ZtXFIHRM5YCb+5Ry3zcQt44OBqfhCI/Ig32jETUBrJo="; variant = "lts"; }; From b901880c37e3e650dba2c2da179817de2b88a7a7 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Wed, 14 Aug 2024 19:36:54 +0200 Subject: [PATCH 144/357] linux_xanmod_latest: 6.10.4 -> 6.10.5 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 4e0e9eac03b9..d0889e283d44 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -12,8 +12,8 @@ let }; mainVariant = { - version = "6.10.4"; - hash = "sha256-8iK821QbJcgXEeCWh1g1DlJ3gOD5eDErw0O7O+cEGwQ="; + version = "6.10.5"; + hash = "sha256-tETGtCNNgYj1IUNuI/Am5kimFndUC4O+cZwZzlPitFA="; variant = "main"; }; From 6c27f523dca033150dd1d3b1d65fab99c7293fac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 02:18:30 +0000 Subject: [PATCH 145/357] podman: 5.2.0 -> 5.2.1 --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 707053dc82b9..f1aa2196a5a6 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -65,13 +65,13 @@ let in buildGoModule rec { pname = "podman"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-Rb9rOetMVxf1GhEOzZmaUwRI4nkPdJnpkpjIyJcb6r8="; + hash = "sha256-xwZfCPnn81Rvk2ceLxL8Dwaw2T0oc1agjrcauHYSRvU="; }; patches = [ From 6bec85c74b587870c57150ecc4d1f209c773ddab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 03:08:04 +0000 Subject: [PATCH 146/357] python312Packages.eigenpy: 3.7.0 -> 3.8.0 --- pkgs/development/python-modules/eigenpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index f1a67cc0ff75..f793151c2102 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "eigenpy"; - version = "3.7.0"; + version = "3.8.0"; pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; - rev = "v${version}"; - hash = "sha256-D/k/ka500EZch5Ydym2WYtd5vciGkd9rdBUSjTsZ0w4="; + rev = "refs/tags/v${version}"; + hash = "sha256-IqGzv/CJ1uiuvewdx6joVV9V9cXSzYuQqbJedajshTg="; }; outputs = [ From 7d73acde7feb3f7b7c7be7c2c85c900d3a0e1b26 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 15 Aug 2024 05:23:12 +0200 Subject: [PATCH 147/357] openusd: fix build openusd (not `python3Packages.openusd`) fails to build, because it cannot find `pyside-tools-uic`. This commit adds a cmake flag to fix it. Signed-off-by: Florian Brandes --- pkgs/development/python-modules/openusd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index d72612bc0720..f281bc352d1b 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -86,6 +86,7 @@ buildPythonPackage rec { "-DPXR_BUILD_TESTS=OFF" "-DPXR_BUILD_TUTORIALS=OFF" "-DPXR_BUILD_USD_IMAGING=ON" + "-DPYSIDE_BIN_DIR=${pyside-tools-uic}/bin" (lib.cmakeBool "PXR_BUILD_DOCUMENTATION" withDocs) (lib.cmakeBool "PXR_BUILD_PYTHON_DOCUMENTATION" withDocs) (lib.cmakeBool "PXR_BUILD_USDVIEW" withUsdView) From fbdfccfba41104ce4ffe688557e31674084b5d0b Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 14 Aug 2024 22:47:22 -0700 Subject: [PATCH 148/357] cyrus_sasl: fix building with llvm --- pkgs/development/libraries/cyrus-sasl/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 7eb13f7136c7..0b151bfc719a 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -41,7 +41,11 @@ stdenv.mkDerivation rec { "--with-saslauthd=/run/saslauthd" "--enable-login" "--enable-shared" - ] ++ lib.optional enableLdap "--with-ldap=${openldap.dev}"; + ] ++ lib.optional enableLdap "--with-ldap=${openldap.dev}" + ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [ + "--disable-sample" + "CFLAGS=-DTIME_WITH_SYS_TIME" + ]; installFlags = lib.optionals stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ]; From 8ce459e2b87a30bec8b76746715f520af6afde2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 05:50:36 +0000 Subject: [PATCH 149/357] instaloader: 4.11 -> 4.13 --- pkgs/tools/misc/instaloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/instaloader/default.nix b/pkgs/tools/misc/instaloader/default.nix index 4b36d0909bf4..c5565090c960 100644 --- a/pkgs/tools/misc/instaloader/default.nix +++ b/pkgs/tools/misc/instaloader/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "instaloader"; - version = "4.11"; + version = "4.13"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "instaloader"; repo = "instaloader"; rev = "refs/tags/v${version}"; - sha256 = "sha256-EqE184tYW815Hp42EB5g0l9f5AWpYSqH+cY4z4zsCSQ="; + sha256 = "sha256-nZNoxJnp8dBbgXWYLfzasTa9SsR03xA1mpl9NKppodE="; }; nativeBuildInputs = [ From 6ddee218985ea35f6f6e88fa0017abca50c967b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Aug 2024 13:32:42 +0200 Subject: [PATCH 150/357] 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 151/357] 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 152/357] 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 153/357] 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 154/357] 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 155/357] 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 aedbab4ad3dc7f60801283aa36758ed7061d940f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 15 Aug 2024 10:12:28 +0200 Subject: [PATCH 156/357] udocker: 1.3.1 -> 1.3.16 Diff: https://github.com/indigo-dc/udocker/compare/1.3.1...1.3.16 Changelog: https://github.com/indigo-dc/udocker/releases/tag/1.3.16 --- pkgs/tools/virtualization/udocker/default.nix | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index e13376211a89..21fc0d1f838f 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -2,37 +2,33 @@ , fetchFromGitHub , singularity , python3Packages -, fetchpatch +, testers +, udocker }: python3Packages.buildPythonApplication rec { pname = "udocker"; - version = "1.3.1"; + version = "1.3.16"; src = fetchFromGitHub { owner = "indigo-dc"; repo = "udocker"; - rev = "v${version}"; - sha256 = "0dfsjgidsnah8nrclrq10yz3ja859123z81kq4zdifbrhnrn5a2x"; + rev = "refs/tags/${version}"; + hash = "sha256-PUbNFvKaF41egGMypdkmVFCt1bWmTCWR5iQNOt/L4+Y="; }; # crun patchelf proot runc fakechroot # are download statistically linked during runtime buildInputs = [ singularity - ] ++ (with python3Packages; [ - pytest-runner - pycurl - ]); + ]; - patches = [ - (fetchpatch { - url = "https://github.com/indigo-dc/udocker/commit/9f7d6c5f9a3925bf87d000603c5b306d73bb0fa3.patch"; - sha256 = "sha256-fiqvVqfdVIlILbSs6oDWmbWU9piZEI2oiAKUcmecx9Q="; - }) + dependencies = with python3Packages; [ + pycurl ]; nativeCheckInputs = with python3Packages; [ + pytest-runner pytestCheckHook ]; @@ -47,13 +43,17 @@ python3Packages.buildPythonApplication rec { "tests/unit/test_dockerioapi.py" ]; - meta = with lib; { - description = "basic user tool to execute simple docker containers in user space without root privileges"; - homepage = "https://indigo-dc.gitbooks.io/udocker"; - license = licenses.asl20; - maintainers = [ maintainers.bzizou ]; - platforms = platforms.linux; - mainProgram = "udocker"; + passthru = { + tests.version = testers.testVersion { package = udocker; }; }; + meta = { + description = "basic user tool to execute simple docker containers in user space without root privileges"; + homepage = "https://indigo-dc.gitbooks.io/udocker"; + changelog = "https://github.com/indigo-dc/udocker/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bzizou ]; + platforms = lib.platforms.linux; + mainProgram = "udocker"; + }; } From 086d965047a4366863493b3655c27b41688d72c8 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 15 Aug 2024 10:24:29 +0200 Subject: [PATCH 157/357] tart: 2.14.0 -> 2.18.0 --- pkgs/applications/virtualization/tart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index 19ffd92db818..cddad036d68e 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.14.0"; + version = "2.18.0"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-3I4WSdWfPZd//pJiYXKcgpjx8qv4nSeMHHGJE1ja00o="; + hash = "sha256-no05QZpvaF7Kn9lU26lXjimHJn7xHydmh7Rv50aXPm4="; }; sourceRoot = "."; From a46c4c831f21d9a44afade10de55ac3cb79a2a4d Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 15 Aug 2024 11:08:59 +0200 Subject: [PATCH 158/357] espflash: 3.1.0 -> 3.1.1 --- pkgs/by-name/es/espflash/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix index 04ef9a62eaf7..2b6baaf48e9f 100644 --- a/pkgs/by-name/es/espflash/package.nix +++ b/pkgs/by-name/es/espflash/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "espflash"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espflash"; - rev = "v${version}"; - hash = "sha256-Tp74x5qgccq/7z1y0ozjiooPFxO7miDPuXBZ+XEKaW0="; + rev = "refs/tags/v${version}"; + hash = "sha256-NplHzdUHlBgujH8rLYT5VbYBV7NljMJEbMAxZ5ZK8JY="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; - cargoHash = "sha256-kn79kNS+vres7rhHMANAofqFv0k8Bg4HVEWBJvz7CSY="; + cargoHash = "sha256-iA8VJj0btFHUoyY7w8kR+9AU5Yrts4ctr90jxlWQu4c="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd espflash \ From 49a8916e9e2b9372e93b982cb962a74537390d3f Mon Sep 17 00:00:00 2001 From: Mrmaxmeier Date: Thu, 15 Aug 2024 13:50:34 +0200 Subject: [PATCH 159/357] 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 a78aafe88de8d9e22a6afd6975a5edfba68694f1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 14 Aug 2024 20:39:18 +0800 Subject: [PATCH 160/357] xfce.xfburn: 0.7.1 -> 0.7.2 https://gitlab.xfce.org/apps/xfburn/-/compare/xfburn-0.7.1...xfburn-0.7.2 --- pkgs/desktops/xfce/applications/xfburn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfburn/default.nix b/pkgs/desktops/xfce/applications/xfburn/default.nix index af652b1ad225..9212c6857c19 100644 --- a/pkgs/desktops/xfce/applications/xfburn/default.nix +++ b/pkgs/desktops/xfce/applications/xfburn/default.nix @@ -15,10 +15,10 @@ mkXfceDerivation { category = "apps"; pname = "xfburn"; - version = "0.7.1"; + version = "0.7.2"; odd-unstable = false; - sha256 = "sha256-wKJ9O4V1b2SoqC4dDKKLg7u8IK9TcjVEa4ZxQv3UOOI="; + sha256 = "sha256-eJ+MxNdJiDTLW4GhrwgQIyFuOSTWsF34Oet9HJAtIqI="; nativeBuildInputs = [ libxslt From 0da1fedd66f7688663b208535e30ecf984cc1113 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 14 Aug 2024 20:41:04 +0800 Subject: [PATCH 161/357] xfce.xfce4-notifyd: 0.9.4 -> 0.9.6 https://gitlab.xfce.org/apps/xfce4-notifyd/-/compare/xfce4-notifyd-0.9.4...xfce4-notifyd-0.9.6 --- pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index c7a1f94177e8..1ef2a37f7b8c 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -17,10 +17,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.9.4"; + version = "0.9.6"; odd-unstable = false; - sha256 = "sha256-oDvP2xE/KvIKl7D5hAwROxhqpli7G/UNd51YCdT7Dv4="; + sha256 = "sha256-TxVz9fUvuS5bl9eq9isalez3/Pro366TGFMBQ2DfIVI="; buildInputs = [ dbus @@ -37,8 +37,6 @@ mkXfceDerivation { xfconf ]; - env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - configureFlags = [ "--enable-dbus-start-daemon" "--enable-sound" From cc8e3c2dca7223414bcc553d48e07f18dadb5d56 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 15 Aug 2024 14:29:24 +0200 Subject: [PATCH 162/357] taler-exchange: 0.11.2 -> 0.12.0 --- pkgs/by-name/ta/taler-exchange/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix index e030e2aaaacb..4bea04b1c29e 100644 --- a/pkgs/by-name/ta/taler-exchange/package.nix +++ b/pkgs/by-name/ta/taler-exchange/package.nix @@ -21,7 +21,7 @@ }: let - version = "0.11.2"; + version = "0.12.0"; in stdenv.mkDerivation { pname = "taler-exchange"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { url = "https://git.taler.net/exchange.git"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-DflUfXAe310LRhZmaHgF1ZpCi+hHF30lpzAIpI1HZvM="; + hash = "sha256-yHRRMlqFA2OiFg0rBVzn7130wyVaxKn2dChFTPnVtbs="; }; nativeBuildInputs = [ From 3ed4ecde655f71f7e565e43d03d64cc1d503f041 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 15 Aug 2024 14:29:38 +0200 Subject: [PATCH 163/357] taler-merchant: 0.11.3 -> 0.12.0 --- pkgs/by-name/ta/taler-merchant/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix index 730d318a3e5f..b5762464c3ab 100644 --- a/pkgs/by-name/ta/taler-merchant/package.nix +++ b/pkgs/by-name/ta/taler-merchant/package.nix @@ -12,13 +12,13 @@ }: let - version = "0.11.3"; + version = "0.12.0"; taler-wallet-core = fetchgit { url = "https://git.taler.net/wallet-core.git"; - # https://taler.net/fr/news/2024-11.html - rev = "v0.11.2"; - hash = "sha256-GtR87XqmunYubh9EiY3bJIqXiXrT+re3KqWypYK3NCo="; + # https://taler.net/en/news/2024-23.html + rev = "v0.12.7"; + hash = "sha256-5fyPPrRCKvHTgipIpKqHX3iH5f+wTuyfsAKgKmvl1nI="; }; in stdenv.mkDerivation { @@ -29,7 +29,7 @@ stdenv.mkDerivation { url = "https://git.taler.net/merchant.git"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-Rak6p8cuCHPZxrXqrv3YUU3pFFw4GWf8bcd3Ur+o7Wg="; + hash = "sha256-BNIVlL+YPqqRZUhHOR/eH38dSHn/kNyCbMyz0ICxAMk="; }; postUnpack = '' From 8a65cc328a6597f1d05c3baa370eeded4816ef00 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 15 Aug 2024 14:29:54 +0200 Subject: [PATCH 164/357] challenger: 0.11.0 -> 0.12.0 --- pkgs/by-name/ch/challenger/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/challenger/package.nix b/pkgs/by-name/ch/challenger/package.nix index 108c7a77eaea..eff7aa170020 100644 --- a/pkgs/by-name/ch/challenger/package.nix +++ b/pkgs/by-name/ch/challenger/package.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "challenger"; - version = "0.11.0"; + version = "0.12.0"; src = fetchgit { url = "https://git.taler.net/challenger.git"; rev = "v${finalAttrs.version}"; - hash = "sha256-utME8ywCf4hjgOZWp4j2+dNPPLbAqHd80A62waVvONE="; + hash = "sha256-Qntwtcjjtu3Mbr8Wi5pgFq8KENaycGR4Y3hJ5+LBgTI="; }; # https://git.taler.net/challenger.git/tree/bootstrap From ee07f70eb228dc203d26400cce64906a66fcf193 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 15 Aug 2024 14:40:12 +0200 Subject: [PATCH 165/357] grafana: 11.1.3 -> 11.1.4, fix CVE-2024-6837 ChangeLog: https://github.com/grafana/grafana/releases/tag/v11.1.4 --- pkgs/servers/monitoring/grafana/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index a26d3418e075..9d3a0785fe31 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "grafana"; - version = "11.1.3"; + version = "11.1.4"; subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ]; @@ -16,7 +16,7 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-PfkKBKegMk+VjVJMocGj+GPTuUJipjD8+857skwmoco="; + hash = "sha256-KK6LDq9CHSrif2LOWW20PswiDk1zLwx3/QV3Q06tzbo="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 From 2b9f773ad83a23d12389226b7adc85ac35e8e40e Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Thu, 25 Jul 2024 11:25:57 +0200 Subject: [PATCH 166/357] fuzzdb: init at 0-unstable-2020-02-26 --- pkgs/by-name/fu/fuzzdb/package.nix | 33 ++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/fu/fuzzdb/package.nix diff --git a/pkgs/by-name/fu/fuzzdb/package.nix b/pkgs/by-name/fu/fuzzdb/package.nix new file mode 100644 index 000000000000..77c8c1dc94e0 --- /dev/null +++ b/pkgs/by-name/fu/fuzzdb/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, +}: + +stdenvNoCC.mkDerivation { + pname = "fuzzdb"; + version = "0-unstable-2020-02-26"; + + src = fetchFromGitHub { + owner = "fuzzdb-project"; + repo = "fuzzdb"; + rev = "5656ab25dc6bb43bae32236fab775658a90d7380"; + hash = "sha256-7AORrXi443+VK5lbgcjqW4QS7asbXu/dCKj8uCMC0PY="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/{fuzzdb,wordlists/fuzzdb} + mv docs web-backdoors $out/share/fuzzdb + mv */ $out/share/wordlists/fuzzdb + runHook postInstall + ''; + + meta = { + description = "Comprehensive collection of attack patterns and predictable resource names used for security testing and fuzzing application"; + homepage = "https://github.com/fuzzdb-project/fuzzdb"; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ d3vil0p3r ]; + platforms = lib.platforms.all; + }; +} From 360712ba9a54c6e19062eda065dc60a027c69361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 15 Aug 2024 08:08:05 -0700 Subject: [PATCH 167/357] python312Packages.bx-py-utils: 94 -> 95 Diff: https://github.com/boxine/bx_py_utils/compare/refs/tags/v94...v95 Changelog: https://github.com/boxine/bx_py_utils/releases/tag/refs/tags/v95 --- pkgs/development/python-modules/bx-py-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix index 72872780f8d0..4b90be2ec9dd 100644 --- a/pkgs/development/python-modules/bx-py-utils/default.nix +++ b/pkgs/development/python-modules/bx-py-utils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bx-py-utils"; - version = "94"; + version = "95"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "boxine"; repo = "bx_py_utils"; rev = "refs/tags/v${version}"; - hash = "sha256-IvmH0D3544zBukDQN6mea/nI1G4qZL+8KbIcF1Pehc8="; + hash = "sha256-OClJjttOb21NnukOapEtXn/XNw9p6SUe3MY68FR9GWc="; }; postPatch = '' From 6967dc4ce956d006a26eabd9303f51c4cdf36c0a Mon Sep 17 00:00:00 2001 From: ToasterUwU Date: Thu, 15 Aug 2024 17:11:32 +0200 Subject: [PATCH 168/357] rqbit: 5.6.1 -> 6.0.0 Diff: ikatson/rqbit@v5.6.1...v6.0.0 Changelog: https://github.com/ikatson/rqbit/releases/tag/v6.0.0 --- pkgs/by-name/rq/rqbit/Cargo.lock | 756 ++++++++++++++++++------------ pkgs/by-name/rq/rqbit/package.nix | 6 +- 2 files changed, 460 insertions(+), 302 deletions(-) diff --git a/pkgs/by-name/rq/rqbit/Cargo.lock b/pkgs/by-name/rq/rqbit/Cargo.lock index e8515b5987b2..16673eb56f63 100644 --- a/pkgs/by-name/rq/rqbit/Cargo.lock +++ b/pkgs/by-name/rq/rqbit/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", ] @@ -17,6 +17,18 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" version = "1.1.3" @@ -26,6 +38,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -43,47 +61,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", @@ -91,15 +110,15 @@ 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-recursion" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", @@ -130,9 +149,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", @@ -140,10 +159,16 @@ dependencies = [ ] [[package]] -name = "autocfg" -version = "1.2.0" +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" @@ -158,7 +183,7 @@ dependencies = [ "futures-util", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.28", + "hyper 0.14.30", "itoa", "matchit", "memchr", @@ -184,9 +209,9 @@ dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.1", "hyper-util", "itoa", "matchit", @@ -234,7 +259,7 @@ dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", @@ -258,9 +283,9 @@ dependencies = [ [[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", @@ -279,9 +304,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[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 = "bincode" @@ -300,9 +325,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 = "bitvec" @@ -339,15 +364,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cc" -version = "1.0.95" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" [[package]] name = "cfg-if" @@ -367,7 +392,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -389,7 +414,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.10.0", ] [[package]] @@ -421,9 +446,9 @@ checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[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 = "commoncrypto" @@ -507,27 +532,27 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -553,9 +578,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -563,23 +588,23 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.11.1", "syn", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", @@ -593,13 +618,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", "serde", ] +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + [[package]] name = "deranged" version = "0.3.11" @@ -643,9 +674,9 @@ dependencies = [ [[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 = "encoding_rs" @@ -664,9 +695,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", @@ -674,9 +705,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fixedbitset" @@ -686,9 +717,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" dependencies = [ "crc32fast", "miniz_oxide", @@ -840,9 +871,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", @@ -851,9 +882,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 = "h2" @@ -867,7 +898,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.6", + "indexmap 2.3.0", "slab", "tokio", "tokio-util", @@ -876,17 +907,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http 1.1.0", - "indexmap 2.2.6", + "indexmap 2.3.0", "slab", "tokio", "tokio-util", @@ -901,9 +932,13 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[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 = "hdrhistogram" @@ -977,9 +1012,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http 1.1.0", @@ -987,22 +1022,22 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "pin-project-lite", ] [[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 = "httpdate" @@ -1018,9 +1053,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -1042,16 +1077,16 @@ dependencies = [ [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.4", + "h2 0.4.5", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "httparse", "httpdate", "itoa", @@ -1063,19 +1098,20 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.26.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.3.1", + "hyper 1.4.1", "hyper-util", "rustls", "rustls-pki-types", "tokio", "tokio-rustls", "tower-service", + "webpki-roots", ] [[package]] @@ -1084,7 +1120,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper 0.14.28", + "hyper 0.14.30", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -1098,7 +1134,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.1", "hyper-util", "native-tls", "tokio", @@ -1108,16 +1144,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", - "http-body 1.0.0", - "hyper 1.3.1", + "http-body 1.0.1", + "hyper 1.4.1", "pin-project-lite", "socket2", "tokio", @@ -1178,20 +1214,20 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -1202,6 +1238,12 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.12.1" @@ -1228,26 +1270,26 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "leaky-bucket" -version = "1.0.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb491abd89e9794d50f93c8db610a29509123e3fbbc9c8c67a528e9391cd853" +checksum = "0a396bb213c2d09ed6c5495fd082c991b6ab39c9daf4fff59e6727f85c73e4c5" dependencies = [ "parking_lot", + "pin-project-lite", "tokio", - "tracing", ] [[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" @@ -1255,13 +1297,13 @@ 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", ] [[package]] name = "librqbit" -version = "5.6.1" +version = "6.0.0" dependencies = [ "anyhow", "async-stream", @@ -1287,6 +1329,9 @@ dependencies = [ "librqbit-sha1-wrapper", "librqbit-tracker-comms", "librqbit-upnp", + "lru", + "memmap2", + "mime_guess", "openssl", "parking_lot", "rand", @@ -1314,7 +1359,7 @@ dependencies = [ [[package]] name = "librqbit-bencode" -version = "2.2.2" +version = "2.2.3" dependencies = [ "anyhow", "librqbit-buffers", @@ -1325,7 +1370,7 @@ dependencies = [ [[package]] name = "librqbit-buffers" -version = "3.0.0" +version = "3.0.1" dependencies = [ "librqbit-clone-to-owned", "serde", @@ -1337,9 +1382,10 @@ version = "2.2.1" [[package]] name = "librqbit-core" -version = "3.7.0" +version = "3.9.0" dependencies = [ "anyhow", + "data-encoding", "directories", "hex 0.4.3", "itertools", @@ -1358,7 +1404,7 @@ dependencies = [ [[package]] name = "librqbit-dht" -version = "5.0.3" +version = "5.0.4" dependencies = [ "anyhow", "backoff", @@ -1366,7 +1412,7 @@ dependencies = [ "dashmap", "futures", "hex 0.4.3", - "indexmap 2.2.6", + "indexmap 2.3.0", "leaky-bucket", "librqbit-bencode", "librqbit-clone-to-owned", @@ -1384,7 +1430,7 @@ dependencies = [ [[package]] name = "librqbit-peer-protocol" -version = "3.5.3" +version = "3.6.0" dependencies = [ "anyhow", "bincode", @@ -1406,7 +1452,7 @@ dependencies = [ [[package]] name = "librqbit-tracker-comms" -version = "1.0.2" +version = "1.0.3" dependencies = [ "anyhow", "async-stream", @@ -1443,15 +1489,15 @@ dependencies = [ [[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", @@ -1459,9 +1505,18 @@ 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" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +dependencies = [ + "hashbrown 0.14.5", +] [[package]] name = "matchers" @@ -1480,9 +1535,18 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[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 = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] [[package]] name = "mime" @@ -1490,6 +1554,16 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -1498,31 +1572,31 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[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", ] [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -1617,9 +1691,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -1640,28 +1714,18 @@ dependencies = [ [[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 = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[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", ] @@ -1674,11 +1738,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -1706,18 +1770,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[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", ] [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -1740,9 +1804,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[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", @@ -1750,9 +1814,9 @@ 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 = [ "backtrace", "cfg-if", @@ -1761,7 +1825,7 @@ dependencies = [ "redox_syscall", "smallvec", "thread-id", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -1783,12 +1847,12 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.2.6", + "indexmap 2.3.0", ] [[package]] @@ -1837,24 +1901,27 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[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-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", ] [[package]] name = "prost" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", "prost-derive", @@ -1862,9 +1929,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", "itertools", @@ -1875,13 +1942,61 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ "prost", ] +[[package]] +name = "quinn" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "socket2", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" version = "1.0.36" @@ -1929,11 +2044,11 @@ dependencies = [ [[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 2.6.0", ] [[package]] @@ -1949,14 +2064,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -1970,13 +2085,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -1987,26 +2102,26 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.4.4", + "h2 0.4.5", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.1", "hyper-rustls", "hyper-tls", "hyper-util", @@ -2018,13 +2133,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "quinn", "rustls", "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "system-configuration", "tokio", "tokio-native-tls", @@ -2064,7 +2180,7 @@ dependencies = [ [[package]] name = "rqbit" -version = "5.6.1" +version = "6.0.0" dependencies = [ "anyhow", "bytes", @@ -2087,9 +2203,15 @@ 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-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustix" @@ -2097,7 +2219,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", @@ -2106,11 +2228,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ - "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -2120,25 +2242,25 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -2147,15 +2269,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" @@ -2174,11 +2296,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 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -2187,9 +2309,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", @@ -2197,9 +2319,9 @@ dependencies = [ [[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", ] @@ -2218,9 +2340,9 @@ dependencies = [ [[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", @@ -2229,11 +2351,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -2262,15 +2385,15 @@ 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 = [ - "base64 0.21.7", + "base64 0.22.1", "chrono", "hex 0.4.3", "indexmap 1.9.3", - "indexmap 2.2.6", + "indexmap 2.3.0", "serde", "serde_derive", "serde_json", @@ -2280,9 +2403,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", @@ -2337,9 +2460,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", @@ -2358,16 +2481,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "subtle" -version = "2.5.0" +name = "strsim" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.60" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -2415,30 +2544,31 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", "windows-sys 0.52.0", ] [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -2447,9 +2577,9 @@ dependencies = [ [[package]] name = "thread-id" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b" +checksum = "cfe8f25bbdd100db7e1d34acf7fd2dc59c4bf8f7483f505eaa7d4f12f76cc0ea" dependencies = [ "libc", "winapi", @@ -2498,9 +2628,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", ] @@ -2513,20 +2643,19 @@ 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", - "num_cpus", "pin-project-lite", "socket2", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2541,9 +2670,9 @@ dependencies = [ [[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", @@ -2562,9 +2691,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", "rustls-pki-types", @@ -2598,16 +2727,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -2624,7 +2752,7 @@ dependencies = [ "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.28", + "hyper 0.14.30", "hyper-timeout", "percent-encoding", "pin-project", @@ -2663,10 +2791,10 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "pin-project-lite", "tower-layer", @@ -2773,6 +2901,15 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + [[package]] name = "unicode-bidi" version = "0.3.15" @@ -2802,9 +2939,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", @@ -2819,15 +2956,15 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[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 = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", ] @@ -2846,9 +2983,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[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 = "want" @@ -2943,9 +3080,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -2978,7 +3115,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]] @@ -2996,7 +3133,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]] @@ -3016,18 +3153,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]] @@ -3038,9 +3175,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" @@ -3050,9 +3187,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" @@ -3062,15 +3199,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" @@ -3080,9 +3217,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" @@ -3092,9 +3229,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" @@ -3104,9 +3241,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" @@ -3116,9 +3253,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 = "winreg" @@ -3141,12 +3278,33 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[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/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix index ecab085a8e63..d02fe269203b 100644 --- a/pkgs/by-name/rq/rqbit/package.nix +++ b/pkgs/by-name/rq/rqbit/package.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "rqbit"; - version = "5.6.1"; + version = "6.0.0"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - hash = "sha256-SRom/rLyF7R+ESWsAKeLLujvuj5w7+Evlsm+8BKe2f0="; + hash = "sha256-YOjFCX1Ckk0M2QOGoYKoY80TFnHs00aVJJAWv2RIp4A="; }; cargoLock = { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ikatson/rqbit"; changelog = "https://github.com/ikatson/rqbit/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ cafkafk ]; + maintainers = with maintainers; [ cafkafk toasteruwu ]; mainProgram = "rqbit"; }; } From 5a2db755877235a7a11a8f0948b05afe04b58da5 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 15 Aug 2024 15:18:42 +0000 Subject: [PATCH 169/357] weechat-unwrapped: 4.3.5 -> 4.3.6 https://github.com/weechat/weechat/releases/tag/v4.3.6 --- pkgs/applications/networking/irc/weechat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index e51fdb97aaa6..f398b4a6b035 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.3.5"; + version = "4.3.6"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-5tvEyDLaXFuF5Jb+/BUjf7viqPe6L76B7gcdwMZrS+M="; + hash = "sha256-h4sGORUy3cQPS0lUYqIX68OZJeLq3+TfhOdqMxNkfJk="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 From b89e50748cad6fa6f19097ba251e739f300042b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 16:06:05 +0000 Subject: [PATCH 170/357] 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 171/357] 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 172/357] 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 188484bb9633d74eb5313f96416c81d3d9517e56 Mon Sep 17 00:00:00 2001 From: Fede Barcelona Date: Mon, 5 Aug 2024 16:46:56 +0200 Subject: [PATCH 173/357] sysdig-cli-scanner: init at 1.13.2 Co-authored-by: Alexis Hildebrandt --- .../by-name/sy/sysdig-cli-scanner/package.nix | 55 ++++++++++++++++++ .../sysdig-cli-scanner.versions.nix | 23 ++++++++ pkgs/by-name/sy/sysdig-cli-scanner/update.sh | 56 +++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 pkgs/by-name/sy/sysdig-cli-scanner/package.nix create mode 100644 pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix create mode 100755 pkgs/by-name/sy/sysdig-cli-scanner/update.sh diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/package.nix b/pkgs/by-name/sy/sysdig-cli-scanner/package.nix new file mode 100644 index 000000000000..cb976d6fd3bb --- /dev/null +++ b/pkgs/by-name/sy/sysdig-cli-scanner/package.nix @@ -0,0 +1,55 @@ +{ + stdenv, + lib, + fetchurl, + makeWrapper, +}: +let + versionMetadata = import ./sysdig-cli-scanner.versions.nix; + fetchForSystem = versionMetadata.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); +in +stdenv.mkDerivation { + pname = "sysdig-cli-scanner"; + version = versionMetadata.version; + + src = fetchurl { inherit (fetchForSystem) url hash; }; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm755 -T $src $out/bin/sysdig-cli-scanner + + wrapProgram $out/bin/sysdig-cli-scanner \ + --add-flags --dbpath="\$HOME/.cache/sysdig-cli-scanner/" + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Tool for scanning container images and directories using Sysdig"; + longDescription = '' + The Sysdig Vulnerability CLI Scanner, sysdig-cli-scanner, is a versatile tool designed to + manually scan container images and directories, whether they are located locally or remotely. + Depending on your specific use case, you have the flexibility to execute sysdig-cli-scanner + in Vulnerability Management (VM) mode for image scanning or Infrastructure as Code (IaC) mode + for scanning directories. + ''; + homepage = "https://docs.sysdig.com/en/docs/installation/sysdig-secure/install-vulnerability-cli-scanner/"; + mainProgram = "sysdig-cli-scanner"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ tembleking ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix new file mode 100644 index 000000000000..b745582238e4 --- /dev/null +++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix @@ -0,0 +1,23 @@ +{ + version = "1.13.2"; + + x86_64-linux = { + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.13.2/linux/amd64/sysdig-cli-scanner"; + hash = "sha256-nFQ+xDiB7CA9mfQlRiTH/FvyZMKZ0YH8Gzn4ZuZ/Ucc="; + }; + + aarch64-linux = { + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.13.2/linux/arm64/sysdig-cli-scanner"; + hash = "sha256-IscMTVzEbWImFZa7uXNp2K6Gplnq2LZoVPoAo5oIZ1U="; + }; + + x86_64-darwin = { + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.13.2/darwin/amd64/sysdig-cli-scanner"; + hash = "sha256-Xgip9cquafpRuYcXnnCF5ptFi774EocBZ535b/LzXUQ="; + }; + + aarch64-darwin = { + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.13.2/darwin/arm64/sysdig-cli-scanner"; + hash = "sha256-l/u8UV9O5/mFrNHpyIaKvXbVCQ+Fh6binJLv7MCHrtM="; + }; +} diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/update.sh b/pkgs/by-name/sy/sysdig-cli-scanner/update.sh new file mode 100755 index 000000000000..b5b3191e21ff --- /dev/null +++ b/pkgs/by-name/sy/sysdig-cli-scanner/update.sh @@ -0,0 +1,56 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p bash curl jq + +set -euo pipefail + +LATEST_VERSION=$(curl -L -s https://download.sysdig.com/scanning/sysdig-cli-scanner/latest_version.txt) +SUPPORTED_OPERATING_SYSTEMS=("linux" "darwin") +SUPPORTED_ARCHITECTURES=("x86_64" "aarch64") +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +VERSIONS_FILE="${SCRIPT_DIR}/sysdig-cli-scanner.versions.nix" + +main() { + echo "{" > "$VERSIONS_FILE" + echo " version = \"${LATEST_VERSION}\";" >> "$VERSIONS_FILE" + for os in "${SUPPORTED_OPERATING_SYSTEMS[@]}"; do + for arch in "${SUPPORTED_ARCHITECTURES[@]}"; do + formatted_arch=$(formatArchitectureForURL "$arch") + download_url="https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/${LATEST_VERSION}/${os}/${formatted_arch}/sysdig-cli-scanner" + file_hash=$(fetchFileHash "$download_url") + appendToVersionsFile "$VERSIONS_FILE" "$arch" "$os" "$download_url" "$file_hash" + done + done + echo "}" >> "$VERSIONS_FILE" +} + +formatArchitectureForURL() { + local architecture="$1" + case "$architecture" in + x86_64) echo "amd64" ;; + aarch64) echo "arm64" ;; + *) echo "Unsupported architecture: $architecture" >&2; return 1 ;; + esac +} + +fetchFileHash() { + local url="$1" + nix store prefetch-file --json "$url" | jq -r .hash +} + +appendToVersionsFile() { + local file="$1" + local architecture="$2" + local operating_system="$3" + local url="$4" + local hash="$5" + cat >> "$file" << EOF + + ${architecture}-${operating_system} = { + url = "$url"; + hash = "$hash"; + }; +EOF +} + +main + From 8e75f95b3f74ed8815ccbaaecebb1685b5f6ab6b Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Thu, 15 Aug 2024 20:08:49 +0200 Subject: [PATCH 174/357] vscode: 1.92.1 -> 1.92.2 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 3116cdb59872..c4ef3e430205 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "13572vj8izdkglrpk36z1nb3va3lbmsh885g1ix38x49hr3wjwaq"; - x86_64-darwin = "1xz0rhkpwiji60vy7klm424fdzs8393jggaswsbyapkj3g9nrkpb"; - aarch64-linux = "17rci7w2g595ziv1ylvzc5dhh0bc9l3a7mkl4lfljv6gaprdk766"; - aarch64-darwin = "1rxvlc36yrzdji0qdackp14a0xlhyj0iylxscz50gvnvfv2pdysm"; - armv7l-linux = "09iwsnr09cry9f6c4v7pkrdbcr8fnydjrmypjk5942dzz0b07lkr"; + x86_64-linux = "0kfkn40a44ql6j4c8a1rsw5bqysj0i5k3qllq1rl2zglfx7v4vkk"; + x86_64-darwin = "1iwl64wn5by6a4qdimxah76j90sv9as1908vgqxwhzj7plfcn6x5"; + aarch64-linux = "02r8yl767cf972xyi0qky2yxli4jid3r474wg4lvhk7px4ajh4zj"; + aarch64-darwin = "0d64dxm079v1v5c46c8brvmcdxawv70jyzp4hqnlxki1hpjxwbff"; + armv7l-linux = "0ra50i827asq3y4d3qk9b3gnrrrq9vi5z14nw5wphgz139gqbxwj"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.92.1"; + version = "1.92.2"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "eaa41d57266683296de7d118f574d0c2652e1fc4"; + rev = "fee1edb8d6d72a0ddff41e5f71a671c23ed924b9"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "0g131nicp5j71phsfi187ggjx5952awvl0gy9983990sdxaah01x"; + sha256 = "0n54l0s3p7nq3kc7jwdfsdq1k7p1v2ds17cwbfh3v9jifxqwws11"; }; }; From ce04ac85a4b6e537955178b4b164710351dc5318 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 15 Aug 2024 17:19:58 +0200 Subject: [PATCH 175/357] vulkan-validation-layers: fix build --- pkgs/development/tools/vulkan-validation-layers/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 57891ca16155..fdcf2994c189 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -13,6 +13,7 @@ , libXdmcp , libXrandr , spirv-headers +, spirv-tools , vulkan-headers , vulkan-utility-libraries , wayland @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { libXrandr libffi libxcb + spirv-tools vulkan-headers vulkan-utility-libraries wayland From 779eeed02f549493cae73afd5de5dbcd9659cb17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 18:55:41 +0000 Subject: [PATCH 176/357] python312Packages.django-ninja: 1.2.2 -> 1.3.0 --- pkgs/development/python-modules/django-ninja/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-ninja/default.nix b/pkgs/development/python-modules/django-ninja/default.nix index 04f582bd9f61..4a953cfed3fd 100644 --- a/pkgs/development/python-modules/django-ninja/default.nix +++ b/pkgs/development/python-modules/django-ninja/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "django-ninja"; - version = "1.2.2"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vitalik"; repo = "django-ninja"; rev = "refs/tags/v${version}"; - hash = "sha256-wD2ZizvMEY9oDQZTr4KzbNY5sStf7lCyPPJBoaa4trU="; + hash = "sha256-fPlw9iTt1V8VXd0d5hw1i9LT96BcDkAlpBu9SPPd+hI="; }; propagatedBuildInputs = [ From a06263ee66d8f3e97e251b5de8555ce66e745e45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 19:30:21 +0000 Subject: [PATCH 177/357] stackit-cli: 0.10.0 -> 0.11.0 --- pkgs/by-name/st/stackit-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 7f9f2c15fce9..5cffda41dcba 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-+kIfw2lCRaQcpz4UUCZt6wTthF/otgma9JTQx3n+N5c="; + hash = "sha256-ioV5ki2Jkbo/Ax9XDp/gm9NFTFS9604VAwOgs8wkoKU="; }; - vendorHash = "sha256-1jUfhLodmJhV5X1EkRgOJ8jQF83Lu+8U+tC8tDoyCdk="; + vendorHash = "sha256-1MM4P4eLBZvYgmdYjaihe30qnCvTuY7ZHnAZei3dHhQ="; subPackages = [ "." ]; From 47f18ddbda07f8f062c36cff8044c096db82c0c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 19:30:41 +0000 Subject: [PATCH 178/357] python312Packages.resend: 2.3.0 -> 2.4.0 --- pkgs/development/python-modules/resend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix index 849e5b1bee8f..acb8871f01f3 100644 --- a/pkgs/development/python-modules/resend/default.nix +++ b/pkgs/development/python-modules/resend/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "resend"; - version = "2.3.0"; + version = "2.4.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "resend"; repo = "resend-python"; rev = "refs/tags/v${version}"; - hash = "sha256-cgeHkueH060vDvx3r6QP6e72l10zZ6mhUosWxIakG2g="; + hash = "sha256-pxHDR9hJWhNHwSYJbakOCEkJbHU/RDhvTy5AGyfr33w="; }; build-system = [ setuptools ]; From c9448d63fc0b8455af7fe658c68eba51da01deb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 19:50:13 +0000 Subject: [PATCH 179/357] 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 6e8fa427085b5a25aec3a95fb441e9e195c48b23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 19:50:17 +0000 Subject: [PATCH 180/357] srm-cuarzo: 0.7.0-1 -> 0.7.1-1 --- pkgs/by-name/sr/srm-cuarzo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index fe06aba60695..a02741bb5dae 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -14,9 +14,9 @@ }: stdenv.mkDerivation (self: { pname = "srm-cuarzo"; - version = "0.7.0-1"; + version = "0.7.1-1"; rev = "v${self.version}"; - hash = "sha256-IiHcJyF7lxS/OXU/TGRrzOGNk1kKknyZ4WxMIJshZXs="; + hash = "sha256-cwZWEuht4XClVUQomMKUA3GScaxv7xBxj3tJhmDYG6Y="; src = fetchFromGitHub { inherit (self) rev hash; From db56e15d04c8038964c12a419a69f8a99b31c99f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 21:56:34 +0200 Subject: [PATCH 181/357] 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 182/357] 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 183/357] 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 52acc681ff0e918768efd7cc68393b8800066ddc Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 15 Aug 2024 10:58:12 -0300 Subject: [PATCH 184/357] godot_4: refactor - nixfmt - order by phases order, alphabetical order - enable strictDeps --- pkgs/development/tools/godot/4/default.nix | 179 ++++++++++++--------- 1 file changed, 99 insertions(+), 80 deletions(-) diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index 9c183ec79fff..2afce44d9e28 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -1,46 +1,49 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, autoPatchelfHook -, installShellFiles -, scons -, vulkan-loader -, libGL -, libX11 -, libXcursor -, libXinerama -, libXext -, libXrandr -, libXrender -, libXi -, libXfixes -, libxkbcommon -, alsa-lib -, libpulseaudio -, dbus -, speechd-minimal -, fontconfig -, udev -, withDebug ? false -, withPlatform ? "linuxbsd" -, withTarget ? "editor" -, withPrecision ? "single" -, withPulseaudio ? true -, withDbus ? true -, withSpeechd ? true -, withFontconfig ? true -, withUdev ? true -, withTouch ? true +{ + alsa-lib, + autoPatchelfHook, + dbus, + fetchFromGitHub, + fontconfig, + installShellFiles, + lib, + libGL, + libpulseaudio, + libX11, + libXcursor, + libXext, + libXfixes, + libXi, + libXinerama, + libxkbcommon, + libXrandr, + libXrender, + pkg-config, + scons, + speechd-minimal, + stdenv, + udev, + vulkan-loader, + withDbus ? true, + withDebug ? false, + withFontconfig ? true, + withPlatform ? "linuxbsd", + withPrecision ? "single", + withPulseaudio ? true, + withSpeechd ? true, + withTarget ? "editor", + withTouch ? true, + withUdev ? true, }: -assert lib.asserts.assertOneOf "withPrecision" withPrecision [ "single" "double" ]; +assert lib.asserts.assertOneOf "withPrecision" withPrecision [ + "single" + "double" +]; let - mkSconsFlagsFromAttrSet = lib.mapAttrsToList (k: v: - if builtins.isString v - then "${k}=${v}" - else "${k}=${builtins.toJSON v}"); + mkSconsFlagsFromAttrSet = lib.mapAttrsToList ( + k: v: if builtins.isString v then "${k}=${v}" else "${k}=${builtins.toJSON v}" + ); in stdenv.mkDerivation rec { pname = "godot4"; @@ -54,40 +57,11 @@ stdenv.mkDerivation rec { hash = "sha256-anJgPEeHIW2qIALMfPduBVgbYYyz1PWCmPsZZxS9oHI="; }; - nativeBuildInputs = [ - pkg-config - autoPatchelfHook - installShellFiles + outputs = [ + "out" + "man" ]; - buildInputs = [ - scons - ]; - - runtimeDependencies = [ - vulkan-loader - libGL - libX11 - libXcursor - libXinerama - libXext - libXrandr - libXrender - libXi - libXfixes - libxkbcommon - alsa-lib - ] - ++ lib.optional withPulseaudio libpulseaudio - ++ lib.optional withDbus dbus - ++ lib.optional withDbus dbus.lib - ++ lib.optional withSpeechd speechd-minimal - ++ lib.optional withFontconfig fontconfig - ++ lib.optional withFontconfig fontconfig.lib - ++ lib.optional withUdev udev; - - enableParallelBuilding = true; - # Set the build name which is part of the version. In official downloads, this # is set to 'official'. When not specified explicitly, it is set to # 'custom_build'. Other platforms packaging Godot (Gentoo, Arch, Flatpack @@ -110,26 +84,63 @@ stdenv.mkDerivation rec { echo ${commitHash} > .git/HEAD ''; + # From: https://github.com/godotengine/godot/blob/4.2.2-stable/SConstruct sconsFlags = mkSconsFlagsFromAttrSet { # Options from 'SConstruct' + precision = withPrecision; # Floating-point precision level production = true; # Set defaults to build Godot for use in production platform = withPlatform; target = withTarget; - precision = withPrecision; # Floating-point precision level debug_symbols = withDebug; # Options from 'platform/linuxbsd/detect.py' - pulseaudio = withPulseaudio; # Use PulseAudio dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings - speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support fontconfig = withFontconfig; # Use fontconfig for system fonts support - udev = withUdev; # Use udev for gamepad connection callbacks + pulseaudio = withPulseaudio; # Use PulseAudio + speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support touch = withTouch; # Enable touch events + udev = withUdev; # Use udev for gamepad connection callbacks }; - dontStrip = withDebug; + enableParallelBuilding = true; - outputs = [ "out" "man" ]; + strictDeps = true; + + nativeBuildInputs = [ + autoPatchelfHook + installShellFiles + pkg-config + scons + ]; + + runtimeDependencies = + [ + alsa-lib + libGL + libX11 + libXcursor + libXext + libXfixes + libXi + libXinerama + libxkbcommon + libXrandr + libXrender + vulkan-loader + ] + ++ lib.optionals withDbus [ + dbus + dbus.lib + ] + ++ lib.optionals withFontconfig [ + fontconfig + fontconfig.lib + ] + ++ lib.optionals withPulseaudio [ libpulseaudio ] + ++ lib.optionals withSpeechd [ speechd-minimal ] + ++ lib.optionals withUdev [ udev ]; + + dontStrip = withDebug; installPhase = '' runHook preInstall @@ -151,11 +162,19 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://godotengine.org"; + changelog = "https://github.com/godotengine/godot/releases/tag/${version}"; description = "Free and Open Source 2D and 3D game engine"; + homepage = "https://godotengine.org"; license = lib.licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; - maintainers = with lib.maintainers; [ shiryel superherointj ]; + platforms = [ + "i686-linux" + "x86_64-linux" + "aarch64-linux" + ]; + maintainers = with lib.maintainers; [ + shiryel + superherointj + ]; mainProgram = "godot4"; }; } From 1747d9a68bb06ca76381a16e25f8fde52c72b098 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 15 Aug 2024 11:01:47 -0300 Subject: [PATCH 185/357] godot_4: migrate to pkgs/by-name --- .../godot/4/default.nix => by-name/go/godot_4/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/godot/4/default.nix => by-name/go/godot_4/package.nix} (100%) diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/by-name/go/godot_4/package.nix similarity index 100% rename from pkgs/development/tools/godot/4/default.nix rename to pkgs/by-name/go/godot_4/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee6ef32d5949..6bc419f3f311 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8277,8 +8277,6 @@ with pkgs; gocryptfs = callPackage ../tools/filesystems/gocryptfs { }; - godot_4 = callPackage ../development/tools/godot/4 { }; - godot3 = callPackage ../development/tools/godot/3 { }; godot3-export-templates = callPackage ../development/tools/godot/3/export-templates.nix { }; From 26eb674c5d0c0c9bb66b6836cc23805bacb532dc Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 15 Aug 2024 16:58:40 -0300 Subject: [PATCH 186/357] godot_4: fix cross compilation Co-authored-by: Anderson Torres --- pkgs/by-name/go/godot_4/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/go/godot_4/package.nix b/pkgs/by-name/go/godot_4/package.nix index 2afce44d9e28..1f897675e13a 100644 --- a/pkgs/by-name/go/godot_4/package.nix +++ b/pkgs/by-name/go/godot_4/package.nix @@ -1,6 +1,7 @@ { alsa-lib, autoPatchelfHook, + buildPackages, dbus, fetchFromGitHub, fontconfig, @@ -106,6 +107,11 @@ stdenv.mkDerivation rec { strictDeps = true; + depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + buildPackages.stdenv.cc + pkg-config + ]; + nativeBuildInputs = [ autoPatchelfHook installShellFiles From 2857eaf9bdce104d25e99754a22c19ec509e7bb3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 22:02:10 +0200 Subject: [PATCH 187/357] 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 9579df7a09b4713798833c1c5da8b8aa3898d452 Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Fri, 16 Aug 2024 05:04:00 +0900 Subject: [PATCH 188/357] immich-cli: 2.2.12 -> 2.2.15 --- pkgs/tools/misc/immich-cli/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/immich-cli/default.nix b/pkgs/tools/misc/immich-cli/default.nix index b02e58132939..8cf8212f8a83 100644 --- a/pkgs/tools/misc/immich-cli/default.nix +++ b/pkgs/tools/misc/immich-cli/default.nix @@ -5,13 +5,13 @@ }: let - version = "2.2.12"; + version = "2.2.15"; src = fetchFromGitHub { owner = "immich-app"; repo = "immich"; # Using a fixed commit until upstream has release tags for cli. - rev = "04340b3a6210dc7a00359e781815ee0b9cd1b8fd"; - hash = "sha256-PS1aZ6fcOudWlCFPuTeLBu3QrgUYnEuI5pBq3GGJ/bc="; + rev = "f7bfde6a3286d4b454c2f05ccf354914f8eccac6"; + hash = "sha256-O014Y2HwhfPqKKFFGtNDJBzCaR6ugI4azw6/kfzKET0="; }; meta' = { description = "CLI utilities for Immich to help upload images and videos"; @@ -25,7 +25,7 @@ let pname = "immich-cli-openapi-typescript-sdk"; inherit src version; - npmDepsHash = "sha256-TRFN+xg8BdvzJKP1Y7GJsoRaWqdGoxS3qYx1OlhnOoY="; + npmDepsHash = "sha256-rIN88xw8kdLfhFbT4OReTwzWqNlD4QVAAuvfMyda+V8="; postPatch = '' cd open-api/typescript-sdk @@ -44,7 +44,7 @@ let pname = "immich-cli"; inherit src version; - npmDepsHash = "sha256-rzjfGqYxrfGQHRCMiEpP229eSHCWVugMohQ/ZL1r1EQ="; + npmDepsHash = "sha256-r/kCE6FmhbnMVv2Z76hH/1O1YEYSq9VY5kB0xlqWzaM="; postPatch = '' ln -sv ${open-api-typescript-sdk}/lib/node_modules/@immich/sdk/{build,node_modules} open-api/typescript-sdk From cdd57ccde8687e47da81535bf1e61521544838ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 22:08:04 +0200 Subject: [PATCH 189/357] 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 190/357] 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 eaf27a2f3b788e7b781d79bf6a4a0503265aa053 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 15 Aug 2024 17:25:50 -0300 Subject: [PATCH 191/357] godot_4: 4.2.2-stable -> 4.3-stable https://github.com/godotengine/godot/releases/tag/4.3-stable --- pkgs/by-name/go/godot_4-export-templates/package.nix | 2 +- pkgs/by-name/go/godot_4/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/godot_4-export-templates/package.nix b/pkgs/by-name/go/godot_4-export-templates/package.nix index be1240737649..3514e649fddb 100644 --- a/pkgs/by-name/go/godot_4-export-templates/package.nix +++ b/pkgs/by-name/go/godot_4-export-templates/package.nix @@ -9,5 +9,5 @@ fetchzip { pname = "export_templates"; extension = "zip"; url = "https://github.com/godotengine/godot/releases/download/${godot_4.version}/Godot_v${godot_4.version}_export_templates.tpz"; - hash = "sha256-eomGLH9lbZhl7VtHTWjJ5mxVt0Yg8LfnAnpqoCksPgs="; + hash = "sha256-XRnKii+eexIkbGf7bqc42SR0NBULFvgMdOpSRNNk6kg="; } diff --git a/pkgs/by-name/go/godot_4/package.nix b/pkgs/by-name/go/godot_4/package.nix index 1f897675e13a..36fe3ff0dd1b 100644 --- a/pkgs/by-name/go/godot_4/package.nix +++ b/pkgs/by-name/go/godot_4/package.nix @@ -48,14 +48,14 @@ let in stdenv.mkDerivation rec { pname = "godot4"; - version = "4.2.2-stable"; - commitHash = "15073afe3856abd2aa1622492fe50026c7d63dc1"; + version = "4.3-stable"; + commitHash = "77dcf97d82cbfe4e4615475fa52ca03da645dbd8"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = commitHash; - hash = "sha256-anJgPEeHIW2qIALMfPduBVgbYYyz1PWCmPsZZxS9oHI="; + hash = "sha256-v2lBD3GEL8CoIwBl3UoLam0dJxkLGX0oneH6DiWkEsM="; }; outputs = [ From 18fb00789bea6d59828614989880782311b0245b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 15 Aug 2024 21:36:42 +0100 Subject: [PATCH 192/357] 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 193/357] 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 194/357] 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 9b013035036c033b9bb083cea2cd6a4c33b3de4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 21:19:47 +0000 Subject: [PATCH 195/357] dnf-plugins-core: 4.8.0 -> 4.9.0 --- pkgs/development/python-modules/dnf-plugins-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnf-plugins-core/default.nix b/pkgs/development/python-modules/dnf-plugins-core/default.nix index 8c518bfe4f93..e03d80c6fc14 100644 --- a/pkgs/development/python-modules/dnf-plugins-core/default.nix +++ b/pkgs/development/python-modules/dnf-plugins-core/default.nix @@ -23,7 +23,7 @@ in buildPythonPackage rec { pname = "dnf-plugins-core"; - version = "4.8.0"; + version = "4.9.0"; format = "other"; outputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "rpm-software-management"; repo = "dnf-plugins-core"; rev = "refs/tags/${version}"; - hash = "sha256-8RkTSO+F5fc3T8r79PRoW5KfEG2DmIzN2ylC9Np6LrQ="; + hash = "sha256-MQ7QZ5qn/0OU0slohwEP83w8NvSP2M+hpCDKvYqlezY="; }; patches = [ ./fix-python-install-dir.patch ]; From c9b8802fd130d9536644876525401c7ca544b563 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 16 Aug 2024 07:59:06 +0900 Subject: [PATCH 196/357] vscode-extensions.gitlab.gitlab-workflow: 3.60.0 -> 5.6.0 Release: https://gitlab.com/gitlab-org/gitlab-vscode-extension/-/releases/v5.6.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2c2ab5df08ac..496c39c3b416 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2102,8 +2102,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "3.60.0"; - hash = "sha256-rH0+6sQfBfI8SrKY9GGtTOONdzKus6Z62E8Qv5xY7Fw="; + version = "5.6.0"; + hash = "sha256-K4oCMQBH5jrt61f/C3DDZC61RuDvOApnPEF3AsOrE20="; }; meta = { description = "GitLab extension for Visual Studio Code"; From bf3de18249b1ff4017aab107a69f0589d913801a Mon Sep 17 00:00:00 2001 From: ghpzin Date: Fri, 16 Aug 2024 02:07:55 +0300 Subject: [PATCH 197/357] hyper: mark as broken --- pkgs/applications/terminal-emulators/hyper/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 8fcbbe0666ef..4db56792b733 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = [ "x86_64-linux" ]; mainProgram = "hyper"; + broken = true; # Error: 'node-pty' failed to load }; } From 555d5cbbf53cf50b6a1a986d3990973c9c8a64bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 00:24:26 +0000 Subject: [PATCH 198/357] aws-iam-authenticator: 0.6.22 -> 0.6.23 --- pkgs/tools/security/aws-iam-authenticator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index c3d7c3026dc4..98512dee9e8e 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.6.22"; + version = "0.6.23"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LV+bpQLZ5eIl8KgpnOdEdbpD20Ll1UuQTN5U/i9RZjg="; + hash = "sha256-oxRFlUKq7NqL7MPlwVRM73zVGfYVeD2E/+TF1M8Jfxs="; }; - vendorHash = "sha256-nMu3jmseVbaHRNZt/qoFsrSWoN/JYVecGrB5WlK10p8="; + vendorHash = "sha256-xCNuFO+J0NXq8CPZXB0R2RmLLH27Vh/GMrBKk+mGk04="; ldflags = let PKG = "sigs.k8s.io/aws-iam-authenticator"; in [ "-s" From 8ccee3af7fa70aef65bd6d03f5b15e46369b7e0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 00:28:01 +0000 Subject: [PATCH 199/357] buildkit: 0.15.1 -> 0.15.2 --- pkgs/development/tools/buildkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 807753068b47..a1b95f6ce6cc 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-RIFRfzvVUI52LK45noaiZQfUjwKEOf04dTaSRsKmHbs="; + hash = "sha256-N//XCiWWFjpJ6OncN7OT/C7+ziYr49T+0cOpH61mjg4="; }; vendorHash = null; From bcf00b220dbff1d2995acbe888f4238823d215db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 00:30:00 +0000 Subject: [PATCH 200/357] c2patool: 0.9.6 -> 0.9.7 --- pkgs/by-name/c2/c2patool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index 65887930b7c2..92e501e9822d 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "c2patool"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "contentauth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IESolMRRDJwLsWndXvat9otqPTPduQN1uZokx/tUCH0="; + sha256 = "sha256-5zHjPjWwYiUz+ebDoZkuEdZ+mbPTC3AnX6dTrhvjtPI="; }; - cargoHash = "sha256-cgL/88CuiqaSWj7HJABiZnIkEzJUhgPl6e2OJQ5LAnM="; + cargoHash = "sha256-lPCaR3s4Tfy0n6xGxK+eLAObRhmzXc57CI0JnVrF8sg="; # use the non-vendored openssl OPENSSL_NO_VENDOR = 1; From c5cd3e2f63ae37a49f267b82718962a63171ee5b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Aug 2024 02:50:04 +0200 Subject: [PATCH 201/357] python312Packages.openwebifpy: 4.2.5 -> 4.2.6 https://github.com/autinerd/openwebifpy/releases/tag/4.2.6 --- pkgs/development/python-modules/openwebifpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openwebifpy/default.nix b/pkgs/development/python-modules/openwebifpy/default.nix index 48795497e589..086f16fd81de 100644 --- a/pkgs/development/python-modules/openwebifpy/default.nix +++ b/pkgs/development/python-modules/openwebifpy/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "openwebifpy"; - version = "4.2.5"; + version = "4.2.6"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-Ui3731ChEUterRXb+QVMR1CNXhPYhBkZoUwbSJ47g+4="; + hash = "sha256-znMTbKQlklzOKMmlsPiM1JJ1VMB4HK5uMXoBay2Ow4A="; }; nativeBuildInputs = [ setuptools ]; From eb2a90144811d83941d4ec6020aa11bcfc37eccc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 01:01:07 +0000 Subject: [PATCH 202/357] 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 5244ef774976a805203a20b62db7f96b7dfcf78b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 01:01:33 +0000 Subject: [PATCH 203/357] clboss: 0.13.2 -> 0.13.3 --- pkgs/applications/blockchains/clboss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/clboss/default.nix b/pkgs/applications/blockchains/clboss/default.nix index fa94088bda8e..2695198bf0e2 100644 --- a/pkgs/applications/blockchains/clboss/default.nix +++ b/pkgs/applications/blockchains/clboss/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "clboss"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "ZmnSCPxj"; repo = "clboss"; rev = "v${version}"; - hash = "sha256-BMDeqAQGl2mSWyde5Pbai+1KHqPqcY+xzaY36L26olI="; + hash = "sha256-T61rkTEGLCZrEBp1WFhHnQ7DQyhctMf5lgbOs6u9E0o="; }; nativeBuildInputs = [ autoconf-archive autoreconfHook pkg-config libev curlWithGnuTls sqlite ]; From 3170f7e72e8ea27bbfdedb5fdff85cc46fdb5cae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 01:02:02 +0000 Subject: [PATCH 204/357] diffsitter: 0.8.3 -> 0.8.4 --- pkgs/tools/text/diffsitter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/diffsitter/default.nix b/pkgs/tools/text/diffsitter/default.nix index e13ad3bff23b..94d7172d71be 100644 --- a/pkgs/tools/text/diffsitter/default.nix +++ b/pkgs/tools/text/diffsitter/default.nix @@ -32,17 +32,17 @@ let in rustPlatform.buildRustPackage rec { pname = "diffsitter"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "afnanenayet"; repo = pname; rev = "v${version}"; - hash = "sha256-XYuX8NMVnVyOo3I2CmMS/TE47wQaigc8sen3ap2geSU="; + hash = "sha256-ta7JcSPEgpJwieYvtZnNMFvsYvz4FuxthhmKMYe2XUE="; fetchSubmodules = false; }; - cargoHash = "sha256-re0FRoyENpo+BF88U9ARuB05W03Slgm4nw1yxcpOA4o="; + cargoHash = "sha256-VbdV4dftCxxKLJr9TEuCe9tvSGbc62AUwlDZdaNRNhw="; buildNoDefaultFeatures = true; buildFeatures = [ From f60b97f63f65d3be8724382396cfee48a520674f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 01:22:34 +0000 Subject: [PATCH 205/357] kubernetes-helmPlugins.helm-mapkubeapis: 0.4.1 -> 0.5.0 --- .../networking/cluster/helm/plugins/helm-mapkubeapis.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix index 364cea36b3ea..893e05253689 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-mapkubeapis"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "helm"; repo = "helm-mapkubeapis"; rev = "v${version}"; - hash = "sha256-6NeePXTdp5vlBLfIlWeXQZMZ0Uz/e1ZCgZmJvBJfaFw="; + hash = "sha256-6oo8KpNNF9j/eF0nUKBRDMwp3ZhfP1rEqGYZ4xGFVWc="; }; - vendorHash = "sha256-rVrQqeakPQl3rjzmqzHw74ffreLEVzP153wWJ8TEOIM="; + vendorHash = "sha256-G3Q8XCwKLgHeWLF46C5lWfvuynr/cJbkq7xdydfTHZ4="; # NOTE: Remove the install and upgrade hooks. postPatch = '' From 6452aca3349f01f78b3b6325f10e53626529cade Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 01:22:45 +0000 Subject: [PATCH 206/357] chezmoi: 2.52.0 -> 2.52.1 --- pkgs/by-name/ch/chezmoi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index 305a827f6bb2..8becb62771bf 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ let argset = { pname = "chezmoi"; - version = "2.52.0"; + version = "2.52.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${argset.version}"; - hash = "sha256-RhzFIG93LglHd462e9ZdUYLGGlWn2EkJcEbk9EPrlfA="; + hash = "sha256-USDZ3tEXXOTNyA6tCJndZiHTDBFg70EFnvxYsrFbgi0="; }; - vendorHash = "sha256-3RJk8Pf445lF2C7kQsj0eOXcFBWCHwLx8+GrqO7nAPM="; + vendorHash = "sha256-xof2uSVUzWPlMhWU7p9/dlbHnr2/Keu7JpUUvuTB2dM="; nativeBuildInputs = [ installShellFiles From d8e4af1145a231d078e19a52ade6707381f9ee31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 01:23:11 +0000 Subject: [PATCH 207/357] kind: 0.23.0 -> 0.24.0 --- pkgs/development/tools/kind/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 0d87b23022f0..239ecdcf1d6b 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kind"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - hash = "sha256-S+kk3g/A1bio1v7zoXmvaTAYd0LBq5uip/9DvhkzZnM="; + hash = "sha256-vndN3ssiaaJdpPZQ0vBdqr4xPuY2bAHAd+SJamNrX6Q="; }; patches = [ @@ -16,7 +16,7 @@ buildGoModule rec { ./kernel-module-path.patch ]; - vendorHash = "sha256-YB2/MudoIVtTHU6FtvZOEhhxg5ss6OvENXOykPlQ12Y="; + vendorHash = "sha256-VfqNM48M39R2LaUHirKmSXCdvBXUHu09oMzDPmAQC4o="; nativeBuildInputs = [ installShellFiles ]; From d92a0200a6863565d0c97f624f6524b664a48d14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 02:02:41 +0000 Subject: [PATCH 208/357] melt: 0.6.1 -> 0.6.2 --- pkgs/tools/security/melt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/melt/default.nix b/pkgs/tools/security/melt/default.nix index 8721e34b566f..80bec168c1cc 100644 --- a/pkgs/tools/security/melt/default.nix +++ b/pkgs/tools/security/melt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "melt"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "melt"; rev = "v${version}"; - sha256 = "sha256-AfFsw1Xjj0RsP2LOeMBDffkcqgmxsqsE1iguP/0IDtM="; + sha256 = "sha256-rZJSjWmcVPri/BmGrm+fDi2WgtPReQ9lesmBhMsdddo="; }; - vendorHash = "sha256-Ec3RWH7I8nv6ZVYLrX0b/2RWwZ6cO4qbs0XqQemUYnE="; + vendorHash = "sha256-ZCHPbLjf2rTlg+Nj3v+XRW2xDN0qqhnlrF4sXNrGH/E="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; From 45e3b8b164937991882b919e6689a861a3aecc82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 02:03:03 +0000 Subject: [PATCH 209/357] opcr-policy: 0.2.16 -> 0.2.17 --- pkgs/development/tools/opcr-policy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix index 5b35630c6d33..f5b6148a028b 100644 --- a/pkgs/development/tools/opcr-policy/default.nix +++ b/pkgs/development/tools/opcr-policy/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.2.16"; + version = "0.2.17"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-nHxP9Dzc0sbgUE/SOqNIvofoi9/voYp8fFdRzMoBOHw="; + sha256 = "sha256-pZOCxOoGl/qq6nfklnwPtCy6pPXjIaY6qhH4TuL5kGg="; }; - vendorHash = "sha256-KxMODAjpqDqQO2nfqMrEPa/WZDU3XKPDQCoil/vkqEI="; + vendorHash = "sha256-LTlBj+F+QdLpndLhtH/vW6oNrvh+yUqtYngWpFMfahA="; ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; From 3de2aed6e1b5a3a5a0c2c4f2f4fca92bb6467117 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Fri, 16 Aug 2024 04:16:29 +0200 Subject: [PATCH 210/357] texpresso/tectonic: Fix cargoHash (#334797) Hash mismatch was caused by #333143. The build error message contains: Validating consistency between /build/source/Cargo.lock and /build/texpresso-tonic-0.15.0-vendor.tar.gz/Cargo.lock 2372d2371 < "time", 2707c2706 < version = "0.3.36" --- > version = "0.3.34" ... ERROR: cargoHash or cargoSha256 is out of date Fixes #334648. --- pkgs/tools/typesetting/tex/texpresso/tectonic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/texpresso/tectonic.nix b/pkgs/tools/typesetting/tex/texpresso/tectonic.nix index 838a51324a09..1848bf26b5b5 100644 --- a/pkgs/tools/typesetting/tex/texpresso/tectonic.nix +++ b/pkgs/tools/typesetting/tex/texpresso/tectonic.nix @@ -10,7 +10,7 @@ tectonic-unwrapped.override (old: { hash = "sha256-ap7fEPHsASAphIQkjcvk1CC7egTdxaUh7IpSS5os4W8="; fetchSubmodules = true; }; - cargoHash = "sha256-62sxvPIiY3len1wsl7QelK3u4ekftIjcTqoIGZMYb5A="; + cargoHash = "sha256-g4iBo8r+QUOcFJ3CI2+HOi4VHxU7jKnIWlJcKx/6r5E="; # binary has a different name, bundled tests won't work doCheck = false; meta.mainProgram = "texpresso-tonic"; From dac3226b9d71917536a513d362a429dd734964a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 02:35:07 +0000 Subject: [PATCH 211/357] python312Packages.dnf4: 4.21.0 -> 4.21.1 --- pkgs/development/python-modules/dnf4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnf4/default.nix b/pkgs/development/python-modules/dnf4/default.nix index 3696087cd5af..b462e395669e 100644 --- a/pkgs/development/python-modules/dnf4/default.nix +++ b/pkgs/development/python-modules/dnf4/default.nix @@ -18,7 +18,7 @@ in buildPythonPackage rec { pname = "dnf4"; - version = "4.21.0"; + version = "4.21.1"; format = "other"; outputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "rpm-software-management"; repo = "dnf"; rev = version; - hash = "sha256-iDSjhAwas2ZljWN42/jG//Mu0HJYijCRqVTdnunjxkI="; + hash = "sha256-VYQhOlLtEzWesrMZ/d6KW0OlUjz5MvoEmPy71qEUEL4="; }; patches = [ ./fix-python-install-dir.patch ]; From 883f716047055e8f72582b75287f62deb354608b Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 26 Jun 2024 19:19:50 -0700 Subject: [PATCH 212/357] flutterPackages-source: disable old version sources, fix update hashes --- .../compilers/flutter/engine/constants.nix | 83 ++++++++++--------- .../compilers/flutter/engine/default.nix | 4 +- .../compilers/flutter/engine/package.nix | 70 +++++++++------- .../compilers/flutter/engine/source.nix | 44 +++++++--- .../compilers/flutter/engine/tools.nix | 57 ++++++++++--- .../development/compilers/flutter/flutter.nix | 2 +- .../flutter/update/get-engine-hashes.nix.in | 29 +++++-- .../compilers/flutter/update/update.py | 11 +-- .../compilers/flutter/versions/3_13/data.json | 10 ++- .../3_13/engine/patches/flutter-45098.patch | 27 ++++++ .../compilers/flutter/versions/3_16/data.json | 10 ++- .../compilers/flutter/versions/3_19/data.json | 10 ++- .../compilers/flutter/versions/3_22/data.json | 10 ++- .../compilers/flutter/versions/3_23/data.json | 10 ++- 14 files changed, 256 insertions(+), 121 deletions(-) create mode 100644 pkgs/development/compilers/flutter/versions/3_13/engine/patches/flutter-45098.patch diff --git a/pkgs/development/compilers/flutter/engine/constants.nix b/pkgs/development/compilers/flutter/engine/constants.nix index 9b7907fc337f..768f103e849f 100644 --- a/pkgs/development/compilers/flutter/engine/constants.nix +++ b/pkgs/development/compilers/flutter/engine/constants.nix @@ -1,41 +1,48 @@ -{ lib, targetPlatform }: -rec { - os = - if targetPlatform.isLinux then - "linux" - else if targetPlatform.isDarwin then - "macos" - else if targetPlatform.isWindows then - "windows" - else - throw "Unsupported OS \"${targetPlatform.parsed.kernel.name}\""; +{ lib, platform }: +let + self = { + os = + if platform.isLinux then + "linux" + else if platform.isDarwin then + "macos" + else if platform.isWindows then + "windows" + else + throw "Unsupported OS \"${platform.parsed.kernel.name}\""; - arch = - if targetPlatform.isx86_64 then - "amd64" - else if targetPlatform.isx86 && targetPlatform.is32bit then - "386" - else if targetPlatform.isAarch64 then - "arm64" - else if targetPlatform.isMips && targetPlatform.parsed.cpu.significantByte == "littleEndian" then - "mipsle" - else if targetPlatform.isMips64 then - "mips64${lib.optionalString (targetPlatform.parsed.cpu.significantByte == "littleEndian") "le"}" - else if targetPlatform.isPower64 then - "ppc64${lib.optionalString (targetPlatform.parsed.cpu.significantByte == "littleEndian") "le"}" - else if targetPlatform.isS390x then - "s390x" - else - throw "Unsupported CPU \"${targetPlatform.parsed.cpu.name}\""; + alt-os = if platform.isDarwin then "mac" else self.os; - alt-arch = - if targetPlatform.isx86_64 then - "x64" - else if targetPlatform.isAarch64 then - "arm64" - else - targetPlatform.parsed.cpu.name; + arch = + if platform.isx86_64 then + "amd64" + else if platform.isx86 && platform.is32bit then + "386" + else if platform.isAarch64 then + "arm64" + else if platform.isMips && platform.parsed.cpu.significantByte == "littleEndian" then + "mipsle" + else if platform.isMips64 then + "mips64${lib.optionalString (platform.parsed.cpu.significantByte == "littleEndian") "le"}" + else if platform.isPower64 then + "ppc64${lib.optionalString (platform.parsed.cpu.significantByte == "littleEndian") "le"}" + else if platform.isS390x then + "s390x" + else if platform.isRiscV64 then + "riscv64" + else + throw "Unsupported CPU \"${platform.parsed.cpu.name}\""; - platform = "${os}-${arch}"; - alt-platform = "${os}-${alt-arch}"; -} + alt-arch = + if platform.isx86_64 then + "x64" + else if platform.isAarch64 then + "arm64" + else + platform.parsed.cpu.name; + + platform = "${self.os}-${self.arch}"; + alt-platform = "${self.os}-${self.alt-arch}"; + }; +in +self diff --git a/pkgs/development/compilers/flutter/engine/default.nix b/pkgs/development/compilers/flutter/engine/default.nix index 7bf59dc85719..77572096b360 100644 --- a/pkgs/development/compilers/flutter/engine/default.nix +++ b/pkgs/development/compilers/flutter/engine/default.nix @@ -9,7 +9,7 @@ url, patches, runtimeModes, - isOptimized ? true, + isOptimized ? null, lib, stdenv, dart, @@ -33,8 +33,8 @@ let url patches runtimeMode - isOptimized ; + isOptimized = args.isOptimized or runtimeMode != "debug"; } ); in diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix index a87088dc8131..bd53b5e7ceca 100644 --- a/pkgs/development/compilers/flutter/engine/package.nix +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -4,11 +4,11 @@ writeText, symlinkJoin, targetPlatform, - hostPlatform, + buildPlatform, darwin, clang, llvm, - tools ? callPackage ./tools.nix { inherit hostPlatform; }, + tools ? callPackage ./tools.nix { inherit buildPlatform; }, stdenv, stdenvNoCC, dart, @@ -33,7 +33,8 @@ gtk3, pkg-config, ninja, - python3, + python312, + python39, git, version, flutterVersion, @@ -44,7 +45,7 @@ patches, url, runtimeMode ? "release", - isOptimized ? true, + isOptimized ? runtimeMode != "debug", }: with lib; let @@ -53,14 +54,19 @@ let expandDeps = deps: flatten (map expandSingleDep deps); - constants = callPackage ./constants.nix { inherit targetPlatform; }; + constants = callPackage ./constants.nix { platform = targetPlatform; }; + + python3 = if lib.versionAtLeast flutterVersion "3.20" then python312 else python39; src = callPackage ./source.nix { inherit tools + flutterVersion version hashes url + targetPlatform + buildPlatform ; }; @@ -82,9 +88,11 @@ let ]; }; - outName = "host_${runtimeMode}${lib.optionalString (!isOptimized) "_unopt --unoptimized"}"; + outName = "host_${runtimeMode}${lib.optionalString (!isOptimized) "_unopt"}"; - dartPath = "${if (lib.versionAtLeast flutterVersion "3.23") then "flutter/third_party" else "third_party"}/dart"; + dartPath = "${ + if (lib.versionAtLeast flutterVersion "3.23") then "flutter/third_party" else "third_party" + }/dart"; in stdenv.mkDerivation (finalAttrs: { pname = "flutter-engine-${runtimeMode}${lib.optionalString (!isOptimized) "-unopt"}"; @@ -96,7 +104,11 @@ stdenv.mkDerivation (finalAttrs: { dartSdkVersion src outName - swiftshader; + swiftshader + ; + + setOutputFlags = false; + doStrip = isOptimized; toolchain = symlinkJoin { name = "flutter-engine-toolchain-${version}"; @@ -146,9 +158,14 @@ stdenv.mkDerivation (finalAttrs: { ''; }; - NIX_CFLAGS_COMPILE = "-I${finalAttrs.toolchain}/include"; + NIX_CFLAGS_COMPILE = [ + "-I${finalAttrs.toolchain}/include" + ] ++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE"; - nativeCheckInputs = lib.optionals stdenv.isLinux [ xorg.xorgserver openbox ]; + nativeCheckInputs = lib.optionals stdenv.isLinux [ + xorg.xorgserver + openbox + ]; nativeBuildInputs = [ @@ -169,10 +186,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk3 ]; - patchtools = [ - "${dartPath}/tools/sdks/dart-sdk/bin/dart" - "flutter/third_party/gn/gn" - ]; + patchtools = [ "flutter/third_party/gn/gn" ]; dontPatch = true; @@ -195,6 +209,10 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p src/flutter/buildtools/${constants.alt-platform} ln -s ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang + mkdir -p src/buildtools/${constants.alt-platform} + ln -s ${llvm} src/buildtools/${constants.alt-platform}/clang + + mkdir -p src/${dartPath}/tools/sdks ln -s ${dart} src/${dartPath}/tools/sdks/dart-sdk ${lib.optionalString (stdenv.isLinux) '' @@ -205,13 +223,12 @@ stdenv.mkDerivation (finalAttrs: { for dir in ''${patchgit[@]}; do pushd src/$dir - rev=$(cat .git/HEAD) rm -rf .git git init git add . git config user.name "nobody" git config user.email "nobody@local.host" - git commit -a -m "$rev" --quiet + git commit -a -m "$dir" --quiet popd done @@ -237,10 +254,12 @@ stdenv.mkDerivation (finalAttrs: { "--embedder-for-target" "--no-goma" ] - ++ optionals (targetPlatform.isx86_64 == false) [ + ++ lib.optionals (targetPlatform.isx86_64 == false) [ "--linux" "--linux-cpu ${constants.alt-arch}" - ]; + ] + ++ lib.optional (!isOptimized) "--unoptimized" + ++ lib.optional (runtimeMode == "debug") "--no-stripped"; # NOTE: Once https://github.com/flutter/flutter/issues/127606 is fixed, use "--no-prebuilt-dart-sdk" configurePhase = @@ -268,22 +287,9 @@ stdenv.mkDerivation (finalAttrs: { runHook preBuild export TERM=dumb - for tool in flatc scenec gen_snapshot dart impellerc shader_archiver gen_snapshot_product; do - ninja -C $out/out/$outName -j$NIX_BUILD_CORES $tool - ${lib.optionalString (stdenv.isLinux) '' - patchelf $out/out/$outName/$tool --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) - ''} - done ninja -C $out/out/$outName -j$NIX_BUILD_CORES - ${lib.optionalString (stdenv.isLinux) '' - patchelf $out/out/$outName/dart-sdk/bin/dartaotruntime \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) - - find $out/out/$outName/exe.unstripped -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; - ''} - runHook postBuild ''; @@ -324,5 +330,5 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-darwin" "aarch64-darwin" ]; - }; + } // lib.optionalAttrs (lib.versionOlder flutterVersion "3.22") { hydraPlatforms = [ ]; }; }) diff --git a/pkgs/development/compilers/flutter/engine/source.nix b/pkgs/development/compilers/flutter/engine/source.nix index 413b1874a981..46f461e3dbfb 100644 --- a/pkgs/development/compilers/flutter/engine/source.nix +++ b/pkgs/development/compilers/flutter/engine/source.nix @@ -1,9 +1,11 @@ { + lib, callPackage, - hostPlatform, + buildPlatform, targetPlatform, + hostPlatform, fetchgit, - tools ? callPackage ./tools.nix { inherit hostPlatform; }, + tools ? null, curl, pkg-config, git, @@ -11,15 +13,19 @@ runCommand, writeText, cacert, + flutterVersion, version, hashes, url, -}: +}@pkgs: let - constants = callPackage ./constants.nix { inherit targetPlatform; }; + target-constants = callPackage ./constants.nix { platform = targetPlatform; }; + build-constants = callPackage ./constants.nix { platform = buildPlatform; }; + tools = pkgs.tools or (callPackage ./tools.nix { inherit hostPlatform buildPlatform; }); + boolOption = value: if value then "True" else "False"; in -runCommand "flutter-engine-source-${version}-${targetPlatform.system}" +runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPlatform.system}" { pname = "flutter-engine-source"; inherit version; @@ -51,8 +57,20 @@ runCommand "flutter-engine-source-${version}-${targetPlatform.system}" "setup_githooks": False, "download_esbuild": False, "download_dart_sdk": False, + "host_cpu": "${build-constants.alt-arch}", + "host_os": "${build-constants.alt-os}", }, }] + + target_os_only = True + target_os = [ + "${target-constants.alt-os}" + ] + + target_cpu_only = True + target_cpu = [ + "${target-constants.alt-arch}" + ] ''; NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; @@ -64,7 +82,9 @@ runCommand "flutter-engine-source-${version}-${targetPlatform.system}" outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = hashes.${targetPlatform.system} or (throw "Hash not set for ${targetPlatform.system}"); + outputHash = + (hashes."${buildPlatform.system}" or { })."${targetPlatform.system}" + or (throw "Hash not set for ${targetPlatform.system} on ${buildPlatform.system}"); } '' source ${../../../../build-support/fetchgit/deterministic-git} @@ -76,13 +96,13 @@ runCommand "flutter-engine-source-${version}-${targetPlatform.system}" cd $out export PATH=$PATH:$depot_tools - python3 $depot_tools/gclient.py sync --no-history --shallow --nohooks 2>&1 >/dev/null - find $out -name '.git' -exec dirname {} \; | xargs bash -c 'make_deterministic_repo $@' _ - find $out -path '*/.git/*' ! -name 'HEAD' -prune -exec rm -rf {} \; - find $out -name '.git' -exec mkdir {}/logs \; - find $out -name '.git' -exec cp {}/HEAD {}/logs/HEAD \; + python3 $depot_tools/gclient.py sync --no-history --shallow --nohooks -j $NIX_BUILD_CORES + find $out -name '.git' -exec rm -rf {} \; || true - rm -rf $out/src/flutter/{buildtools,prebuilts,third_party/swiftshader} + rm -rf $out/src/buildtools/ + rm -rf $out/src/flutter/{buildtools,prebuilts,third_party/swiftshader,third_party/gn/.versions} + rm -rf $out/src/flutter/{third_party/dart/tools/sdks/dart-sdk,third_party/ninja/ninja} + rm -rf $out/src/third_party/{dart/tools/sdks/dart-sdk,libcxx/test} rm -rf $out/.cipd $out/.gclient $out/.gclient_entries $out/.gclient_previous_custom_vars $out/.gclient_previous_sync_commits '' diff --git a/pkgs/development/compilers/flutter/engine/tools.nix b/pkgs/development/compilers/flutter/engine/tools.nix index a35398058181..42cfd5e6dca6 100644 --- a/pkgs/development/compilers/flutter/engine/tools.nix +++ b/pkgs/development/compilers/flutter/engine/tools.nix @@ -1,9 +1,11 @@ { + stdenv, callPackage, fetchgit, fetchurl, writeText, runCommand, + buildPlatform, hostPlatform, darwin, writeShellScriptBin, @@ -29,7 +31,9 @@ }, }: let - constants = callPackage ./constants.nix { targetPlatform = hostPlatform; }; + constants = callPackage ./constants.nix { platform = buildPlatform; }; + host-constants = callPackage ./constants.nix { platform = hostPlatform; }; + stdenv-constants = callPackage ./constants.nix { platform = stdenv.hostPlatform; }; in { depot_tools = fetchgit { @@ -39,18 +43,45 @@ in }; cipd = - runCommand "cipd-${cipdCommit}" - { - unwrapped = fetchurl { - name = "cipd-${cipdCommit}-unwrapped"; - url = "https://chrome-infra-packages.appspot.com/client?platform=${constants.platform}&version=git_revision:${cipdCommit}"; - sha256 = cipdHashes.${constants.platform}; - }; - } - '' - mkdir -p $out/bin - install -m755 $unwrapped $out/bin/cipd - ''; + let + unwrapped = + runCommand "cipd-${cipdCommit}" + { + src = fetchurl { + name = "cipd-${cipdCommit}-unwrapped"; + url = "https://chrome-infra-packages.appspot.com/client?platform=${stdenv-constants.platform}&version=git_revision:${cipdCommit}"; + sha256 = cipdHashes.${stdenv-constants.platform}; + }; + } + '' + mkdir -p $out/bin + install -m755 $src $out/bin/cipd + ''; + in + writeShellScriptBin "cipd" '' + params=$@ + + if [[ "$1" == "ensure" ]]; then + shift 1 + params="ensure" + + while [ "$#" -ne 0 ]; do + if [[ "$1" == "-ensure-file" ]]; then + ensureFile="$2" + shift 2 + params="$params -ensure-file $ensureFile" + + sed -i 's/''${platform}/${host-constants.platform}/g' "$ensureFile" + sed -i 's/gn\/gn\/${stdenv-constants.platform}/gn\/gn\/${constants.platform}/g' "$ensureFile" + else + params="$params $1" + shift 1 + fi + done + fi + + exec ${unwrapped}/bin/cipd $params + ''; vpython = pythonPkg: diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 870c63afa806..0db577decce3 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -158,7 +158,7 @@ let # When other derivations wrap this one, any unmodified files # found here should be included as-is, for tooling compatibility. sdk = unwrapped; - } // lib.optionalAttrs (engine != null && engine.meta.available) { + } // lib.optionalAttrs (engine != null) { inherit engine; }; diff --git a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in index f61b9b14fd07..f6746db43a76 100644 --- a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in +++ b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in @@ -1,6 +1,7 @@ { callPackage, symlinkJoin, lib }: let nixpkgsRoot = "@nixpkgs_root@"; + version = "@flutter_version@"; engineVersion = "@engine_version@"; systemPlatforms = [ @@ -8,14 +9,26 @@ let "aarch64-linux" ]; - derivations = builtins.map - (systemPlatform: callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/engine/source.nix" { - targetPlatform = lib.systems.elaborate systemPlatform; - version = engineVersion; - url = "https://github.com/flutter/engine.git@${engineVersion}"; - hashes."${systemPlatform}" = lib.fakeSha256; - }) - systemPlatforms; + derivations = + lib.foldl' + ( + acc: buildPlatform: + acc + ++ (map + (targetPlatform: + callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/engine/source.nix" { + targetPlatform = lib.systems.elaborate targetPlatform; + hostPlatform = lib.systems.elaborate buildPlatform; + buildPlatform = lib.systems.elaborate buildPlatform; + + flutterVersion = version; + version = engineVersion; + url = "https://github.com/flutter/engine.git@${engineVersion}"; + hashes."${buildPlatform}"."${targetPlatform}" = lib.fakeSha256; + }) + systemPlatforms) + ) [ ] + systemPlatforms; in symlinkJoin { name = "evaluate-derivations"; diff --git a/pkgs/development/compilers/flutter/update/update.py b/pkgs/development/compilers/flutter/update/update.py index cc6d114e694a..5b63cec37f37 100755 --- a/pkgs/development/compilers/flutter/update/update.py +++ b/pkgs/development/compilers/flutter/update/update.py @@ -86,21 +86,22 @@ def nix_build_to_fail(code): return stderr -def get_engine_hashes(engine_version): +def get_engine_hashes(engine_version, flutter_version): code = load_code("get-engine-hashes.nix", nixpkgs_root=NIXPKGS_ROOT, + flutter_version=flutter_version, engine_version=engine_version) stderr = nix_build_to_fail(code) pattern = re.compile( - r"/nix/store/.*-flutter-engine-source-(.+?)-(.+?).drv':\n\s+specified: .*\n\s+got:\s+(.+?)\n") + rf"/nix/store/.*-flutter-engine-source-{engine_version}-(.+?-.+?)-(.+?-.+?).drv':\n\s+specified: .*\n\s+got:\s+(.+?)\n") matches = pattern.findall(stderr) result_dict = {} for match in matches: - _, system, got = match - result_dict[system] = got + flutter_platform, architecture, got = match + result_dict.setdefault(flutter_platform, {})[architecture] = got def sort_dict_recursive(d): return { @@ -405,7 +406,7 @@ def main(): engine_swiftshader_rev='0', **common_data_args) - engine_hashes = get_engine_hashes(engine_hash) + engine_hashes = get_engine_hashes(engine_hash, flutter_version) write_data( pubspec_lock=pubspec_lock, diff --git a/pkgs/development/compilers/flutter/versions/3_13/data.json b/pkgs/development/compilers/flutter/versions/3_13/data.json index 1b61347b30f1..2126e01b99d9 100644 --- a/pkgs/development/compilers/flutter/versions/3_13/data.json +++ b/pkgs/development/compilers/flutter/versions/3_13/data.json @@ -5,8 +5,14 @@ "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8", "channel": "stable", "engineHashes": { - "aarch64-linux": "sha256-+MIGPmKHkcn3TlFYu6jXv8KBRqdECgtGSqAKQE33iAM=", - "x86_64-linux": "sha256-+MIGPmKHkcn3TlFYu6jXv8KBRqdECgtGSqAKQE33iAM=" + "aarch64-linux": { + "aarch64-linux": "sha256-bl71v+BSadKXOczo8TjkqatzKDmAZf7xyHAk8bVMN1Y=", + "x86_64-linux": "sha256-bl71v+BSadKXOczo8TjkqatzKDmAZf7xyHAk8bVMN1Y=" + }, + "x86_64-linux": { + "aarch64-linux": "sha256-kW5f7+w8Uo+ndq/lvhz/r7cAyCQY2848kTU1OqhqTnQ=", + "x86_64-linux": "sha256-kW5f7+w8Uo+ndq/lvhz/r7cAyCQY2848kTU1OqhqTnQ=" + } }, "dartVersion": "3.1.4", "dartHash": { diff --git a/pkgs/development/compilers/flutter/versions/3_13/engine/patches/flutter-45098.patch b/pkgs/development/compilers/flutter/versions/3_13/engine/patches/flutter-45098.patch new file mode 100644 index 000000000000..9f1b4f76f4d6 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_13/engine/patches/flutter-45098.patch @@ -0,0 +1,27 @@ +From 41bb032ef3e8332115ed9ebdaeed5d47b9c56098 Mon Sep 17 00:00:00 2001 +From: Robert Ancell +Date: Fri, 25 Aug 2023 16:46:52 +1200 +Subject: [PATCH] Fix building on Pango 1.49.4 + +This version added the autoptr macros which we no longer need to define. + +https://github.com/flutter/flutter/issues/132881 +--- + shell/platform/linux/fl_accessible_text_field.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/shell/platform/linux/fl_accessible_text_field.cc b/shell/platform/linux/fl_accessible_text_field.cc +index 9a6052d4777ec..9dcc7f64fb820 100644 +--- a/shell/platform/linux/fl_accessible_text_field.cc ++++ b/shell/platform/linux/fl_accessible_text_field.cc +@@ -7,7 +7,11 @@ + #include "flutter/shell/platform/linux/public/flutter_linux/fl_value.h" + + G_DEFINE_AUTOPTR_CLEANUP_FUNC(PangoContext, g_object_unref) ++// PangoLayout g_autoptr macro weren't added until 1.49.4. Add them manually. ++// https://gitlab.gnome.org/GNOME/pango/-/commit/0b84e14 ++#if !PANGO_VERSION_CHECK(1, 49, 4) + G_DEFINE_AUTOPTR_CLEANUP_FUNC(PangoLayout, g_object_unref) ++#endif + + typedef bool (*FlTextBoundaryCallback)(const PangoLogAttr* attr); diff --git a/pkgs/development/compilers/flutter/versions/3_16/data.json b/pkgs/development/compilers/flutter/versions/3_16/data.json index 4c9142a149e9..693e0eaf4af7 100644 --- a/pkgs/development/compilers/flutter/versions/3_16/data.json +++ b/pkgs/development/compilers/flutter/versions/3_16/data.json @@ -5,8 +5,14 @@ "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8", "channel": "stable", "engineHashes": { - "aarch64-linux": "sha256-irrfyKvTHqaBgcKg3jJzEDs1B4Q91u/e6Ui01MDI+oU=", - "x86_64-linux": "sha256-irrfyKvTHqaBgcKg3jJzEDs1B4Q91u/e6Ui01MDI+oU=" + "aarch64-linux": { + "aarch64-linux": "sha256-eRTh/I0SW6Kg1cZAzj+ZqsolG6anbqMNMdW6sxIlJaA=", + "x86_64-linux": "sha256-eRTh/I0SW6Kg1cZAzj+ZqsolG6anbqMNMdW6sxIlJaA=" + }, + "x86_64-linux": { + "aarch64-linux": "sha256-FXCgpj1H46amXmDQ998uAGHRUp/CAzZI/Yn4Btr9XsA=", + "x86_64-linux": "sha256-FXCgpj1H46amXmDQ998uAGHRUp/CAzZI/Yn4Btr9XsA=" + } }, "dartVersion": "3.2.4", "dartHash": { diff --git a/pkgs/development/compilers/flutter/versions/3_19/data.json b/pkgs/development/compilers/flutter/versions/3_19/data.json index a05e0172ca44..4bb97bcede03 100644 --- a/pkgs/development/compilers/flutter/versions/3_19/data.json +++ b/pkgs/development/compilers/flutter/versions/3_19/data.json @@ -5,8 +5,14 @@ "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "stable", "engineHashes": { - "aarch64-linux": "sha256-YTG46ZYCOu0OJGIILV6NGvIEhQU0yHNFSMR38Xvqa9E=", - "x86_64-linux": "sha256-YTG46ZYCOu0OJGIILV6NGvIEhQU0yHNFSMR38Xvqa9E=" + "aarch64-linux": { + "aarch64-linux": "sha256-UBiHps5QoTAtSBuh3HBoAlztWZ/TpqvJI9JaIF2tLWs=", + "x86_64-linux": "sha256-UBiHps5QoTAtSBuh3HBoAlztWZ/TpqvJI9JaIF2tLWs=" + }, + "x86_64-linux": { + "aarch64-linux": "sha256-j7hvd/166zZXTVE46jULE+PzVLqHXhBnaZpYCS9TwpI=", + "x86_64-linux": "sha256-j7hvd/166zZXTVE46jULE+PzVLqHXhBnaZpYCS9TwpI=" + } }, "dartVersion": "3.3.2", "dartHash": { diff --git a/pkgs/development/compilers/flutter/versions/3_22/data.json b/pkgs/development/compilers/flutter/versions/3_22/data.json index 2abe37d9dac0..397b5934356a 100644 --- a/pkgs/development/compilers/flutter/versions/3_22/data.json +++ b/pkgs/development/compilers/flutter/versions/3_22/data.json @@ -5,8 +5,14 @@ "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "stable", "engineHashes": { - "aarch64-linux": "sha256-OPgevqdMwKhXml+PS5Z1DW0wg843NVN57CiLbXve8kE=", - "x86_64-linux": "sha256-OPgevqdMwKhXml+PS5Z1DW0wg843NVN57CiLbXve8kE=" + "aarch64-linux": { + "aarch64-linux": "sha256-MiokUhxz23/HANUv8pD4jrJuj3/EAZNbJVpovM9upKI=", + "x86_64-linux": "sha256-MiokUhxz23/HANUv8pD4jrJuj3/EAZNbJVpovM9upKI=" + }, + "x86_64-linux": { + "aarch64-linux": "sha256-UWVjNgF94dYG7nSX+Gu6B9500RAHw1EOxE0+QJhS+Ao=", + "x86_64-linux": "sha256-UWVjNgF94dYG7nSX+Gu6B9500RAHw1EOxE0+QJhS+Ao=" + } }, "dartVersion": "3.4.3", "dartHash": { diff --git a/pkgs/development/compilers/flutter/versions/3_23/data.json b/pkgs/development/compilers/flutter/versions/3_23/data.json index 82233ea5112c..ab570ec0f879 100644 --- a/pkgs/development/compilers/flutter/versions/3_23/data.json +++ b/pkgs/development/compilers/flutter/versions/3_23/data.json @@ -5,8 +5,14 @@ "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "beta", "engineHashes": { - "aarch64-linux": "sha256-g169BDV6NtiyriMSgK3GOwhkVi9X23SqB9HOxxtGPK4=", - "x86_64-linux": "sha256-g169BDV6NtiyriMSgK3GOwhkVi9X23SqB9HOxxtGPK4=" + "aarch64-linux": { + "aarch64-linux": "sha256-H+UEIEY3UwBBJePSuwsFWQIGuuYzPuX543Me3YplD14=", + "x86_64-linux": "sha256-H+UEIEY3UwBBJePSuwsFWQIGuuYzPuX543Me3YplD14=" + }, + "x86_64-linux": { + "aarch64-linux": "sha256-KJbjRfxC2S8JWeo1eTHObvumOjAVc/24jEvOu4znnAY=", + "x86_64-linux": "sha256-KJbjRfxC2S8JWeo1eTHObvumOjAVc/24jEvOu4znnAY=" + } }, "dartVersion": "3.5.0-180.3.beta", "dartHash": { From a0e3567cbd62b100c1e7b9fe9085c92e91869d13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 03:03:56 +0000 Subject: [PATCH 213/357] sketchybar-app-font: 2.0.23 -> 2.0.24 --- pkgs/by-name/sk/sketchybar-app-font/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index cb60e0960392..0a5ff82c90ae 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "2.0.23"; + version = "2.0.24"; src = fetchFromGitHub { owner = "kvndrsslr"; repo = "sketchybar-app-font"; - rev = "v2.0.23"; - hash = "sha256-pVMfM9m1POwHhhTQ8nj7fVWzfVaUSNNbh6uHhWJmwpQ="; + rev = "v2.0.24"; + hash = "sha256-7ILGOz+5S1I6R28i3cdmVs7gYmucPiOfCTIZM7rimV4="; }; pnpmDeps = pnpm.fetchDeps { From 6136755fec487b6475a3377e3026274f46448942 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 04:49:07 +0000 Subject: [PATCH 214/357] s0ix-selftest-tool: 0-unstable-2024-05-16 -> 0-unstable-2024-08-13 --- pkgs/by-name/s0/s0ix-selftest-tool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/s0/s0ix-selftest-tool/package.nix b/pkgs/by-name/s0/s0ix-selftest-tool/package.nix index 1b782d8c5911..bbb142d00e52 100644 --- a/pkgs/by-name/s0/s0ix-selftest-tool/package.nix +++ b/pkgs/by-name/s0/s0ix-selftest-tool/package.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation { pname = "s0ix-selftest-tool"; - version = "0-unstable-2024-05-16"; + version = "0-unstable-2024-08-13"; src = fetchFromGitHub { owner = "intel"; repo = "S0ixSelftestTool"; - rev = "846e14ab86faaca2fe600c434191d33b9fc75632"; - hash = "sha256-PlsxGkr20pbUunRSa7PXdLLUlnBAgARRC/HpAkofMds="; + rev = "a9fcb3117ff733e7c307bb579c612065b64bf4b7"; + hash = "sha256-DcXefQPI4VpkeFH/YM899WEZHIs5IfWOWoUuZV6Ew7M="; }; # don't use the bundled turbostat binary From 6ebb4763572d557805fff74ea3f3555a4870db08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 05:04:28 +0000 Subject: [PATCH 215/357] miriway: 0-unstable-2024-07-17 -> 0-unstable-2024-08-14 --- pkgs/applications/window-managers/miriway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index 4547d1df8363..97aa12e8ecd0 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "0-unstable-2024-07-17"; + version = "0-unstable-2024-08-14"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "810dea99773f96a4ef4471bf00c65089956ff97a"; - hash = "sha256-hkHipu1ERiM8UH18NuyxILyxxXvyVTOSLBP/7Z64ZTg="; + rev = "2d00e8a61cb029cec96596897a1dada8033c601a"; + hash = "sha256-DB07IGFXLQj2LsU8iVZrSda0FS/efKUAolet8fK9Clo="; }; strictDeps = true; From cab3fd43713f0e5d8c1475ccafff25b13a8f2839 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 05:12:01 +0000 Subject: [PATCH 216/357] 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 3e4323317ca7cb030b4e129fa384bb95308537a1 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Wed, 14 Aug 2024 15:59:22 +0200 Subject: [PATCH 217/357] php84: 8.4.0alpha4 -> 8.4.0beta3 --- pkgs/development/interpreters/php/8.4.nix | 6 ++--- .../interpreters/php/fix-paths-php84.patch | 27 +++++++++++++++++++ pkgs/development/interpreters/php/generic.nix | 6 ++++- pkgs/top-level/php-packages.nix | 8 ------ 4 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/interpreters/php/fix-paths-php84.patch diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix index 9c6fd1d39288..3c1f17048c37 100644 --- a/pkgs/development/interpreters/php/8.4.nix +++ b/pkgs/development/interpreters/php/8.4.nix @@ -4,10 +4,10 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.4.0alpha4"; + version = "8.4.0beta3"; phpSrc = fetchurl { - url = "https://downloads.php.net/~saki/php-8.4.0alpha4.tar.xz"; - hash = "sha256-v411aNKrbteDZnkfpai8SqUgWFQbqZJbzPF5mdCr2Og="; + url = "https://downloads.php.net/~calvinb/php-8.4.0beta3.tar.xz"; + hash = "sha256-aTgUCmS3tdV304Ag05DZObLKTQ8XgpNIfHARbhpZUAw="; }; } ); diff --git a/pkgs/development/interpreters/php/fix-paths-php84.patch b/pkgs/development/interpreters/php/fix-paths-php84.patch new file mode 100644 index 000000000000..294d13569af7 --- /dev/null +++ b/pkgs/development/interpreters/php/fix-paths-php84.patch @@ -0,0 +1,27 @@ +diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4 +index e46acf0928..ee8e5a88f8 100644 +--- a/ext/gettext/config.m4 ++++ b/ext/gettext/config.m4 +@@ -4,9 +4,7 @@ PHP_ARG_WITH([gettext], + [Include GNU gettext support])]) + + if test "$PHP_GETTEXT" != "no"; then +- for i in $PHP_GETTEXT /usr/local /usr; do +- AS_IF([test -r $i/include/libintl.h], [GETTEXT_DIR=$i; break;]) +- done ++ GETTEXT_DIR=$PHP_GETTEXT + + AS_VAR_IF([GETTEXT_DIR],, + [AC_MSG_ERROR([Cannot locate header file libintl.h])]) +diff -ru a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 +--- a/sapi/apache2handler/config.m4 2018-11-07 15:35:23.000000000 +0000 ++++ b/sapi/apache2handler/config.m4 2018-11-27 00:32:28.000000000 +0000 +@@ -66,7 +66,7 @@ + AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) + fi + +- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` ++ APXS_LIBEXECDIR="$prefix/modules" + if test -z `$APXS -q SYSCONFDIR`; then + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 69716f05b6da..9055c5ea6641 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -313,7 +313,11 @@ let src = if phpSrc == null then defaultPhpSrc else phpSrc; - patches = [ ./fix-paths-php7.patch ] ++ extraPatches; + patches = lib.optionals (lib.versionOlder version "8.4") [ + ./fix-paths-php7.patch + ] ++ lib.optionals (lib.versionAtLeast version "8.4") [ + ./fix-paths-php84.patch + ] ++ extraPatches; separateDebugInfo = true; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d6d2af5850d0..1c4903915b37 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -409,14 +409,6 @@ in { hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k="; excludes = [ "NEWS" ]; }) - ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.4") [ - # Fix compatibility with libxml2 ≥ 2.13.2 - # https://github.com/php/php-src/issues/15331 - (fetchpatch { - url = "https://github.com/php/php-src/commit/8d7365b6f009ba43e305d6459013ac4fbed7c606.diff?full_index=1"; - hash = "sha256-ct0Ml9kjjcRLryjxMsUQQsDXiDExjpnCnWKf+mYgTsQ="; - excludes = [ "NEWS" ]; - }) ]; } { From 77f6edfd59929ea35c08920ca19dd7bdc0d810a8 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Mon, 12 Aug 2024 20:50:07 -0700 Subject: [PATCH 218/357] llvmPackages: refactor patch matching --- .../compilers/llvm/common/default.nix | 316 +++++++++++++----- 1 file changed, 225 insertions(+), 91 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 6ae37502d47b..6b393cbbf556 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -75,97 +75,231 @@ let builtins.path { name = builtins.baseNameOf p; path = - if - (lib.versionOlder release_version "14" || lib.versionAtLeast release_version "19") - && p == "clang/gnu-install-dirs.patch" - then - (if lib.versionAtLeast release_version "19" then ../19/${p} else ../12/${p}) - else if - lib.versionAtLeast release_version "18" - && ( - p == "clang/purity.patch" - || p == "lld/gnu-install-dirs.patch" - || p == "llvm/gnu-install-dirs.patch" - || p == "llvm/gnu-install-dirs-polly.patch" - || p == "llvm/lit-shell-script-runner-set-dyld-library-path.patch" - || p == "libcxx/0001-darwin-10.12-mbstate_t-fix.patch" - ) - then - ../18/${p} - else if - lib.versionAtLeast release_version "15" - && lib.versionOlder release_version "17" - && ( - p == "clang/purity.patch" - || p == "libunwind/gnu-install-dirs.patch" - || p == "llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch" - ) - then - ../15/${p} - else if p == "compiler-rt/X86-support-extension.patch" || p == "lldb/procfs.patch" then - (if lib.versionAtLeast release_version "15" then ../15/${p} else ../12/${p}) - else if - lib.versionAtLeast release_version "13" - && lib.versionOlder release_version "15" - && p == "compiler-rt/armv7l.patch" - then - ../13/${p} - else if p == "compiler-rt/gnu-install-dirs.patch" && lib.versionAtLeast release_version "15" then - (if lib.versionAtLeast release_version "15" then ../15/${p} else ../12/${p}) - else if - ( - p == "compiler-rt/darwin-targetconditionals.patch" - || p == "compiler-rt/codesign.patch" - || p == "lldb/cpu_subtype_arm64e_replacement.patch" - ) - && lib.versionAtLeast release_version "13" - then - ../13/${p} - else if - lib.versionAtLeast release_version "16" - && ( - p == "lld/add-table-base.patch" - || p == "compiler-rt/normalize-var.patch" - || p == "openmp/run-lit-directly.patch" - ) - then - ../16/${p} - else if - lib.versionOlder release_version "16" - && ( - p == "compiler-rt/normalize-var.patch" - || p == "lldb/resource-dir.patch" - || p == "clang/purity.patch" - ) - then - ../12/${p} - else if lib.versionOlder release_version "14" && p == "lld/gnu-install-dirs.patch" then - ../12/${p} - else if - lib.versionAtLeast release_version "14" - && ( - (lib.versionOlder release_version "18" && p == "llvm/gnu-install-dirs-polly.patch") - || (lib.versionOlder release_version "16" && p == "openmp/run-lit-directly.patch") - ) - then - ../14/${p} - else if - lib.versionAtLeast release_version "16" - && lib.versionOlder release_version "18" - && p == "llvm/lit-shell-script-runner-set-dyld-library-path.patch" - then - ../16/${p} - else if - lib.versionAtLeast release_version "17" - && (p == "llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch" || p == "openmp/fix-find-tool.patch") - then - ../17/${p} - else if - lib.versionAtLeast release_version "15" && p == "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch" - then - ../15/${p} - else - "${metadata.versionDir}/${p}"; + let + patches = { + "clang/gnu-install-dirs.patch" = [ + { + before = "14"; + path = ../12; + } + { + after = "19"; + path = ../19; + } + ]; + "clang/purity.patch" = [ + { + after = "18"; + path = ../18; + } + { + before = "17"; + after = "15"; + path = ../15; + } + { + before = "16"; + path = ../12; + } + ]; + "lld/add-table-base.patch" = [ + { + after = "16"; + path = ../16; + } + ]; + "lld/gnu-install-dirs.patch" = [ + { + after = "18"; + path = ../18; + } + { + before = "14"; + path = ../12; + } + ]; + "llvm/gnu-install-dirs.patch" = [ + { + after = "18"; + path = ../18; + } + ]; + "llvm/gnu-install-dirs-polly.patch" = [ + { + after = "18"; + path = ../18; + } + { + before = "18"; + after = "14"; + path = ../14; + } + ]; + "llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch" = [ + { + before = "17"; + after = "15"; + path = ../15; + } + { + after = "17"; + path = ../17; + } + ]; + "llvm/lit-shell-script-runner-set-dyld-library-path.patch" = [ + { + after = "18"; + path = ../18; + } + { + after = "16"; + before = "18"; + path = ../16; + } + ]; + "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch" = [ + { + after = "15"; + path = ../15; + } + ]; + "libcxx/0001-darwin-10.12-mbstate_t-fix.patch" = [ + { + after = "18"; + path = ../18; + } + ]; + "libunwind/gnu-install-dirs.patch" = [ + { + before = "17"; + after = "15"; + path = ../15; + } + ]; + "compiler-rt/X86-support-extension.patch" = [ + { + after = "15"; + path = ../15; + } + { + before = "15"; + path = ../12; + } + ]; + "compiler-rt/armv7l.patch" = [ + { + before = "15"; + after = "13"; + path = ../13; + } + ]; + "compiler-rt/gnu-install-dirs.patch" = [ + { + before = "14"; + path = ../12; + } + { + after = "13"; + before = "15"; + path = ../14; + } + { + after = "15"; + before = "17"; + path = ../15; + } + { + after = "16"; + path = ../17; + } + ]; + "compiler-rt/darwin-targetconditionals.patch" = [ + { + after = "13"; + path = ../13; + } + ]; + "compiler-rt/codesign.patch" = [ + { + after = "13"; + path = ../13; + } + ]; + "compiler-rt/normalize-var.patch" = [ + { + after = "16"; + path = ../16; + } + { + before = "16"; + path = ../12; + } + ]; + "lldb/procfs.patch" = [ + { + after = "15"; + path = ../15; + } + { + before = "15"; + path = ../12; + } + ]; + "lldb/cpu_subtype_arm64e_replacement.patch" = [ + { + after = "13"; + path = ../13; + } + ]; + "lldb/resource-dir.patch" = [ + { + before = "16"; + path = ../12; + } + ]; + "openmp/fix-find-tool.patch" = [ + { + after = "17"; + path = ../17; + } + ]; + "openmp/run-lit-directly.patch" = [ + { + after = "16"; + path = ../16; + } + { + after = "14"; + before = "16"; + path = ../14; + } + ]; + }; + + constraints = patches."${p}" or null; + matchConstraint = + { + before ? null, + after ? null, + path, + }: + let + check = fn: value: if value == null then true else fn release_version value; + matchBefore = check lib.versionOlder before; + matchAfter = check lib.versionAtLeast after; + in + matchBefore && matchAfter; + + patchDir = + toString + ( + if constraints == null then + { path = metadata.versionDir; } + else + (lib.findFirst matchConstraint { path = metadata.versionDir; } constraints) + ).path; + in + "${patchDir}/${p}"; }; }; From 749f1c21647072ec9985cf528607a06e89bc95de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 06:08:46 +0000 Subject: [PATCH 219/357] mattermost: 9.5.6 -> 9.5.8 --- pkgs/servers/mattermost/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 786b0e294739..666e812a691b 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { # See https://docs.mattermost.com/upgrade/extended-support-release.html # When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update # the version regex in passthru.updateScript as well. - version = "9.5.6"; + version = "9.5.8"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost"; rev = "v${version}"; - hash = "sha256-bLnvbduP6h9o82BQUNh9MyFpW/Cbl6c5o9hrPV0Z8+0="; + hash = "sha256-WK3O1t2mMqftH8EB12g1/xzQnnmJxSsBjaGrRk0Hypw="; }; # Needed because buildGoModule does not support go workspaces yet. @@ -34,7 +34,7 @@ buildGoModule rec { webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - hash = "sha256-ZlvO/7kdMopIHBDdFp6wSQCR+NobGdDC6PcVd1iG16E="; + hash = "sha256-gUp/Y0hI3oZkyTnEvyNXtHtPx77MC5zz+Z4b0FdrsqM="; }; # Makes nix-update-script pick up the fetchurl for the webapp. From bcb1c6f82b6a6f6853269e534a6dd87feaf6d160 Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Mon, 12 Aug 2024 17:21:41 +0200 Subject: [PATCH 220/357] fishnet: 2.7.1 -> 2.9.3 Fishnet now uses 2 NNUE files. The `postBuild` hook is now superfluous, I removed it. --- pkgs/servers/fishnet/default.nix | 36 +++++++++++++++++--------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/fishnet/default.nix b/pkgs/servers/fishnet/default.nix index 95e90ed98b7a..f7f2dac86085 100644 --- a/pkgs/servers/fishnet/default.nix +++ b/pkgs/servers/fishnet/default.nix @@ -5,41 +5,43 @@ }: let - nnueFile = "nn-5af11540bbfe.nnue"; - nnue = fetchurl { - url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; - hash = "sha256-WvEVQLv+/LVOOMXdAAyrS0ad+nWZodVb5dJyLCCokps="; + # These files can be found in Stockfish/src/evaluate.h + nnueBigFile = "nn-31337bea577c.nnue"; + nnueBig = fetchurl { + url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}"; + sha256 = "sha256-MTN76ld8W00LPlQYGGGJ7k9Yuq6rjX9vO9BXisp/d9k="; }; -in -rustPlatform.buildRustPackage rec { + nnueSmallFile = "nn-37f18f62d772.nnue"; + nnueSmall = fetchurl { + url = "https://tests.stockfishchess.org/api/nn/${nnueSmallFile}"; + sha256 = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0="; + }; +in rustPlatform.buildRustPackage rec { pname = "fishnet"; - version = "2.7.1"; + version = "2.9.3"; src = fetchFromGitHub { owner = "lichess-org"; repo = pname; rev = "v${version}"; - hash = "sha256-q73oGQYSWx1aFy9IvbGpecOoc0wLEY2IzJH9GufnvCs="; + hash = "sha256-HlCnUJBhIhooBvQVz1SDfiifXIBkBlH2dEq+C9al7qI="; fetchSubmodules = true; }; postPatch = '' - cp -v '${nnue}' 'Stockfish/src/${nnueFile}' - cp -v '${nnue}' 'Fairy-Stockfish/src/${nnueFile}' + cp -v '${nnueBig}' 'Stockfish/src/${nnueBigFile}' + cp -v '${nnueBig}' 'Fairy-Stockfish/src/${nnueBigFile}' + cp -v '${nnueSmall}' 'Stockfish/src/${nnueSmallFile}' + cp -v '${nnueSmall}' 'Fairy-Stockfish/src/${nnueSmallFile}' ''; - # Copying again bacause the file is deleted during build. - postBuild = '' - cp -v '${nnue}' 'Stockfish/src/${nnueFile}' - ''; - - cargoHash = "sha256-NO3u2ZXSiDQnZ/FFZLOtTnQoGMyN9pSI4sqGIXtjEcI="; + cargoHash = "sha256-Fb28XNhCt88PFnJ4s0I80L/rLJtBTEZ8Xd/68MYFoLs="; meta = with lib; { description = "Distributed Stockfish analysis for lichess.org"; homepage = "https://github.com/lichess-org/fishnet"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ tu-maurice ]; + maintainers = with maintainers; [ tu-maurice thibaultd ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; mainProgram = "fishnet"; }; From 11ce9983ff3c9903d45d06e30c860d4afcf44377 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 16 Aug 2024 09:18:01 +0300 Subject: [PATCH 221/357] nix-init: 0.3.1 -> 0.3.2 --- pkgs/tools/nix/nix-init/Cargo.lock | 5121 +++++++++++++++++++++++++++ pkgs/tools/nix/nix-init/default.nix | 9 +- 2 files changed, 5127 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/nix/nix-init/Cargo.lock diff --git a/pkgs/tools/nix/nix-init/Cargo.lock b/pkgs/tools/nix/nix-init/Cargo.lock new file mode 100644 index 000000000000..9c2168f0ec93 --- /dev/null +++ b/pkgs/tools/nix/nix-init/Cargo.lock @@ -0,0 +1,5121 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "annotate-snippets" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e35ed54e5ea7997c14ed4c70ba043478db1112e98263b3b035907aa197d991" +dependencies = [ + "anstyle", + "unicode-width", +] + +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "askalono" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b5d702bda44c54cef36c81456389719711127ad83e46b9d06fda469bd2e6d7" +dependencies = [ + "anyhow", + "flate2", + "lazy_static", + "log", + "rayon", + "regex", + "rmp-serde", + "serde", + "serde_json", + "unicode-normalization", + "zstd 0.11.2+zstd.1.5.2", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "beef" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bitmaps" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" +dependencies = [ + "typenum", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bstr" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "regex-automata 0.4.7", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "bytesize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" + +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "cargo" +version = "0.82.0" +source = "git+https://github.com/rust-lang/cargo.git?rev=d585829270c758468b9fd20b2b7fd3d4f4557763#d585829270c758468b9fd20b2b7fd3d4f4557763" +dependencies = [ + "annotate-snippets", + "anstream", + "anstyle", + "anyhow", + "base64", + "bytesize", + "cargo-credential", + "cargo-credential-libsecret", + "cargo-credential-macos-keychain", + "cargo-credential-wincred", + "cargo-platform", + "cargo-util", + "cargo-util-schemas", + "clap", + "color-print", + "crates-io", + "curl", + "curl-sys", + "filetime", + "flate2", + "git2", + "git2-curl", + "gix", + "glob", + "hex", + "hmac", + "home", + "http-auth", + "humantime", + "ignore", + "im-rc", + "indexmap 2.4.0", + "itertools", + "jobserver", + "lazycell", + "libc", + "libgit2-sys", + "memchr", + "opener", + "openssl", + "os_info", + "pasetors", + "pathdiff", + "rand", + "regex", + "rusqlite", + "rustfix", + "same-file", + "semver", + "serde", + "serde-untagged", + "serde_ignored", + "serde_json", + "sha1", + "shell-escape", + "supports-hyperlinks", + "supports-unicode", + "tar", + "tempfile", + "time", + "toml", + "toml_edit", + "tracing", + "tracing-chrome", + "tracing-subscriber", + "unicase", + "unicode-width", + "url", + "walkdir", + "windows-sys 0.52.0", +] + +[[package]] +name = "cargo-credential" +version = "0.4.6" +source = "git+https://github.com/rust-lang/cargo.git?rev=d585829270c758468b9fd20b2b7fd3d4f4557763#d585829270c758468b9fd20b2b7fd3d4f4557763" +dependencies = [ + "anyhow", + "libc", + "serde", + "serde_json", + "thiserror", + "time", + "windows-sys 0.52.0", +] + +[[package]] +name = "cargo-credential-libsecret" +version = "0.4.7" +source = "git+https://github.com/rust-lang/cargo.git?rev=d585829270c758468b9fd20b2b7fd3d4f4557763#d585829270c758468b9fd20b2b7fd3d4f4557763" +dependencies = [ + "anyhow", + "cargo-credential", + "libloading", +] + +[[package]] +name = "cargo-credential-macos-keychain" +version = "0.4.7" +source = "git+https://github.com/rust-lang/cargo.git?rev=d585829270c758468b9fd20b2b7fd3d4f4557763#d585829270c758468b9fd20b2b7fd3d4f4557763" +dependencies = [ + "cargo-credential", + "security-framework", +] + +[[package]] +name = "cargo-credential-wincred" +version = "0.4.7" +source = "git+https://github.com/rust-lang/cargo.git?rev=d585829270c758468b9fd20b2b7fd3d4f4557763#d585829270c758468b9fd20b2b7fd3d4f4557763" +dependencies = [ + "cargo-credential", + "windows-sys 0.52.0", +] + +[[package]] +name = "cargo-platform" +version = "0.1.8" +source = "git+https://github.com/rust-lang/cargo.git?rev=d585829270c758468b9fd20b2b7fd3d4f4557763#d585829270c758468b9fd20b2b7fd3d4f4557763" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-util" +version = "0.2.14" +source = "git+https://github.com/rust-lang/cargo.git?rev=d585829270c758468b9fd20b2b7fd3d4f4557763#d585829270c758468b9fd20b2b7fd3d4f4557763" +dependencies = [ + "anyhow", + "core-foundation", + "filetime", + "hex", + "ignore", + "jobserver", + "libc", + "miow", + "same-file", + "sha2", + "shell-escape", + "tempfile", + "tracing", + "walkdir", + "windows-sys 0.52.0", +] + +[[package]] +name = "cargo-util-schemas" +version = "0.5.0" +source = "git+https://github.com/rust-lang/cargo.git?rev=d585829270c758468b9fd20b2b7fd3d4f4557763#d585829270c758468b9fd20b2b7fd3d4f4557763" +dependencies = [ + "semver", + "serde", + "serde-untagged", + "serde-value", + "thiserror", + "toml", + "unicode-xid", + "url", +] + +[[package]] +name = "cc" +version = "1.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68064e60dbf1f17005c2fde4d07c16d8baa506fd7ffed8ccab702d93617975c7" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "chumsky" +version = "1.0.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9c28d4e5dd9a9262a38b231153591da6ce1471b818233f4727985d3dd0ed93c" +dependencies = [ + "hashbrown 0.14.5", + "regex-automata 0.3.9", + "serde", + "stacker", + "unicode-ident", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clap" +version = "4.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", + "terminal_size", + "unicase", + "unicode-width", +] + +[[package]] +name = "clap_complete" +version = "4.5.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c677cd0126f3026d8b093fa29eae5d812fde5c05bc66dbb29d0374eea95113a" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_derive" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "clap_mangen" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17415fd4dfbea46e3274fcd8d368284519b358654772afb700dc2e8d2b24eeb" +dependencies = [ + "clap", + "roff", +] + +[[package]] +name = "clipboard-win" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" +dependencies = [ + "error-code", +] + +[[package]] +name = "clru" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59" + +[[package]] +name = "color-print" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee543c60ff3888934877a5671f45494dd27ed4ba25c6670b9a7576b7ed7a8c0" +dependencies = [ + "color-print-proc-macro", +] + +[[package]] +name = "color-print-proc-macro" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ff1a80c5f3cb1ca7c06ffdd71b6a6dd6d8f896c42141fbd43f50ed28dcdb93" +dependencies = [ + "nom", + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +dependencies = [ + "libc", +] + +[[package]] +name = "crates-io" +version = "0.40.4" +source = "git+https://github.com/rust-lang/cargo.git?rev=d585829270c758468b9fd20b2b7fd3d4f4557763#d585829270c758468b9fd20b2b7fd3d4f4557763" +dependencies = [ + "curl", + "percent-encoding", + "serde", + "serde_json", + "thiserror", + "url", +] + +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "ct-codecs" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" + +[[package]] +name = "curl" +version = "0.4.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" +dependencies = [ + "curl-sys", + "libc", + "openssl-probe", + "openssl-sys", + "schannel", + "socket2", + "windows-sys 0.52.0", +] + +[[package]] +name = "curl-sys" +version = "0.4.74+curl-8.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" +dependencies = [ + "cc", + "libc", + "libnghttp2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", + "windows-sys 0.52.0", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core 0.20.10", + "darling_macro 0.20.10", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.74", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core 0.14.4", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core 0.20.10", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] + +[[package]] +name = "defer-drop" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f613ec9fa66a6b28cdb1842b27f9adf24f39f9afc4dcdd9fdecee4aca7945c57" +dependencies = [ + "crossbeam-channel", + "once_cell", +] + +[[package]] +name = "deflate64" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "derive_builder" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + +[[package]] +name = "ed25519-compact" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190" +dependencies = [ + "getrandom", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "erased-serde" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" +dependencies = [ + "serde", + "typeid", +] + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-code" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + +[[package]] +name = "expand" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d073bf59a5b9bb23d930c9d668d5be4c092b41c5b23f1c10318b7c4fca07f9c" +dependencies = [ + "quote", + "syn 2.0.74", +] + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "faster-hex" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "filetime" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" +dependencies = [ + "cfg-if", + "libc", + "libredox", + "windows-sys 0.59.0", +] + +[[package]] +name = "flate2" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +dependencies = [ + "crc32fast", + "libz-sys", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-task", + "pin-project-lite", + "pin-utils", +] + +[[package]] +name = "fuzzy-matcher" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" +dependencies = [ + "thread_local", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", + "zeroize", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "git2" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" +dependencies = [ + "bitflags 2.6.0", + "libc", + "libgit2-sys", + "log", + "openssl-probe", + "openssl-sys", + "url", +] + +[[package]] +name = "git2-curl" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ff14527a1c242320039b138376f8e0786697a1b7b172bc44f6efda3ab9079f" +dependencies = [ + "curl", + "git2", + "log", + "url", +] + +[[package]] +name = "gix" +version = "0.63.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "984c5018adfa7a4536ade67990b3ebc6e11ab57b3d6cd9968de0947ca99b4b06" +dependencies = [ + "gix-actor", + "gix-attributes", + "gix-command", + "gix-commitgraph", + "gix-config", + "gix-credentials", + "gix-date", + "gix-diff", + "gix-dir", + "gix-discover", + "gix-features", + "gix-filter", + "gix-fs", + "gix-glob", + "gix-hash", + "gix-hashtable", + "gix-ignore", + "gix-index", + "gix-lock", + "gix-macros", + "gix-negotiate", + "gix-object", + "gix-odb", + "gix-pack", + "gix-path", + "gix-pathspec", + "gix-prompt", + "gix-protocol", + "gix-ref", + "gix-refspec", + "gix-revision", + "gix-revwalk", + "gix-sec", + "gix-submodule", + "gix-tempfile", + "gix-trace", + "gix-transport", + "gix-traverse", + "gix-url", + "gix-utils", + "gix-validate", + "gix-worktree", + "once_cell", + "parking_lot", + "prodash", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-actor" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0e454357e34b833cc3a00b6efbbd3dd4d18b24b9fb0c023876ec2645e8aa3f2" +dependencies = [ + "bstr", + "gix-date", + "gix-utils", + "itoa", + "thiserror", + "winnow", +] + +[[package]] +name = "gix-attributes" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e37ce99c7e81288c28b703641b6d5d119aacc45c1a6b247156e6249afa486257" +dependencies = [ + "bstr", + "gix-glob", + "gix-path", + "gix-quote", + "gix-trace", + "kstring", + "smallvec", + "thiserror", + "unicode-bom", +] + +[[package]] +name = "gix-bitmap" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a371db66cbd4e13f0ed9dc4c0fea712d7276805fccc877f77e96374d317e87ae" +dependencies = [ + "thiserror", +] + +[[package]] +name = "gix-chunk" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45c8751169961ba7640b513c3b24af61aa962c967aaf04116734975cd5af0c52" +dependencies = [ + "thiserror", +] + +[[package]] +name = "gix-command" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d76867867da891cbe32021ad454e8cae90242f6afb06762e4dd0d357afd1d7b" +dependencies = [ + "bstr", + "gix-path", + "gix-trace", + "shell-words", +] + +[[package]] +name = "gix-commitgraph" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "133b06f67f565836ec0c473e2116a60fb74f80b6435e21d88013ac0e3c60fc78" +dependencies = [ + "bstr", + "gix-chunk", + "gix-features", + "gix-hash", + "memmap2", + "thiserror", +] + +[[package]] +name = "gix-config" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fafe42957e11d98e354a66b6bd70aeea00faf2f62dd11164188224a507c840" +dependencies = [ + "bstr", + "gix-config-value", + "gix-features", + "gix-glob", + "gix-path", + "gix-ref", + "gix-sec", + "memchr", + "once_cell", + "smallvec", + "thiserror", + "unicode-bom", + "winnow", +] + +[[package]] +name = "gix-config-value" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b328997d74dd15dc71b2773b162cb4af9a25c424105e4876e6d0686ab41c383e" +dependencies = [ + "bitflags 2.6.0", + "bstr", + "gix-path", + "libc", + "thiserror", +] + +[[package]] +name = "gix-credentials" +version = "0.24.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "198588f532e4d1202e04e6c3f50e4d7c060dffc66801c6f53cc246f1d234739e" +dependencies = [ + "bstr", + "gix-command", + "gix-config-value", + "gix-path", + "gix-prompt", + "gix-sec", + "gix-trace", + "gix-url", + "thiserror", +] + +[[package]] +name = "gix-date" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eed6931f21491ee0aeb922751bd7ec97b4b2fe8fbfedcb678e2a2dce5f3b8c0" +dependencies = [ + "bstr", + "itoa", + "thiserror", + "time", +] + +[[package]] +name = "gix-diff" +version = "0.44.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1996d5c8a305b59709467d80617c9fde48d9d75fd1f4179ea970912630886c9d" +dependencies = [ + "bstr", + "gix-hash", + "gix-object", + "thiserror", +] + +[[package]] +name = "gix-dir" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60c99f8c545abd63abe541d20ab6cda347de406c0a3f1c80aadc12d9b0e94974" +dependencies = [ + "bstr", + "gix-discover", + "gix-fs", + "gix-ignore", + "gix-index", + "gix-object", + "gix-path", + "gix-pathspec", + "gix-trace", + "gix-utils", + "gix-worktree", + "thiserror", +] + +[[package]] +name = "gix-discover" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc27c699b63da66b50d50c00668bc0b7e90c3a382ef302865e891559935f3dbf" +dependencies = [ + "bstr", + "dunce", + "gix-fs", + "gix-hash", + "gix-path", + "gix-ref", + "gix-sec", + "thiserror", +] + +[[package]] +name = "gix-features" +version = "0.38.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac7045ac9fe5f9c727f38799d002a7ed3583cd777e3322a7c4b43e3cf437dc69" +dependencies = [ + "bytes", + "crc32fast", + "crossbeam-channel", + "flate2", + "gix-hash", + "gix-trace", + "gix-utils", + "libc", + "once_cell", + "parking_lot", + "prodash", + "sha1_smol", + "thiserror", + "walkdir", +] + +[[package]] +name = "gix-filter" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6547738da28275f4dff4e9f3a0f28509f53f94dd6bd822733c91cb306bca61a" +dependencies = [ + "bstr", + "encoding_rs", + "gix-attributes", + "gix-command", + "gix-hash", + "gix-object", + "gix-packetline-blocking", + "gix-path", + "gix-quote", + "gix-trace", + "gix-utils", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-fs" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6adf99c27cdf17b1c4d77680c917e0d94d8783d4e1c73d3be0d1d63107163d7a" +dependencies = [ + "fastrand", + "gix-features", + "gix-utils", +] + +[[package]] +name = "gix-glob" +version = "0.16.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7df15afa265cc8abe92813cd354d522f1ac06b29ec6dfa163ad320575cb447" +dependencies = [ + "bitflags 2.6.0", + "bstr", + "gix-features", + "gix-path", +] + +[[package]] +name = "gix-hash" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93d7df7366121b5018f947a04d37f034717e113dcf9ccd85c34b58e57a74d5e" +dependencies = [ + "faster-hex", + "thiserror", +] + +[[package]] +name = "gix-hashtable" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ddf80e16f3c19ac06ce415a38b8591993d3f73aede049cb561becb5b3a8e242" +dependencies = [ + "gix-hash", + "hashbrown 0.14.5", + "parking_lot", +] + +[[package]] +name = "gix-ignore" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6afb8f98e314d4e1adc822449389ada863c174b5707cedd327d67b84dba527" +dependencies = [ + "bstr", + "gix-glob", + "gix-path", + "gix-trace", + "unicode-bom", +] + +[[package]] +name = "gix-index" +version = "0.33.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9a44eb55bd84bb48f8a44980e951968ced21e171b22d115d1cdcef82a7d73f" +dependencies = [ + "bitflags 2.6.0", + "bstr", + "filetime", + "fnv", + "gix-bitmap", + "gix-features", + "gix-fs", + "gix-hash", + "gix-lock", + "gix-object", + "gix-traverse", + "gix-utils", + "gix-validate", + "hashbrown 0.14.5", + "itoa", + "libc", + "memmap2", + "rustix", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-lock" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bc7fe297f1f4614774989c00ec8b1add59571dc9b024b4c00acb7dedd4e19d" +dependencies = [ + "gix-tempfile", + "gix-utils", + "thiserror", +] + +[[package]] +name = "gix-macros" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "999ce923619f88194171a67fb3e6d613653b8d4d6078b529b15a765da0edcc17" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "gix-negotiate" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ec879fb6307bb63519ba89be0024c6f61b4b9d61f1a91fd2ce572d89fe9c224" +dependencies = [ + "bitflags 2.6.0", + "gix-commitgraph", + "gix-date", + "gix-hash", + "gix-object", + "gix-revwalk", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-object" +version = "0.42.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25da2f46b4e7c2fa7b413ce4dffb87f69eaf89c2057e386491f4c55cadbfe386" +dependencies = [ + "bstr", + "gix-actor", + "gix-date", + "gix-features", + "gix-hash", + "gix-utils", + "gix-validate", + "itoa", + "smallvec", + "thiserror", + "winnow", +] + +[[package]] +name = "gix-odb" +version = "0.61.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20d384fe541d93d8a3bb7d5d5ef210780d6df4f50c4e684ccba32665a5e3bc9b" +dependencies = [ + "arc-swap", + "gix-date", + "gix-features", + "gix-fs", + "gix-hash", + "gix-object", + "gix-pack", + "gix-path", + "gix-quote", + "parking_lot", + "tempfile", + "thiserror", +] + +[[package]] +name = "gix-pack" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e0594491fffe55df94ba1c111a6566b7f56b3f8d2e1efc750e77d572f5f5229" +dependencies = [ + "clru", + "gix-chunk", + "gix-features", + "gix-hash", + "gix-hashtable", + "gix-object", + "gix-path", + "gix-tempfile", + "memmap2", + "parking_lot", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-packetline" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b70486beda0903b6d5b65dfa6e40585098cdf4e6365ca2dff4f74c387354a515" +dependencies = [ + "bstr", + "faster-hex", + "gix-trace", + "thiserror", +] + +[[package]] +name = "gix-packetline-blocking" +version = "0.17.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31d42378a3d284732e4d589979930d0d253360eccf7ec7a80332e5ccb77e14a" +dependencies = [ + "bstr", + "faster-hex", + "gix-trace", + "thiserror", +] + +[[package]] +name = "gix-path" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d23d5bbda31344d8abc8de7c075b3cf26e5873feba7c4a15d916bce67382bd9" +dependencies = [ + "bstr", + "gix-trace", + "home", + "once_cell", + "thiserror", +] + +[[package]] +name = "gix-pathspec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d307d1b8f84dc8386c4aa20ce0cf09242033840e15469a3ecba92f10cfb5c046" +dependencies = [ + "bitflags 2.6.0", + "bstr", + "gix-attributes", + "gix-config-value", + "gix-glob", + "gix-path", + "thiserror", +] + +[[package]] +name = "gix-prompt" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e0595d2be4b6d6a71a099e989bdd610882b882da35fb8503d91d6f81aa0936f" +dependencies = [ + "gix-command", + "gix-config-value", + "parking_lot", + "rustix", + "thiserror", +] + +[[package]] +name = "gix-protocol" +version = "0.45.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad8da8e89f24177bd77947092199bb13dcc318bbd73530ba8a05e6d6adaaa9d" +dependencies = [ + "bstr", + "gix-credentials", + "gix-date", + "gix-features", + "gix-hash", + "gix-transport", + "gix-utils", + "maybe-async", + "thiserror", + "winnow", +] + +[[package]] +name = "gix-quote" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbff4f9b9ea3fa7a25a70ee62f545143abef624ac6aa5884344e70c8b0a1d9ff" +dependencies = [ + "bstr", + "gix-utils", + "thiserror", +] + +[[package]] +name = "gix-ref" +version = "0.44.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3394a2997e5bc6b22ebc1e1a87b41eeefbcfcff3dbfa7c4bd73cb0ac8f1f3e2e" +dependencies = [ + "gix-actor", + "gix-date", + "gix-features", + "gix-fs", + "gix-hash", + "gix-lock", + "gix-object", + "gix-path", + "gix-tempfile", + "gix-utils", + "gix-validate", + "memmap2", + "thiserror", + "winnow", +] + +[[package]] +name = "gix-refspec" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6868f8cd2e62555d1f7c78b784bece43ace40dd2a462daf3b588d5416e603f37" +dependencies = [ + "bstr", + "gix-hash", + "gix-revision", + "gix-validate", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-revision" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b13e43c2118c4b0537ddac7d0821ae0dfa90b7b8dbf20c711e153fb749adce" +dependencies = [ + "bstr", + "gix-date", + "gix-hash", + "gix-object", + "gix-revwalk", + "thiserror", +] + +[[package]] +name = "gix-revwalk" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b030ccaab71af141f537e0225f19b9e74f25fefdba0372246b844491cab43e0" +dependencies = [ + "gix-commitgraph", + "gix-date", + "gix-hash", + "gix-hashtable", + "gix-object", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-sec" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1547d26fa5693a7f34f05b4a3b59a90890972922172653bcb891ab3f09f436df" +dependencies = [ + "bitflags 2.6.0", + "gix-path", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "gix-submodule" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "921cd49924ac14b6611b22e5fb7bbba74d8780dc7ad26153304b64d1272460ac" +dependencies = [ + "bstr", + "gix-config", + "gix-path", + "gix-pathspec", + "gix-refspec", + "gix-url", + "thiserror", +] + +[[package]] +name = "gix-tempfile" +version = "14.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006acf5a613e0b5cf095d8e4b3f48c12a60d9062aa2b2dd105afaf8344a5600c" +dependencies = [ + "gix-fs", + "libc", + "once_cell", + "parking_lot", + "tempfile", +] + +[[package]] +name = "gix-trace" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f924267408915fddcd558e3f37295cc7d6a3e50f8bd8b606cee0808c3915157e" + +[[package]] +name = "gix-transport" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27c02b83763ffe95bcc27ce5821b2b7f843315a009c06f1cd59c9b66c508c058" +dependencies = [ + "base64", + "bstr", + "curl", + "gix-command", + "gix-credentials", + "gix-features", + "gix-packetline", + "gix-quote", + "gix-sec", + "gix-url", + "thiserror", +] + +[[package]] +name = "gix-traverse" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e499a18c511e71cf4a20413b743b9f5bcf64b3d9e81e9c3c6cd399eae55a8840" +dependencies = [ + "bitflags 2.6.0", + "gix-commitgraph", + "gix-date", + "gix-hash", + "gix-hashtable", + "gix-object", + "gix-revwalk", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-url" +version = "0.27.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2eb9b35bba92ea8f0b5ab406fad3cf6b87f7929aa677ff10aa042c6da621156" +dependencies = [ + "bstr", + "gix-features", + "gix-path", + "home", + "thiserror", + "url", +] + +[[package]] +name = "gix-utils" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35192df7fd0fa112263bad8021e2df7167df4cc2a6e6d15892e1e55621d3d4dc" +dependencies = [ + "bstr", + "fastrand", + "unicode-normalization", +] + +[[package]] +name = "gix-validate" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82c27dd34a49b1addf193c92070bcbf3beaf6e10f16a78544de6372e146a0acf" +dependencies = [ + "bstr", + "thiserror", +] + +[[package]] +name = "gix-worktree" +version = "0.34.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26f7326ebe0b9172220694ea69d344c536009a9b98fb0f9de092c440f3efe7a6" +dependencies = [ + "bstr", + "gix-attributes", + "gix-features", + "gix-fs", + "gix-glob", + "gix-hash", + "gix-ignore", + "gix-index", + "gix-object", + "gix-path", + "gix-validate", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap 2.4.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + +[[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 = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-auth" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643c9bbf6a4ea8a656d6b4cd53d34f79e3f841ad5203c1a55fb7d761923bc255" +dependencies = [ + "memchr", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata 0.4.7", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "im-rc" +version = "15.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe" +dependencies = [ + "bitmaps", + "rand_core", + "rand_xoshiro", + "sized-chunks", + "typenum", + "version_check", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "insta" +version = "1.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "similar", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kstring" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "558bf9508a558512042d3095138b1f7b8fe90c5467d94f9f1da28b3731c5dbd1" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "libgit2-sys" +version = "0.17.0+1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" +dependencies = [ + "cc", + "libc", + "libssh2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", +] + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libnghttp2-sys" +version = "0.1.10+1.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "959c25552127d2e1fa72f0e52548ec04fc386e827ba71a7bd01db46a447dc135" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libssh2-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "license-store-cache" +version = "0.3.2" +dependencies = [ + "askalono", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "maybe-async" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "miow" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", +] + +[[package]] +name = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset", + "pin-utils", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "nix-init" +version = "0.3.2" +dependencies = [ + "anyhow", + "askalono", + "bstr", + "cargo", + "chumsky", + "clap", + "clap_complete", + "clap_mangen", + "expand", + "flate2", + "heck", + "indoc", + "insta", + "is-terminal", + "itertools", + "once_cell", + "owo-colors", + "parse-display", + "pep-508", + "rayon", + "regex", + "reqwest", + "rustc-hash", + "rustyline", + "secrecy", + "semver", + "serde", + "serde_json", + "serde_with", + "serde_yaml", + "shlex", + "spdx", + "tar", + "tempfile", + "time", + "tokio", + "toml", + "tracing", + "tracing-subscriber", + "url", + "xdg", + "zip", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "normpath" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "object" +version = "0.36.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "opener" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0812e5e4df08da354c851a3376fead46db31c2214f849d3de356d774d057681" +dependencies = [ + "bstr", + "dbus", + "normpath", + "windows-sys 0.59.0", +] + +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-src" +version = "300.3.1+3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + +[[package]] +name = "orion" +version = "0.17.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abdb10181903c8c4b016ba45d6d6d5af1a1e2a461aa4763a83b87f5df4695e5" +dependencies = [ + "fiat-crypto", + "subtle", + "zeroize", +] + +[[package]] +name = "os_info" +version = "3.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +dependencies = [ + "log", + "windows-sys 0.52.0", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owo-colors" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "parse-display" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287d8d3ebdce117b8539f59411e4ed9ec226e0a4153c7f55495c6070d68e6f72" +dependencies = [ + "parse-display-derive", + "regex", + "regex-syntax 0.8.4", +] + +[[package]] +name = "parse-display-derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc048687be30d79502dea2f623d052f3a074012c6eac41726b7ab17213616b1" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "regex-syntax 0.8.4", + "structmeta", + "syn 2.0.74", +] + +[[package]] +name = "pasetors" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b36d47c66f2230dd1b7143d9afb2b4891879020210eddf2ccb624e529b96dba" +dependencies = [ + "ct-codecs", + "ed25519-compact", + "getrandom", + "orion", + "p384", + "rand_core", + "regex", + "serde", + "serde_json", + "sha2", + "subtle", + "time", + "zeroize", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "pep-508" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d56536b95df75cc5801a27ae2b53381d5d295fb30837be65f72916ecef5d1e4f" +dependencies = [ + "chumsky", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "prodash" +version = "28.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79" +dependencies = [ + "parking_lot", +] + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_xoshiro" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.5", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rmp" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ce7d70c926fe472aed493b902010bccc17fa9f7284145cb8772fd22fdb052d8" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + +[[package]] +name = "roff" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3" + +[[package]] +name = "rusqlite" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +dependencies = [ + "bitflags 2.6.0", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + +[[package]] +name = "rustfix" +version = "0.8.5" +source = "git+https://github.com/rust-lang/cargo.git?rev=d585829270c758468b9fd20b2b7fd3d4f4557763#d585829270c758468b9fd20b2b7fd3d4f4557763" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "once_cell", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "rustyline" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "clipboard-win", + "libc", + "log", + "memchr", + "nix 0.28.0", + "rustyline-derive", + "skim", + "unicode-segmentation", + "unicode-width", + "utf8parse", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustyline-derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5af959c8bf6af1aff6d2b463a57f71aae53d1332da58419e30ad8dc7011d951" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "secrecy" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" +dependencies = [ + "serde", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.208" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-untagged" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2676ba99bd82f75cae5cbd2c8eda6fa0b8760f18978ea840e980dd5567b5c5b6" +dependencies = [ + "erased-serde", + "serde", + "typeid", +] + +[[package]] +name = "serde-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.208" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "serde_ignored" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8e319a36d1b52126a0d608f24e93b2d81297091818cd70625fcf50a15d84ddf" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_json" +version = "1.0.125" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +dependencies = [ + "base64", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.4.0", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.4.0", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha1_smol" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shell-escape" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" + +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "similar" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" + +[[package]] +name = "sized-chunks" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" +dependencies = [ + "bitmaps", + "typenum", +] + +[[package]] +name = "skim" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d28de0a6cb2cdd83a076f1de9d965b973ae08b244df1aa70b432946dda0f32" +dependencies = [ + "beef", + "bitflags 1.3.2", + "chrono", + "crossbeam", + "defer-drop", + "derive_builder", + "fuzzy-matcher", + "lazy_static", + "log", + "nix 0.25.1", + "rayon", + "regex", + "time", + "timer", + "tuikit", + "unicode-width", + "vte", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spdx" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47317bbaf63785b53861e1ae2d11b80d6b624211d42cb20efcd210ee6f8a14bc" +dependencies = [ + "smallvec", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "structmeta" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" +dependencies = [ + "proc-macro2", + "quote", + "structmeta-derive", + "syn 2.0.74", +] + +[[package]] +name = "structmeta-derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "supports-hyperlinks" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c0a1e5168041f5f3ff68ff7d95dcb9c8749df29f6e7e89ada40dd4c9de404ee" + +[[package]] +name = "supports-unicode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "timer" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31d42176308937165701f50638db1c31586f183f1aab416268216577aec7306b" +dependencies = [ + "chrono", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap 2.4.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "tracing-chrome" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf0a738ed5d6450a9fb96e86a23ad808de2b727fd1394585da5cdd6788ffe724" +dependencies = [ + "serde_json", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tuikit" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e19c6ab038babee3d50c8c12ff8b910bdb2196f62278776422f50390d8e53d8" +dependencies = [ + "bitflags 1.3.2", + "lazy_static", + "log", + "nix 0.24.3", + "term", + "unicode-width", +] + +[[package]] +name = "typeid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-bom" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "vte" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +dependencies = [ + "arrayvec", + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.74", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "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.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "zip" +version = "2.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" +dependencies = [ + "aes", + "arbitrary", + "bzip2", + "constant_time_eq", + "crc32fast", + "crossbeam-utils", + "deflate64", + "displaydoc", + "flate2", + "hmac", + "indexmap 2.4.0", + "lzma-rs", + "memchr", + "pbkdf2", + "rand", + "sha1", + "thiserror", + "time", + "zeroize", + "zopfli", + "zstd 0.13.2", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", +] + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe 7.2.1", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.13+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix index 28d261fd061d..2784ac2518f1 100644 --- a/pkgs/tools/nix/nix-init/default.nix +++ b/pkgs/tools/nix/nix-init/default.nix @@ -25,16 +25,19 @@ in rustPlatform.buildRustPackage rec { pname = "nix-init"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-init"; rev = "v${version}"; - hash = "sha256-PeOYYTSqqi/KSp+QjMbnNRQqKENo/zemN5Bpqiyh0vA="; + hash = "sha256-0RLEPVtYnwYH+pMnpO0/Evbp7x9d0RMobOVAqwgMJz4="; }; - cargoHash = "sha256-YRScCgmrCjzSZWHvnaBTCJsT02gd4SToz130zOMQ+VY="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes."cargo-0.82.0" = "sha256-1G14vLW3FhLxOWGxuHXcWgb+XXS1vOOyQYKVbrJWlmI="; + }; nativeBuildInputs = [ curl From f0c5d2f5f1e4f9561ec286e6fe5aafc8828c99ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 16 Aug 2024 08:18:34 +0200 Subject: [PATCH 222/357] bandwhich: 0.22.2 -> 0.22.2-unstable-2024-08-13 Diff: https://github.com/imsnif/bandwhich/compare/adfadfa...894ea319838cbfd75b00f08518bca41a9c8e060c Changelog: https://github.com/imsnif/bandwhich/blob/894ea319838cbfd75b00f08518bca41a9c8e060c/CHANGELOG.md --- pkgs/tools/networking/bandwhich/Cargo.lock | 1025 ++++++++++++------- pkgs/tools/networking/bandwhich/default.nix | 6 +- 2 files changed, 641 insertions(+), 390 deletions(-) diff --git a/pkgs/tools/networking/bandwhich/Cargo.lock b/pkgs/tools/networking/bandwhich/Cargo.lock index feb4351cdb2a..f43aee7979f1 100644 --- a/pkgs/tools/networking/bandwhich/Cargo.lock +++ b/pkgs/tools/networking/bandwhich/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", ] @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", @@ -42,18 +42,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -72,47 +72,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -120,35 +121,44 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" dependencies = [ "backtrace", ] [[package]] -name = "async-trait" -version = "0.1.77" +name = "arbitrary" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "async-trait" +version = "0.1.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -175,7 +185,7 @@ dependencies = [ "http_req", "insta", "ipnetwork", - "itertools", + "itertools 0.13.0", "log", "netstat2", "once_cell", @@ -198,12 +208,6 @@ dependencies = [ "zip", ] -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - [[package]] name = "bitflags" version = "1.3.2" @@ -212,9 +216,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block-buffer" @@ -226,10 +230,21 @@ dependencies = [ ] [[package]] -name = "bumpalo" -version = "3.14.0" +name = "bstr" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "regex-automata", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -239,9 +254,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bzip2" @@ -271,13 +286,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] -name = "cc" -version = "1.0.83" +name = "castaway" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" +dependencies = [ + "rustversion", +] + +[[package]] +name = "cc" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -288,16 +313,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.33" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -312,9 +337,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.18" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" dependencies = [ "clap_builder", "clap_derive", @@ -322,9 +347,9 @@ dependencies = [ [[package]] name = "clap-verbosity-flag" -version = "2.1.2" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57f73ca21b17a0352944b9bb61803b6007bd911b6cccfef7153f7f0600ac495" +checksum = "63d19864d6b68464c59f7162c9914a0b569ddc2926b4a2d71afe62a9738eff53" dependencies = [ "clap", "log", @@ -332,9 +357,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" dependencies = [ "anstream", "anstyle", @@ -344,36 +369,36 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.9" +version = "4.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df631ae429f6613fcd3a7c1adbdb65f637271e561b03680adaa6573015dfb106" +checksum = "a8670053e87c316345e384ca1f3eba3006fc6355ed8b8a1140d104e109e3df34" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "clap_mangen" -version = "0.2.17" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7c2b01e5e779c19f46a94bbd398f33ae63b0f78c07108351fb4536845bb7fd" +checksum = "f17415fd4dfbea46e3274fcd8d368284519b358654772afb700dc2e8d2b24eeb" dependencies = [ "clap", "roff", @@ -381,9 +406,22 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "compact_str" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "ryu", + "static_assertions", +] [[package]] name = "console" @@ -399,9 +437,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" @@ -429,10 +467,25 @@ dependencies = [ ] [[package]] -name = "crc32fast" -version = "1.3.2" +name = "crc" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -458,9 +511,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" @@ -468,10 +521,10 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "crossterm_winapi", "libc", - "mio", + "mio 0.8.11", "parking_lot", "signal-hook", "signal-hook-mio", @@ -499,9 +552,15 @@ 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 = "deflate64" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" [[package]] name = "deranged" @@ -534,6 +593,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + [[package]] name = "digest" version = "0.10.7" @@ -546,10 +616,21 @@ dependencies = [ ] [[package]] -name = "either" -version = "1.9.0" +name = "displaydoc" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -563,17 +644,23 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] -name = "errno" -version = "0.3.8" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -581,15 +668,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -675,7 +762,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] @@ -692,9 +779,9 @@ checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" @@ -726,9 +813,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -737,9 +824,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" @@ -749,9 +836,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[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", @@ -764,10 +851,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.4" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -797,9 +890,9 @@ dependencies = [ [[package]] name = "http_req" -version = "0.10.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90394b01e9de1f7eca6ca0664cc64bd92add9603c1aa4f961813f23789035e10" +checksum = "0122ab6637149482eb66b57288ac597bc7eb9859cbaa79dee62fa19a350df3d2" dependencies = [ "native-tls", "unicase", @@ -807,16 +900,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -849,10 +942,14 @@ dependencies = [ ] [[package]] -name = "indoc" -version = "2.0.4" +name = "indexmap" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] [[package]] name = "inout" @@ -865,15 +962,14 @@ dependencies = [ [[package]] name = "insta" -version = "1.34.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "lazy_static", "linked-hash-map", "similar", - "yaml-rust", ] [[package]] @@ -904,49 +1000,64 @@ dependencies = [ ] [[package]] -name = "itertools" -version = "0.12.0" +name = "is_terminal_polyfill" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +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.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "linked-hash-map" @@ -956,31 +1067,37 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[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", ] [[package]] -name = "log" -version = "0.4.20" +name = "lockfree-object-pool" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ "hashbrown", ] @@ -994,6 +1111,16 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + [[package]] name = "match_cfg" version = "0.1.0" @@ -1002,24 +1129,24 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -1028,12 +1155,23 @@ dependencies = [ ] [[package]] -name = "native-tls" -version = "0.2.11" +name = "mio" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -1093,37 +1231,27 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] [[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", ] @@ -1136,11 +1264,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.63" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -1157,7 +1285,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] @@ -1168,9 +1296,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.99" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -1191,9 +1319,9 @@ dependencies = [ [[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", @@ -1201,44 +1329,31 @@ 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", -] - -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", + "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 = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", "hmac", - "password-hash", - "sha2", ] [[package]] @@ -1249,9 +1364,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1261,9 +1376,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "pnet" @@ -1310,7 +1425,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] @@ -1369,10 +1484,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "proc-macro2" -version = "1.0.78" +name = "proc-macro-crate" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1383,7 +1507,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "chrono", "flate2", "hex", @@ -1398,7 +1522,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "chrono", "hex", ] @@ -1411,9 +1535,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1450,28 +1574,30 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.25.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb" +checksum = "d16546c5b5962abf8ce6e2881e722b4e0ae3b6f1a08a26ae3573c55853ca68d3" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cassowary", + "compact_str", "crossterm", - "indoc", - "itertools", + "itertools 0.13.0", "lru", "paste", "stability", "strum", + "strum_macros", "unicode-segmentation", + "unicode-truncate", "unicode-width", ] [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -1489,18 +1615,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.3" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -1510,9 +1636,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -1521,15 +1647,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "relative-path" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" +checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "resolv-conf" @@ -1549,9 +1675,9 @@ checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" [[package]] name = "rstest" -version = "0.18.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199" +checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" dependencies = [ "futures", "futures-timer", @@ -1561,26 +1687,27 @@ dependencies = [ [[package]] name = "rstest_macros" -version = "0.18.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" +checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" dependencies = [ "cfg-if", "glob", + "proc-macro-crate", "proc-macro2", "quote", "regex", "relative-path", "rustc_version", - "syn 2.0.48", + "syn 2.0.68", "unicode-ident", ] [[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" @@ -1593,11 +1720,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -1606,9 +1733,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" @@ -1627,11 +1760,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -1640,9 +1773,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -1650,28 +1783,28 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.196" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] @@ -1685,17 +1818,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "signal-hook" version = "0.3.17" @@ -1708,29 +1830,35 @@ 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", ] [[package]] -name = "similar" -version = "2.4.0" +name = "simd-adler32" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "similar" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" [[package]] name = "simplelog" @@ -1754,63 +1882,69 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "stability" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" +checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a" dependencies = [ "quote", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] -name = "strsim" -version = "0.10.0" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.48", + "syn 2.0.68", ] [[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" @@ -1825,9 +1959,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -1836,59 +1970,58 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.5" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" +checksum = "29a6b037e3af4ae9a9d6214198e4df53091363b2c96c88fc416a6c1bd92a2799" dependencies = [ - "cfg-if", + "bstr", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", "rayon", "windows", ] [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.1.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] @@ -1926,9 +2059,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ "tinyvec_macros", ] @@ -1941,18 +2074,34 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.1", "pin-project-lite", "socket2", - "windows-sys 0.48.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", ] [[package]] @@ -1974,7 +2123,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] @@ -2061,30 +2210,40 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-truncate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5fbabedabe362c618c714dbefda9927b5afc8e2a8102f47f081089a9019226" +dependencies = [ + "itertools 0.12.1", + "unicode-width", +] [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[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 0.5.0", @@ -2093,9 +2252,9 @@ dependencies = [ [[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 = "vcpkg" @@ -2117,9 +2276,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2127,24 +2286,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2152,28 +2311,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -2193,11 +2352,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -2208,12 +2367,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ - "windows-core", - "windows-targets 0.52.0", + "windows-core 0.57.0", + "windows-targets 0.52.6", ] [[package]] @@ -2222,7 +2381,50 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -2240,7 +2442,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -2260,17 +2462,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "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.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -2281,9 +2484,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -2293,9 +2496,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -2305,9 +2508,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -2317,9 +2526,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -2329,9 +2538,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -2341,9 +2550,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -2353,9 +2562,18 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -2367,79 +2585,112 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[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 = [ "zerocopy-derive", ] [[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", - "syn 2.0.48", + "syn 2.0.68", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", ] [[package]] name = "zip" -version = "0.6.6" +version = "2.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" dependencies = [ "aes", - "byteorder", + "arbitrary", "bzip2", "constant_time_eq", "crc32fast", "crossbeam-utils", + "deflate64", + "displaydoc", "flate2", "hmac", + "indexmap", + "lzma-rs", + "memchr", "pbkdf2", + "rand", "sha1", + "thiserror", "time", + "zeroize", + "zopfli", "zstd", ] [[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" +name = "zopfli" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", +] + +[[package]] +name = "zstd" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.11+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index eb361e1aac2d..77b67409d745 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.22.2"; + version = "0.22.2-unstable-2024-08-13"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; - rev = "v${version}"; - hash = "sha256-/uG1xjhxnIkS3rq7Tv1q1v8X7p1baDB8OiSEV9OLyfo="; + rev = "894ea319838cbfd75b00f08518bca41a9c8e060c"; + hash = "sha256-DjH48mkgz81ACvZ28P2HzhLvS7wVresWzIAPD7swzoY="; }; cargoLock = { From ca97ea91ae3161fcd99b6a07004b0df50b90b06d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 16 Aug 2024 08:21:47 +0200 Subject: [PATCH 223/357] csharp-ls: move to pkgs/by-name --- .../csharp-ls/default.nix => by-name/cs/csharp-ls/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/language-servers/csharp-ls/default.nix => by-name/cs/csharp-ls/package.nix} (100%) diff --git a/pkgs/development/tools/language-servers/csharp-ls/default.nix b/pkgs/by-name/cs/csharp-ls/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/csharp-ls/default.nix rename to pkgs/by-name/cs/csharp-ls/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4658573485ec..d43609da0e2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -864,8 +864,6 @@ with pkgs; # Dotnet - csharp-ls = callPackage ../development/tools/language-servers/csharp-ls { }; - dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {}); dotnet-sdk_6 = dotnetCorePackages.sdk_6_0; From cbf3961ef8d08e7dd15f0d95a4fbb1189d426914 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 15 Aug 2024 19:46:32 +0200 Subject: [PATCH 224/357] dovecot: 2.3.21 -> 2.3.21.1 Fixes CVE-2024-23184 and CVE-2024-23185. Changes: https://dovecot.org/mailman3/hyperkitty/list/dovecot-news@dovecot.org/thread/2CSVL56LFPAXVLWMGXEIWZL736PSYHP5/ --- pkgs/servers/mail/dovecot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 185f38d2e0be..e7be597d7e4f 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; - version = "2.3.21"; + version = "2.3.21.1"; nativeBuildInputs = [ perl pkg-config ]; buildInputs = @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; - hash = "sha256-BbEQk6ccI3wu8wmtWHUQchzJO77mgoJRVJ/BWGw2UC0="; + hash = "sha256-LZCheMQpdhEIi/farlSSo7w9WrYyjDoDLrQl0sJJCX4="; }; enableParallelBuilding = true; From 36f29a2229e45a96681e9e952ec1072c8895306e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 16 Aug 2024 08:23:34 +0200 Subject: [PATCH 225/357] csharp-ls: clean derivation, add testVersion --- pkgs/by-name/cs/csharp-ls/package.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix index 5cae31845563..398a0f20f4a4 100644 --- a/pkgs/by-name/cs/csharp-ls/package.nix +++ b/pkgs/by-name/cs/csharp-ls/package.nix @@ -1,6 +1,8 @@ -{ lib -, buildDotnetGlobalTool -, dotnetCorePackages +{ + lib, + buildDotnetGlobalTool, + dotnetCorePackages, + nix-update-script, }: let inherit (dotnetCorePackages) sdk_8_0; @@ -15,13 +17,17 @@ buildDotnetGlobalTool rec { dotnet-sdk = sdk_8_0; dotnet-runtime = sdk_8_0; - meta = with lib; { + passthru.tests = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Roslyn-based LSP language server for C#"; mainProgram = "csharp-ls"; homepage = "https://github.com/razzmatazz/csharp-language-server"; changelog = "https://github.com/razzmatazz/csharp-language-server/releases/tag/v${version}"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From d46f91b13d9bdc3d82546d76b1983193bb1536eb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 16 Aug 2024 08:28:31 +0200 Subject: [PATCH 226/357] csharp-ls: 0.14.0 -> 0.15.0 Diff: https://github.com/razzmatazz/csharp-language-server/compare/0.14.0...0.15.0 Changelog: https://github.com/razzmatazz/csharp-language-server/releases/tag/0.15.0 --- pkgs/by-name/cs/csharp-ls/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix index 398a0f20f4a4..75ad3c6aaf13 100644 --- a/pkgs/by-name/cs/csharp-ls/package.nix +++ b/pkgs/by-name/cs/csharp-ls/package.nix @@ -10,9 +10,9 @@ in buildDotnetGlobalTool rec { pname = "csharp-ls"; - version = "0.14.0"; + version = "0.15.0"; - nugetHash = "sha256-agcx7VPIqGhl3NzdGLPwXYJsRuvSjL4SdbNg9vFjIh4="; + nugetHash = "sha256-Fp1D2z4x2e85z4IO4xQentS7dbqhFT3e/BPZm0d5L5M="; dotnet-sdk = sdk_8_0; dotnet-runtime = sdk_8_0; From d506595e4304165d6bfe5d461ad794fc3239df99 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Thu, 15 Aug 2024 17:11:28 +0200 Subject: [PATCH 227/357] nixos/k3s: use jq instead of JSONpath to process test data Although kubectl has builtin JSONpath support, it is only supported partially and the support varies between different versions. While using JSONpath in tests worked for some versions, it failed for others. This contribution replaces the problematic JSONpath usages with the jq JSON processor. --- nixos/tests/k3s/containerd-config.nix | 10 ++++++++-- nixos/tests/k3s/kubelet-config.nix | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/tests/k3s/containerd-config.nix b/nixos/tests/k3s/containerd-config.nix index db4b3320411f..ffc449b03aba 100644 --- a/nixos/tests/k3s/containerd-config.nix +++ b/nixos/tests/k3s/containerd-config.nix @@ -1,6 +1,11 @@ # A test that containerdConfigTemplate settings get written to containerd/config.toml import ../make-test-python.nix ( - { lib, k3s, ... }: + { + pkgs, + lib, + k3s, + ... + }: let nodeName = "test"; in @@ -9,6 +14,7 @@ import ../make-test-python.nix ( nodes.machine = { ... }: { + environment.systemPackages = [ pkgs.jq ]; # k3s uses enough resources the default vm fails. virtualisation.memorySize = 1536; virtualisation.diskSize = 4096; @@ -38,7 +44,7 @@ import ../make-test-python.nix ( start_all() machine.wait_for_unit("k3s") # wait until the node is ready - machine.wait_until_succeeds(r"""kubectl wait --for='jsonpath={.status.conditions[?(@.type=="Ready")].status}=True' nodes/${nodeName}""") + machine.wait_until_succeeds(r"""kubectl get node ${nodeName} -ojson | jq -e '.status.conditions[] | select(.type == "Ready") | .status == "True"'""") # test whether the config template file contains the magic comment out=machine.succeed("cat /var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl") assert "MAGIC COMMENT" in out, "the containerd config template does not contain the magic comment" diff --git a/nixos/tests/k3s/kubelet-config.nix b/nixos/tests/k3s/kubelet-config.nix index e2c8e0434d62..031c9f823a63 100644 --- a/nixos/tests/k3s/kubelet-config.nix +++ b/nixos/tests/k3s/kubelet-config.nix @@ -53,7 +53,7 @@ import ../make-test-python.nix ( start_all() machine.wait_for_unit("k3s") # wait until the node is ready - machine.wait_until_succeeds(r"""kubectl wait --for='jsonpath={.status.conditions[?(@.type=="Ready")].status}=True' nodes/${nodeName}""") + machine.wait_until_succeeds(r"""kubectl get node ${nodeName} -ojson | jq -e '.status.conditions[] | select(.type == "Ready") | .status == "True"'""") # test whether the kubelet registered an inhibitor lock machine.succeed("systemd-inhibit --list --no-legend | grep \"kubelet.*k3s-server.*shutdown\"") # run kubectl proxy in the background, close stdout through redirection to not wait for the command to finish From 4018f62f912bea43655fcc5a807feda93d0eb49a Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Wed, 14 Aug 2024 15:33:00 +0200 Subject: [PATCH 228/357] k3s_1_28: 1.28.11+k3s2 -> 1.28.12+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.28.12%2Bk3s1 --- .../cluster/k3s/1_28/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_28/versions.nix | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json index 76bcc7ee7e0a..f5e27995f056 100644 --- a/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.11%2Bk3s2/k3s-airgap-images-amd64.tar.zst", - "sha256": "199nxfxwr52cddk2ljchhxaigyi0al3lzyc0jy2am4aljlm0jivy" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "0dhzkn5y3ng7blyxj4bwrhbq5qvl3hq1hzg0h9633h8swv0xbsss" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.11%2Bk3s2/k3s-airgap-images-arm.tar.zst", - "sha256": "02riiiwwr0h3zhlxxmjn5p8ws354rr2gk44x3kz9d7sxqn17sz4w" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "1225nqsfg7p6iq7a7qibzf3d0r7iwn53hnd9w6l189dxqna97015" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.11%2Bk3s2/k3s-airgap-images-arm64.tar.zst", - "sha256": "0bs9wj33appb9xpsb2v1xz4xck4qq6g74flnc0mxf9warwr4988r" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "1lic564naj9323dkkq0z0y10n3j3yfmhixargqqs60syanfvj2p7" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.11%2Bk3s2/k3s-images.txt", - "sha256": "0245zra2h8756kq2v8nwl6gji749xlvy1y1bkab8vz5b0vpqhfxy" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-images.txt", + "sha256": "1my3lfs5rfazcnnpsc9dj84dfnxx88xydrl86z6yw5n5p84x4nif" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix index 2312cc22cbe9..a6149c0d6e51 100644 --- a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix @@ -1,12 +1,12 @@ { - k3sVersion = "1.28.11+k3s2"; - k3sCommit = "d076d9a78cb835279a04f12c816ff4404884862e"; - k3sRepoSha256 = "1k1k3qmxc7n2h2i0g52ad4gnpq0qrvxnl7p2y0g9dss1ancgqwsd"; - k3sVendorHash = "sha256-tzcMcsTmY8lG+9EyYkzYJm1YU/8tGpxpH7oZ4Jl/yNU="; + k3sVersion = "1.28.12+k3s1"; + k3sCommit = "4717e2a58e04f0ba3d9f43d574a7eff01dea9146"; + k3sRepoSha256 = "02wywlqqna0dj9cam6q3ykb3p5mi96f6lclrg5yhjky7jdvkffds"; + k3sVendorHash = "sha256-RyUlaGQnfrCm4cB5FRs9IAeF+zn4LzAXmIViU3o30Z4="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.12.2"; - k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; + k3sRootVersion = "0.14.0"; + k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; containerdVersion = "1.7.17-k3s1.28"; From cd7af14c67aa43c6058167201f58c0e9bb5b4889 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 06:50:21 +0000 Subject: [PATCH 229/357] kcl: 0.9.7 -> 0.9.8 --- pkgs/by-name/kc/kcl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix index 5c519224d8b1..84012a3a59bb 100644 --- a/pkgs/by-name/kc/kcl/package.nix +++ b/pkgs/by-name/kc/kcl/package.nix @@ -11,16 +11,16 @@ }: buildGoModule rec { pname = "kcl"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "cli"; rev = "v${version}"; - hash = "sha256-97iUmrdZzA2OD6K+WSkDv8JNcFaaHmD/D9J/BHOUvzw="; + hash = "sha256-s8pFnItmw3+l9GKqdqX0Rxsy47h6vO+yUtVNCuyn/m8="; }; - vendorHash = "sha256-+SWcbkcShPCzxGfZmlMPaTZLp0tGGViPM99xXrXzVQ0="; + vendorHash = "sha256-DGYYH5sKhpcWHYoUim4NyflzqsXFc4MCOqIw5jIfIiM="; # By default, libs and bins are stripped. KCL will crash on darwin if they are. dontStrip = stdenv.isDarwin; From 9facf2a833e717e5ff1a25b89c8d93f940ca25f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 07:02:05 +0000 Subject: [PATCH 230/357] trufflehog: 3.81.7 -> 3.81.8 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 411907da50ae..3d822de5cc6f 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.81.7"; + version = "3.81.8"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-JEDZw116AYcR6Skh/Pu5eZrV04EOMhA8uH3LX3neoDs="; + hash = "sha256-kNQzBjS6UpvK4/opUAoWFajzDA8kycHwJwQEqZQdPJg="; }; - vendorHash = "sha256-L46tKB6zcwB4jxfEGq7/LveJoWHlOg2QtzO082w2/A8="; + vendorHash = "sha256-YljUI5gGcMCQhG8kkHfYj855zjF7Yx/o71jsXDtlvPg="; proxyVendor = true; From d92a8591353b7c929611a809a3a4576f181d0007 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 07:15:57 +0000 Subject: [PATCH 231/357] python312Packages.tplink-omada-client: 1.4.1 -> 1.4.2 --- .../python-modules/tplink-omada-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index 22a136daddcd..60cf57c14f29 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-2YGUm37i3gAKXLygtjLYVB+kGk0+84pY70CUyU3BzbY="; + hash = "sha256-Dt1F7mCuRrzEk3NDVfxScSLrK0omHQFMWhYrrwc+Pq0="; }; build-system = [ hatchling ]; From 9fe6ee19171f06b65af74f477cb4044038119240 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 07:32:58 +0000 Subject: [PATCH 232/357] centrifugo: 5.4.4 -> 5.4.5 --- pkgs/by-name/ce/centrifugo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix index b50ab2381e71..d170da92d8c7 100644 --- a/pkgs/by-name/ce/centrifugo/package.nix +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "centrifugo"; - version = "5.4.4"; + version = "5.4.5"; src = fetchFromGitHub { owner = "centrifugal"; repo = "centrifugo"; rev = "v${version}"; - hash = "sha256-lZ2EWXg4aWDwsvziI4+9ECv6SlsdkElWJzf8JrByrSI="; + hash = "sha256-kbSHNtujHlT9l9VV9fVlVnTMOQSKdXSwMP/x0EGTNZo="; }; - vendorHash = "sha256-iS4ykyJfsKeQkEuTj5p243FZbULbGTYHEJ2JrATd7Vc="; + vendorHash = "sha256-gfz2jRGx8egAKCFaQOZfh7cthcXS9t8ugB0zF+tiYh0="; ldflags = [ "-s" From 78642712b23839a9cbcb9dc654579890019173ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 09:05:20 +0000 Subject: [PATCH 233/357] basex: 11.0 -> 11.1 --- pkgs/tools/text/xml/basex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 91c6c9520ce6..e355e58d2ecc 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "basex"; - version = "11.0"; + version = "11.1"; src = fetchurl { url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip"; - hash = "sha256-ePXoinOnm9BgMeCGTtWE3ahDsEtzReAiDLMwm9cB3tE="; + hash = "sha256-Wl6kM3xiWYiQpQZ8/qyotfrs/SvjvnQ0AHOeRms/Io0="; }; nativeBuildInputs = [ unzip copyDesktopItems ]; From 2d60c9bb992e07747402ff2bb608c24ff13c426a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 07:48:54 +0000 Subject: [PATCH 234/357] misconfig-mapper: 1.8.1 -> 1.8.2 --- pkgs/by-name/mi/misconfig-mapper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index 9db1fb8dedac..f05e8b454611 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; rev = "refs/tags/v${version}"; - hash = "sha256-jCW1HmL/IAktQ3DncR4CZ3msSWKkz6u9UmmkIjaXS3Y="; + hash = "sha256-VKjzHPLyBuV+SiHs4kA6ZWq0g5dEwJsnFCG2Dl8YVDk="; }; - vendorHash = "sha256-UGV//c2ArXB9g2voN+UWnRaEsrKluIk5CZz82YQhhik="; + vendorHash = "sha256-hx03o4LaqFNylStCkt/MFtgwvsOZFFcEC/c54g1kCNk="; ldflags = [ "-s" From 1e139dd141e093731f8845b72fefd4b8c11935f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 07:56:52 +0000 Subject: [PATCH 235/357] 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 9ee29846df70924701281c11b4d645dceada699c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 16 Aug 2024 10:01:58 +0200 Subject: [PATCH 236/357] pylyzer: 0.0.58 -> 0.0.59 Diff: https://github.com/mtshiba/pylyzer/compare/refs/tags/v0.0.58...v0.0.59 Changelog: https://github.com/mtshiba/pylyzer/releases/tag/v0.0.59 --- .../tools/language-servers/pylyzer/Cargo.lock | 71 +++++++++++-------- .../language-servers/pylyzer/default.nix | 4 +- 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/pkgs/development/tools/language-servers/pylyzer/Cargo.lock b/pkgs/development/tools/language-servers/pylyzer/Cargo.lock index a7e1a0dafa29..7f4fe640cd5f 100644 --- a/pkgs/development/tools/language-servers/pylyzer/Cargo.lock +++ b/pkgs/development/tools/language-servers/pylyzer/Cargo.lock @@ -93,9 +93,12 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.1.8" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" +checksum = "68064e60dbf1f17005c2fde4d07c16d8baa506fd7ffed8ccab702d93617975c7" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -125,7 +128,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -136,9 +139,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "els" -version = "0.1.54-nightly.0" +version = "0.1.54-nightly.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb27dc0754e2490b8984d95f4fe6368258de544eedd37798a314acfeb5ccfc6" +checksum = "19d774d511ed129b8438a9633b17f3303768fa7a3941372c1650e61a7bc7b00c" dependencies = [ "erg_common", "erg_compiler", @@ -150,9 +153,9 @@ dependencies = [ [[package]] name = "erg_common" -version = "0.6.42-nightly.0" +version = "0.6.42-nightly.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415899164e7873f66eecad5ad37683c5fa31c038802033f35ad08f3fa38882dc" +checksum = "b084d80afdb59d10d300595b2860868e52d1a0a72ad98ac995c9f5abfba9acd8" dependencies = [ "backtrace-on-stack-overflow", "erg_proc_macros", @@ -162,9 +165,9 @@ dependencies = [ [[package]] name = "erg_compiler" -version = "0.6.42-nightly.0" +version = "0.6.42-nightly.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048b3d74d5ca2c5279e18f15fd5997fe0cdfcad0a8d6ff2e4e238a8b76d86b36" +checksum = "805b009c668055c8d72d11f8b26853c9a65a2744548909beda8b32bd4058a375" dependencies = [ "erg_common", "erg_parser", @@ -172,9 +175,9 @@ dependencies = [ [[package]] name = "erg_parser" -version = "0.6.42-nightly.0" +version = "0.6.42-nightly.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca774922a3555cb1973ead24f9ad27056057480bbcfff2ccab0b8b3637517054" +checksum = "4ec4f2cc69904baae639ff154323d1cc0e100ca2785bfb6d8c392c88e0560771" dependencies = [ "erg_common", "erg_proc_macros", @@ -183,9 +186,9 @@ dependencies = [ [[package]] name = "erg_proc_macros" -version = "0.6.42-nightly.0" +version = "0.6.42-nightly.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7500b1a02978ccf36cef9eecb31f99911a0b56753589e375f0a51b6ff57b750" +checksum = "6234abaef2fed929391add7520409890b2b7ee7029f2a5dcb9c2f4905bb7556b" dependencies = [ "quote", "syn 1.0.109", @@ -247,14 +250,14 @@ dependencies = [ [[package]] name = "is-macro" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" +checksum = "2069faacbe981460232f880d26bf3c7634e322d49053aa48c27e3ae642f728f1" dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -280,9 +283,9 @@ checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" [[package]] name = "libm" @@ -551,7 +554,7 @@ dependencies = [ [[package]] name = "py2erg" -version = "0.0.58" +version = "0.0.59" dependencies = [ "erg_common", "erg_compiler", @@ -561,7 +564,7 @@ dependencies = [ [[package]] name = "pylyzer" -version = "0.0.58" +version = "0.0.59" dependencies = [ "els", "erg_common", @@ -713,29 +716,29 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.205" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.205" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "serde_json" -version = "1.0.122" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", "memchr", @@ -751,9 +754,15 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "siphasher" version = "0.3.11" @@ -785,9 +794,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" dependencies = [ "proc-macro2", "quote", @@ -1041,5 +1050,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] diff --git a/pkgs/development/tools/language-servers/pylyzer/default.nix b/pkgs/development/tools/language-servers/pylyzer/default.nix index 2af6720cd7ed..0db4f04f60d8 100644 --- a/pkgs/development/tools/language-servers/pylyzer/default.nix +++ b/pkgs/development/tools/language-servers/pylyzer/default.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.58"; + version = "0.0.59"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-IhfWl8Txhlddrr/Rny5ZyJaOKLft6R4ghYlwu6iOJsk="; + hash = "sha256-8XwNdxPREqrmd3IoD+Z/uTEGs3Qk6+vGa4S+6qje1Ic="; }; cargoLock = { From 02470a2f881e2885b3c84edc1f975d8d6fa68e01 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 16 Aug 2024 08:03:58 +0000 Subject: [PATCH 237/357] vsce: move to by-name --- .../tools/vsce/default.nix => by-name/vs/vsce/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/vsce/default.nix => by-name/vs/vsce/package.nix} (100%) diff --git a/pkgs/development/tools/vsce/default.nix b/pkgs/by-name/vs/vsce/package.nix similarity index 100% rename from pkgs/development/tools/vsce/default.nix rename to pkgs/by-name/vs/vsce/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d43609da0e2b..0052d43bdd0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34425,8 +34425,6 @@ with pkgs; vpv = callPackage ../applications/graphics/vpv { }; - vsce = callPackage ../development/tools/vsce { }; - vscode = callPackage ../applications/editors/vscode/vscode.nix { }; vscode-fhs = vscode.fhs; vscode-fhsWithPackages = vscode.fhsWithPackages; From f287b2281aefab45ab3d1d07bb0a256a011a0c2c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 16 Aug 2024 10:04:02 +0200 Subject: [PATCH 238/357] pylyzer: move to pkgs/by-name --- .../tools/language-servers => by-name/py}/pylyzer/Cargo.lock | 0 .../pylyzer/default.nix => by-name/py/pylyzer/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{development/tools/language-servers => by-name/py}/pylyzer/Cargo.lock (100%) rename pkgs/{development/tools/language-servers/pylyzer/default.nix => by-name/py/pylyzer/package.nix} (100%) diff --git a/pkgs/development/tools/language-servers/pylyzer/Cargo.lock b/pkgs/by-name/py/pylyzer/Cargo.lock similarity index 100% rename from pkgs/development/tools/language-servers/pylyzer/Cargo.lock rename to pkgs/by-name/py/pylyzer/Cargo.lock diff --git a/pkgs/development/tools/language-servers/pylyzer/default.nix b/pkgs/by-name/py/pylyzer/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/pylyzer/default.nix rename to pkgs/by-name/py/pylyzer/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d43609da0e2b..e7d3651de5bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17384,8 +17384,6 @@ with pkgs; postgres-lsp = callPackage ../development/tools/language-servers/postgres-lsp { }; - pylyzer = callPackage ../development/tools/language-servers/pylyzer { }; - ruff-lsp = python3Packages.callPackage ../development/tools/language-servers/ruff-lsp { }; rune-languageserver = callPackage ../development/tools/language-servers/rune-languageserver { }; From 4de236c9102f96b808120f382fdac0f26c20971b Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 16 Aug 2024 08:11:00 +0000 Subject: [PATCH 239/357] vsce: 2.31.1 -> 3.0.0 --- pkgs/by-name/vs/vsce/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix index 3ad734efdce9..8020835f0be6 100644 --- a/pkgs/by-name/vs/vsce/package.nix +++ b/pkgs/by-name/vs/vsce/package.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "vsce"; - version = "2.31.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; rev = "v${version}"; - hash = "sha256-VXZBuaJn0VGpq1sIwsp+OcYErYShTCcU/FnTgDHmf7g="; + hash = "sha256-FoJfpzrbui+tKCEq15wGC0o44iLCBAuVYBISiy+zOmE="; }; - npmDepsHash = "sha256-Ftf6m5gRcYnkYfRx9vUys9uax8pwyyjUbfw3am8WriA="; + npmDepsHash = "sha256-TTFolysg+La605EoS87gmhEjlzwNUVYmnXKr49De7fk="; postPatch = '' substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"' From ebdc6c7e130128fbd6f038786540e3ac4dcec6a8 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Thu, 15 Aug 2024 09:07:53 -0700 Subject: [PATCH 240/357] erofs-utils: 1.7.1 -> 1.8.1 --- pkgs/tools/filesystems/erofs-utils/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index 5346403fa0e0..5bfd77cb56ab 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -4,15 +4,15 @@ , lzmaSupport ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "erofs-utils"; - version = "1.7.1"; + version = "1.8.1"; outputs = [ "out" "man" ]; src = fetchurl { url = - "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${version}.tar.gz"; - hash = "sha256-GWCD1j5eIx+1eZ586GqUS7ylZNqrzj3pIlqKyp3K/xU="; + "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; + hash = "sha256-Xb97SS92gkYrl6dxIdQ8p2Cc2Q5l+MlpMa78ggpvDaM="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ehmry nikstur ]; platforms = platforms.unix; }; -} +}) From 3dd73bf8022999ae50df46cf2af9973d3bdec0cf Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Thu, 15 Aug 2024 09:08:10 -0700 Subject: [PATCH 241/357] erofs-utils: add jmbaur as maintainer --- pkgs/tools/filesystems/erofs-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index 5bfd77cb56ab..9c9aa2d993f2 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Userspace utilities for linux-erofs file system"; changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${version}"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ ehmry nikstur ]; + maintainers = with maintainers; [ ehmry nikstur jmbaur ]; platforms = platforms.unix; }; }) From 4e1098967342a910900fa841f3a6ebc25c6ced7b Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Thu, 15 Aug 2024 09:08:29 -0700 Subject: [PATCH 242/357] erofs-utils: nixfmt --- .../tools/filesystems/erofs-utils/default.nix | 51 ++++++++++++++----- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index 9c9aa2d993f2..3946523ccb10 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -1,29 +1,50 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, xz, zlib, libselinux -, fuseSupport ? stdenv.isLinux -, selinuxSupport ? false -, lzmaSupport ? false +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + pkg-config, + fuse, + util-linux, + lz4, + xz, + zlib, + libselinux, + fuseSupport ? stdenv.isLinux, + selinuxSupport ? false, + lzmaSupport ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "erofs-utils"; version = "1.8.1"; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; src = fetchurl { - url = - "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; hash = "sha256-Xb97SS92gkYrl6dxIdQ8p2Cc2Q5l+MlpMa78ggpvDaM="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ util-linux lz4 zlib ] + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = + [ + util-linux + lz4 + zlib + ] ++ lib.optionals fuseSupport [ fuse ] ++ lib.optionals selinuxSupport [ libselinux ] ++ lib.optionals lzmaSupport [ xz ]; - configureFlags = [ - "MAX_BLOCK_SIZE=4096" - ] ++ lib.optional fuseSupport "--enable-fuse" + configureFlags = + [ "MAX_BLOCK_SIZE=4096" ] + ++ lib.optional fuseSupport "--enable-fuse" ++ lib.optional selinuxSupport "--with-selinux" ++ lib.optional lzmaSupport "--enable-lzma"; @@ -32,7 +53,11 @@ stdenv.mkDerivation (finalAttrs: { description = "Userspace utilities for linux-erofs file system"; changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${version}"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ ehmry nikstur jmbaur ]; + maintainers = with maintainers; [ + ehmry + nikstur + jmbaur + ]; platforms = platforms.unix; }; }) From 4d300bcf049b2badf41fec72df4a385820b333bd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 16 Aug 2024 10:17:01 +0200 Subject: [PATCH 243/357] pylyzer: format --- pkgs/by-name/py/pylyzer/package.nix | 41 ++++++++++++----------------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index 0db4f04f60d8..771304ce0bb5 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, git -, python3 -, makeWrapper -, writeScriptBin -, darwin -, which -, nix-update-script -, testers -, pylyzer +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + git, + python3, + makeWrapper, + writeScriptBin, + darwin, + which, + nix-update-script, + testers, + pylyzer, }: rustPlatform.buildRustPackage rec { @@ -35,15 +36,9 @@ rustPlatform.buildRustPackage rec { git python3 makeWrapper - ] ++ lib.optionals stdenv.isDarwin [ - (writeScriptBin "diskutil" "") - ]; + ] ++ lib.optionals stdenv.isDarwin [ (writeScriptBin "diskutil" "") ]; - buildInputs = [ - python3 - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ python3 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; preBuild = '' export HOME=$TMPDIR @@ -54,9 +49,7 @@ rustPlatform.buildRustPackage rec { cp -r $HOME/.erg/ $out/lib/erg ''; - nativeCheckInputs = [ - which - ]; + nativeCheckInputs = [ which ]; checkFlags = [ # this test causes stack overflow From ce2f0b7ad25b4842146633d140f9ddd7a4bac3c3 Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Fri, 16 Aug 2024 10:19:54 +0800 Subject: [PATCH 244/357] czkawka: fix build with rust 1.80 --- pkgs/by-name/cz/czkawka/package.nix | 5 +++-- pkgs/by-name/cz/czkawka/time.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/cz/czkawka/time.patch diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index ca21fc82c875..cc3396125f40 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -28,14 +28,15 @@ let rev = version; hash = "sha256-SOWtLmehh1F8SoDQ+9d7Fyosgzya5ZztCv8IcJZ4J94="; }; - cargoHash = "sha256-GOX7V6NLEMP06nMeRZINwcWCaHwK6T3nkRKl4e25DPg="; + cargoPatches = [ ./time.patch ]; + cargoHash = "sha256-cQv8C0P3xizsvnJODkTMJQA98P4nYSCHFT75isJE6es="; buildRustPackage' = rustPlatform.buildRustPackage.override { stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; in buildRustPackage' { - inherit pname version src cargoHash; + inherit pname version src cargoPatches cargoHash; nativeBuildInputs = [ gobject-introspection diff --git a/pkgs/by-name/cz/czkawka/time.patch b/pkgs/by-name/cz/czkawka/time.patch new file mode 100644 index 000000000000..0fac8030127e --- /dev/null +++ b/pkgs/by-name/cz/czkawka/time.patch @@ -0,0 +1,28 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 5ae2bd6..e4c6f18 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -5676,9 +5676,9 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.34" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", +@@ -5699,9 +5699,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.17" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ + "num-conv", + "time-core", From 733f5a9806175f86380b14529cb29e953690c148 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 5 Aug 2024 15:39:50 +0200 Subject: [PATCH 245/357] conmon-rs: 0.6.3 -> 0.6.5 Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/conmon-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/conmon-rs/default.nix b/pkgs/applications/virtualization/conmon-rs/default.nix index efb463580e0e..e22257f7367b 100644 --- a/pkgs/applications/virtualization/conmon-rs/default.nix +++ b/pkgs/applications/virtualization/conmon-rs/default.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "conmon-rs"; - version = "0.6.3"; + version = "0.6.5"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-+RKjJtI01Y56+cFDdOSAL4BodI7R/rM3B3ht3p6+xzs="; + hash = "sha256-qb7n6AcRkv/nF0BQbPgdFqaklfJeC+PRzMh6EIykobY="; }; nativeBuildInputs = [ capnproto protobuf ]; doCheck = false; - cargoHash = "sha256-4VOse+y0EO9IORyeAO/j1t6ssQARJp7lK21TUJVuH78="; + cargoVendorDir = ".cargo-vendor"; meta = with lib; { description = "OCI container runtime monitor written in Rust"; From 10913b690b8f0fa87d27b56c7054df408746e964 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 08:30:59 +0000 Subject: [PATCH 246/357] discord: 0.0.63 -> 0.0.64 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index abd57741d898..e53ee375c7b9 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { - stable = "0.0.63"; + stable = "0.0.64"; ptb = "0.0.98"; canary = "0.0.465"; development = "0.0.24"; @@ -17,7 +17,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-KtVX9EJPYmzDQd2beV/dDW8jjLDjacKZDrD72kLUwKo="; + hash = "sha256-tBopyhGRNDmtOWSwwiNnPJJm82sk3s76cUun7erHRbM="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From 9edd59ff082b883472e3faa36e15ee56d09e7cee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 08:31:01 +0000 Subject: [PATCH 247/357] python312Packages.django-stubs: 5.0.2 -> 5.0.4 --- pkgs/development/python-modules/django-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index 72adac752285..0bdd73e77488 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "5.0.2"; + version = "5.0.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "django_stubs"; inherit version; - hash = "sha256-I2vFYG5WB8uWj5K2SEcfntqkYad0vAE7+ea/+HMPa98="; + hash = "sha256-eON2RIj9/SaV8SUCE2VI7CL41LF4BUGoNQQrgjjRFRQ="; }; nativeBuildInputs = [ setuptools ]; From 197ec588c952f2ba46af8d1292c74d8cf0c34408 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 15 Aug 2024 13:15:30 +0200 Subject: [PATCH 248/357] snphost: init at 0.4.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/sn/snphost/package.nix | 58 +++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 pkgs/by-name/sn/snphost/package.nix diff --git a/pkgs/by-name/sn/snphost/package.nix b/pkgs/by-name/sn/snphost/package.nix new file mode 100644 index 000000000000..fcee69dd5370 --- /dev/null +++ b/pkgs/by-name/sn/snphost/package.nix @@ -0,0 +1,58 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + curl, + pkg-config, + openssl, + zlib, + asciidoctor, + nix-update-script, + findutils, + installShellFiles, +}: + +rustPlatform.buildRustPackage rec { + pname = "snphost"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "virtee"; + repo = "snphost"; + rev = "v${version}"; + hash = "sha256-ChB745I+4CuN/qvWW5e5gPWBdTDJdrUMiHO3LkmTwtk="; + }; + + cargoHash = "sha256-yXjrTxCRI+1IMRmBYLw9+uHr9BVVhRXx6zU2q3sYf9s="; + + nativeBuildInputs = [ + asciidoctor + findutils + installShellFiles + pkg-config + ]; + + buildInputs = [ + curl + openssl + zlib + ]; + + # man page is placed in cargo's $OUT_DIR, which is randomized. + # Contacted upstream about it, for now use find to locate it. + postInstall = '' + installManPage $(find target/x86_64-unknown-linux-gnu/release/build -name "snphost.1") + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Administrative utility for SEV-SNP"; + homepage = "https://github.com/virtee/snphost/"; + changelog = "https://github.com/virtee/snphost/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ katexochen ]; + mainProgram = "snphost"; + platforms = [ "x86_64-linux" ]; + }; +} From c586f01e11b51295fede28119a567886a7d99b80 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Wed, 14 Aug 2024 12:51:20 +0200 Subject: [PATCH 249/357] snpguest: init at 0.6.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/sn/snpguest/package.nix | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/sn/snpguest/package.nix diff --git a/pkgs/by-name/sn/snpguest/package.nix b/pkgs/by-name/sn/snpguest/package.nix new file mode 100644 index 000000000000..a23964246f29 --- /dev/null +++ b/pkgs/by-name/sn/snpguest/package.nix @@ -0,0 +1,42 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "snpguest"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "virtee"; + repo = "snpguest"; + rev = "v${version}"; + hash = "sha256-9TchRaZPQKAsncs+mlHvzeie9IIVZeea/LfBLXOLuNg="; + }; + + cargoHash = "sha256-1UX5GiwH38W+IgZO+0EA3M86iWMylM8fgr48DRD187A="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + env = { + OPENSSL_NO_VENDOR = true; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI tool for interacting with SEV-SNP guest environment"; + homepage = "https://github.com/virtee/snpguest"; + changelog = "https://github.com/virtee/snpguest/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ katexochen ]; + mainProgram = "snpguest"; + platforms = [ "x86_64-linux" ]; + }; +} From 333e6672e16ec06219ab844d6ba0dee29498a7a8 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 16 Aug 2024 11:58:52 +0300 Subject: [PATCH 250/357] nixos/pipewire: install the default limits config, make group always exist --- .../services/desktops/pipewire/pipewire.nix | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index 5c6eba889ebe..bf57d1255774 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -410,8 +410,30 @@ in { networking.firewall.allowedUDPPorts = mkIf cfg.raopOpenFirewall [ 6001 6002 ]; - users = mkIf cfg.systemWide { - users.pipewire = { + # See https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/modules/module-rt/25-pw-rlimits.conf.in + security.pam.loginLimits = [ + { + domain = "@pipewire"; + item = "rtprio"; + type = "-"; + value = 95; + } + { + domain = "@pipewire"; + item = "nice"; + type = "-"; + value = -19; + } + { + domain = "@pipewire"; + item = "memlock"; + type = "-"; + value = 4194304; + } + ]; + + users = { + users.pipewire = mkIf cfg.systemWide { uid = config.ids.uids.pipewire; group = "pipewire"; extraGroups = [ From a19c1f8a60ee28798e13621651dcb606f2b043a2 Mon Sep 17 00:00:00 2001 From: "Emil J. Tywoniak" Date: Fri, 16 Aug 2024 11:25:19 +0200 Subject: [PATCH 251/357] python312Packages.xdot: 1.3 -> 1.4 --- .../python-modules/xdot/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 36c6913a70bd..8cd817ea1c90 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -10,29 +10,38 @@ graphviz, gtk3, numpy, + packaging, + setuptools, }: buildPythonPackage rec { pname = "xdot"; - version = "1.3"; - format = "setuptools"; + version = "1.4"; + pyproject = true; src = fetchFromGitHub { owner = "jrfonseca"; repo = "xdot.py"; rev = version; - hash = "sha256-0UfvN7z7ThlFu825h03Z5Wur9zbiUpvD5cb5gcIhQQI="; + hash = "sha256-fkO1bINRkCCzVRrQg9+vIODbN+bpXq2OHBKkzzZUZNA="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; - propagatedBuildInputs = [ - pygobject3 + + buildInputs = [ graphviz gtk3 + ]; + + dependencies = [ + pygobject3 numpy + packaging ]; nativeCheckInputs = [ xvfb-run ]; From 48a7a7fe6c45c5fd503ef02aecdb5ad984e4ca7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 09:34:51 +0000 Subject: [PATCH 252/357] mystmd: 1.3.2 -> 1.3.4 --- pkgs/by-name/my/mystmd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix index 0b5278fe045b..ab790be5204b 100644 --- a/pkgs/by-name/my/mystmd/package.nix +++ b/pkgs/by-name/my/mystmd/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "mystmd"; - version = "1.3.2"; + version = "1.3.4"; src = fetchFromGitHub { owner = "executablebooks"; repo = "mystmd"; rev = "mystmd@${version}"; - hash = "sha256-41nRweJN5mqABUayoBQF8ZF1ol2YtBjCABfXuhaNPyE="; + hash = "sha256-aZUDIQs4n2s842tq23pU/ZUW+1fF4XXEmgnapdZH8wQ="; }; - npmDepsHash = "sha256-O34rSyFM+27LUIof3vs/oBoMf4eeg4fYGu6ftEZzong="; + npmDepsHash = "sha256-IXdmzuQaBEbwjXssYaDLvxyTl+i2U/JTalg8lSGvuR0="; dontNpmInstall = true; 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 253/357] 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 744be1213d75cda370ec5d6b069d10305f34005f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 10:05:01 +0000 Subject: [PATCH 254/357] kubeshark: 52.3.73 -> 52.3.74 --- pkgs/applications/networking/cluster/kubeshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index f49e966d742f..42ead265b6ac 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.3.73"; + version = "52.3.74"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-fhdHgkIsvB7cR5kCkvfzJuxrAVYvB4Y6NCGJpHolriA="; + hash = "sha256-MlYyTo30v9i1puSadbQRHCmUW7Kf9UV8X5Y7LQtRWaE="; }; vendorHash = "sha256-b3Aq3970E19jOJPjw/e0ly1W9x9HiDN+bfuB4uP09BY="; From e402d09f39acf9b5e7ee2ba20cf15c79e04e25fa Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 15 Aug 2024 15:41:45 +0200 Subject: [PATCH 255/357] rubber: 1.6.0 -> 1.6.6 --- pkgs/tools/typesetting/rubber/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 2ccee0bae005..641dade6457f 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -1,29 +1,29 @@ { lib, stdenv, fetchFromGitLab, python3Packages, texinfo }: -python3Packages.buildPythonApplication rec { +let + pypkgs = python3Packages; + +in +pypkgs.buildPythonApplication rec { pname = "rubber"; - version = "1.6.0"; + version = "1.6.6"; + pyproject = true; src = fetchFromGitLab { owner = "latex-rubber"; repo = "rubber"; rev = version; - hash = "sha256-7sv9N3PES5N41yYyXNWfaZ6IhLW6SqMiCHdamsSPQzg="; + hash = "sha256-C26PN3jyV6qwSjgPem54bykZrpKj+n8iHYYUyR+8dgI="; }; - # I'm sure there is a better way to pass these parameters to the build script... postPatch = '' - substituteInPlace setup.py \ - --replace 'pdf = True' 'pdf = False' \ - --replace '$base/info' 'share/info' \ - --replace '$base/man' 'share/man' \ - --replace '$base/share' 'share' + sed -i -e '/texi2dvi/d' hatch_build.py substituteInPlace tests/run.sh \ - --replace /var/tmp /tmp + --replace-fail /var/tmp /tmp ''; - nativeBuildInputs = [ texinfo ]; + nativeBuildInputs = [ pypkgs.hatchling texinfo ]; checkPhase = '' runHook preCheck From 997e1c5a8a61e9c9fe5792afdc0bc40fb58b20ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 10:30:29 +0000 Subject: [PATCH 256/357] nwg-dock-hyprland: 0.2.0 -> 0.2.1 --- pkgs/applications/misc/nwg-dock-hyprland/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/pkgs/applications/misc/nwg-dock-hyprland/default.nix index aadbd89dbf52..dd775db16332 100644 --- a/pkgs/applications/misc/nwg-dock-hyprland/default.nix +++ b/pkgs/applications/misc/nwg-dock-hyprland/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-dock-hyprland"; rev = "v${version}"; - hash = "sha256-AB9YOHJCgjR70JNvWzDROWGVGFrjZycEKMV4XmDVcpY="; + hash = "sha256-rR0UkRKdIHcrLd4IpBUGxd6toPlohJfbvCBG/GkuQnY="; }; - vendorHash = "sha256-6AevEnesGZCXHUX8yq3mBA5ug+zb5qyriHdqGBKbbEs="; + vendorHash = "sha256-cZ5w7B8bi0faOVWoQ6eeW5ejCZJgnNB91DQalC75mPo="; ldflags = [ "-s" "-w" ]; From 55e9b14c80a8a4de9de6e93bfb3c5c1431f60374 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 16 Aug 2024 11:01:03 +0000 Subject: [PATCH 257/357] mongosh: 2.2.15 -> 2.3.0 --- pkgs/by-name/mo/mongosh/package-lock.json | 773 +++++++++++----------- pkgs/by-name/mo/mongosh/source.json | 8 +- 2 files changed, 403 insertions(+), 378 deletions(-) diff --git a/pkgs/by-name/mo/mongosh/package-lock.json b/pkgs/by-name/mo/mongosh/package-lock.json index f678c8932ced..d580970625c5 100644 --- a/pkgs/by-name/mo/mongosh/package-lock.json +++ b/pkgs/by-name/mo/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "2.2.15", + "version": "2.3.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "2.2.15", + "version": "2.3.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "2.2.15" + "@mongosh/cli-repl": "2.3.0" }, "bin": { "mongosh": "bin/mongosh.js" @@ -146,46 +146,46 @@ } }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.621.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.621.0.tgz", - "integrity": "sha512-FpXia5qFf6ijcNDWenVq+mP9r1LbiW/+52i9wrv2+Afi6Nn1ROf8W7St8WvE9TEZ3t78y+vis4CwqfGts+uiKA==", + "version": "3.632.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.632.0.tgz", + "integrity": "sha512-ciPZZ0jxMmXuaKCVdJthWogfqJ/4nb1zCxm7D/XkKcSbANjAiJ+1l+yiu7ZPTLGKKPRQQkPsWUknw5xb/5LxeQ==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.621.0", - "@aws-sdk/client-sts": "3.621.0", - "@aws-sdk/core": "3.621.0", - "@aws-sdk/credential-provider-node": "3.621.0", + "@aws-sdk/client-sso-oidc": "3.632.0", + "@aws-sdk/client-sts": "3.632.0", + "@aws-sdk/core": "3.629.0", + "@aws-sdk/credential-provider-node": "3.632.0", "@aws-sdk/middleware-host-header": "3.620.0", "@aws-sdk/middleware-logger": "3.609.0", "@aws-sdk/middleware-recursion-detection": "3.620.0", - "@aws-sdk/middleware-user-agent": "3.620.0", + "@aws-sdk/middleware-user-agent": "3.632.0", "@aws-sdk/region-config-resolver": "3.614.0", "@aws-sdk/types": "3.609.0", - "@aws-sdk/util-endpoints": "3.614.0", + "@aws-sdk/util-endpoints": "3.632.0", "@aws-sdk/util-user-agent-browser": "3.609.0", "@aws-sdk/util-user-agent-node": "3.614.0", "@smithy/config-resolver": "^3.0.5", - "@smithy/core": "^2.3.1", + "@smithy/core": "^2.3.2", "@smithy/fetch-http-handler": "^3.2.4", "@smithy/hash-node": "^3.0.3", "@smithy/invalid-dependency": "^3.0.3", "@smithy/middleware-content-length": "^3.0.5", "@smithy/middleware-endpoint": "^3.1.0", - "@smithy/middleware-retry": "^3.0.13", + "@smithy/middleware-retry": "^3.0.14", "@smithy/middleware-serde": "^3.0.3", "@smithy/middleware-stack": "^3.0.3", "@smithy/node-config-provider": "^3.1.4", "@smithy/node-http-handler": "^3.1.4", "@smithy/protocol-http": "^4.1.0", - "@smithy/smithy-client": "^3.1.11", + "@smithy/smithy-client": "^3.1.12", "@smithy/types": "^3.3.0", "@smithy/url-parser": "^3.0.3", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.13", - "@smithy/util-defaults-mode-node": "^3.0.13", + "@smithy/util-defaults-mode-browser": "^3.0.14", + "@smithy/util-defaults-mode-node": "^3.0.14", "@smithy/util-endpoints": "^2.0.5", "@smithy/util-middleware": "^3.0.3", "@smithy/util-retry": "^3.0.3", @@ -197,43 +197,43 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.621.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.621.0.tgz", - "integrity": "sha512-xpKfikN4u0BaUYZA9FGUMkkDmfoIP0Q03+A86WjqDWhcOoqNA1DkHsE4kZ+r064ifkPUfcNuUvlkVTEoBZoFjA==", + "version": "3.632.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.632.0.tgz", + "integrity": "sha512-iYWHiKBz44m3chCFvtvHnvCpL2rALzyr1e6tOZV3dLlOKtQtDUlPy6OtnXDu4y+wyJCniy8ivG3+LAe4klzn1Q==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.621.0", + "@aws-sdk/core": "3.629.0", "@aws-sdk/middleware-host-header": "3.620.0", "@aws-sdk/middleware-logger": "3.609.0", "@aws-sdk/middleware-recursion-detection": "3.620.0", - "@aws-sdk/middleware-user-agent": "3.620.0", + "@aws-sdk/middleware-user-agent": "3.632.0", "@aws-sdk/region-config-resolver": "3.614.0", "@aws-sdk/types": "3.609.0", - "@aws-sdk/util-endpoints": "3.614.0", + "@aws-sdk/util-endpoints": "3.632.0", "@aws-sdk/util-user-agent-browser": "3.609.0", "@aws-sdk/util-user-agent-node": "3.614.0", "@smithy/config-resolver": "^3.0.5", - "@smithy/core": "^2.3.1", + "@smithy/core": "^2.3.2", "@smithy/fetch-http-handler": "^3.2.4", "@smithy/hash-node": "^3.0.3", "@smithy/invalid-dependency": "^3.0.3", "@smithy/middleware-content-length": "^3.0.5", "@smithy/middleware-endpoint": "^3.1.0", - "@smithy/middleware-retry": "^3.0.13", + "@smithy/middleware-retry": "^3.0.14", "@smithy/middleware-serde": "^3.0.3", "@smithy/middleware-stack": "^3.0.3", "@smithy/node-config-provider": "^3.1.4", "@smithy/node-http-handler": "^3.1.4", "@smithy/protocol-http": "^4.1.0", - "@smithy/smithy-client": "^3.1.11", + "@smithy/smithy-client": "^3.1.12", "@smithy/types": "^3.3.0", "@smithy/url-parser": "^3.0.3", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.13", - "@smithy/util-defaults-mode-node": "^3.0.13", + "@smithy/util-defaults-mode-browser": "^3.0.14", + "@smithy/util-defaults-mode-node": "^3.0.14", "@smithy/util-endpoints": "^2.0.5", "@smithy/util-middleware": "^3.0.3", "@smithy/util-retry": "^3.0.3", @@ -245,44 +245,44 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.621.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.621.0.tgz", - "integrity": "sha512-mMjk3mFUwV2Y68POf1BQMTF+F6qxt5tPu6daEUCNGC9Cenk3h2YXQQoS4/eSyYzuBiYk3vx49VgleRvdvkg8rg==", + "version": "3.632.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.632.0.tgz", + "integrity": "sha512-Oh1fIWaoZluihOCb/zDEpRTi+6an82fgJz7fyRBugyLhEtDjmvpCQ3oKjzaOhoN+4EvXAm1ZS/ZgpvXBlIRTgw==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.621.0", - "@aws-sdk/credential-provider-node": "3.621.0", + "@aws-sdk/core": "3.629.0", + "@aws-sdk/credential-provider-node": "3.632.0", "@aws-sdk/middleware-host-header": "3.620.0", "@aws-sdk/middleware-logger": "3.609.0", "@aws-sdk/middleware-recursion-detection": "3.620.0", - "@aws-sdk/middleware-user-agent": "3.620.0", + "@aws-sdk/middleware-user-agent": "3.632.0", "@aws-sdk/region-config-resolver": "3.614.0", "@aws-sdk/types": "3.609.0", - "@aws-sdk/util-endpoints": "3.614.0", + "@aws-sdk/util-endpoints": "3.632.0", "@aws-sdk/util-user-agent-browser": "3.609.0", "@aws-sdk/util-user-agent-node": "3.614.0", "@smithy/config-resolver": "^3.0.5", - "@smithy/core": "^2.3.1", + "@smithy/core": "^2.3.2", "@smithy/fetch-http-handler": "^3.2.4", "@smithy/hash-node": "^3.0.3", "@smithy/invalid-dependency": "^3.0.3", "@smithy/middleware-content-length": "^3.0.5", "@smithy/middleware-endpoint": "^3.1.0", - "@smithy/middleware-retry": "^3.0.13", + "@smithy/middleware-retry": "^3.0.14", "@smithy/middleware-serde": "^3.0.3", "@smithy/middleware-stack": "^3.0.3", "@smithy/node-config-provider": "^3.1.4", "@smithy/node-http-handler": "^3.1.4", "@smithy/protocol-http": "^4.1.0", - "@smithy/smithy-client": "^3.1.11", + "@smithy/smithy-client": "^3.1.12", "@smithy/types": "^3.3.0", "@smithy/url-parser": "^3.0.3", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.13", - "@smithy/util-defaults-mode-node": "^3.0.13", + "@smithy/util-defaults-mode-browser": "^3.0.14", + "@smithy/util-defaults-mode-node": "^3.0.14", "@smithy/util-endpoints": "^2.0.5", "@smithy/util-middleware": "^3.0.3", "@smithy/util-retry": "^3.0.3", @@ -293,49 +293,49 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.621.0" + "@aws-sdk/client-sts": "^3.632.0" } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.621.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.621.0.tgz", - "integrity": "sha512-707uiuReSt+nAx6d0c21xLjLm2lxeKc7padxjv92CIrIocnQSlJPxSCM7r5zBhwiahJA6MNQwmTl2xznU67KgA==", + "version": "3.632.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.632.0.tgz", + "integrity": "sha512-Ss5cBH09icpTvT+jtGGuQlRdwtO7RyE9BF4ZV/CEPATdd9whtJt4Qxdya8BUnkWR7h5HHTrQHqai3YVYjku41A==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.621.0", - "@aws-sdk/core": "3.621.0", - "@aws-sdk/credential-provider-node": "3.621.0", + "@aws-sdk/client-sso-oidc": "3.632.0", + "@aws-sdk/core": "3.629.0", + "@aws-sdk/credential-provider-node": "3.632.0", "@aws-sdk/middleware-host-header": "3.620.0", "@aws-sdk/middleware-logger": "3.609.0", "@aws-sdk/middleware-recursion-detection": "3.620.0", - "@aws-sdk/middleware-user-agent": "3.620.0", + "@aws-sdk/middleware-user-agent": "3.632.0", "@aws-sdk/region-config-resolver": "3.614.0", "@aws-sdk/types": "3.609.0", - "@aws-sdk/util-endpoints": "3.614.0", + "@aws-sdk/util-endpoints": "3.632.0", "@aws-sdk/util-user-agent-browser": "3.609.0", "@aws-sdk/util-user-agent-node": "3.614.0", "@smithy/config-resolver": "^3.0.5", - "@smithy/core": "^2.3.1", + "@smithy/core": "^2.3.2", "@smithy/fetch-http-handler": "^3.2.4", "@smithy/hash-node": "^3.0.3", "@smithy/invalid-dependency": "^3.0.3", "@smithy/middleware-content-length": "^3.0.5", "@smithy/middleware-endpoint": "^3.1.0", - "@smithy/middleware-retry": "^3.0.13", + "@smithy/middleware-retry": "^3.0.14", "@smithy/middleware-serde": "^3.0.3", "@smithy/middleware-stack": "^3.0.3", "@smithy/node-config-provider": "^3.1.4", "@smithy/node-http-handler": "^3.1.4", "@smithy/protocol-http": "^4.1.0", - "@smithy/smithy-client": "^3.1.11", + "@smithy/smithy-client": "^3.1.12", "@smithy/types": "^3.3.0", "@smithy/url-parser": "^3.0.3", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.13", - "@smithy/util-defaults-mode-node": "^3.0.13", + "@smithy/util-defaults-mode-browser": "^3.0.14", + "@smithy/util-defaults-mode-node": "^3.0.14", "@smithy/util-endpoints": "^2.0.5", "@smithy/util-middleware": "^3.0.3", "@smithy/util-retry": "^3.0.3", @@ -347,15 +347,16 @@ } }, "node_modules/@aws-sdk/core": { - "version": "3.621.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/core/-/core-3.621.0.tgz", - "integrity": "sha512-CtOwWmDdEiINkGXD93iGfXjN0WmCp9l45cDWHHGa8lRgEDyhuL7bwd/pH5aSzj0j8SiQBG2k0S7DHbd5RaqvbQ==", + "version": "3.629.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/core/-/core-3.629.0.tgz", + "integrity": "sha512-+/ShPU/tyIBM3oY1cnjgNA/tFyHtlWq+wXF9xEKRv19NOpYbWQ+xzNwVjGq8vR07cCRqy/sDQLWPhxjtuV/FiQ==", "dependencies": { - "@smithy/core": "^2.3.1", + "@smithy/core": "^2.3.2", "@smithy/node-config-provider": "^3.1.4", + "@smithy/property-provider": "^3.1.3", "@smithy/protocol-http": "^4.1.0", "@smithy/signature-v4": "^4.1.0", - "@smithy/smithy-client": "^3.1.11", + "@smithy/smithy-client": "^3.1.12", "@smithy/types": "^3.3.0", "@smithy/util-middleware": "^3.0.3", "fast-xml-parser": "4.4.1", @@ -366,11 +367,11 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.621.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.621.0.tgz", - "integrity": "sha512-Q+3awvTVJSqIGRjCUQflRwKPKlZ0TfmL3EQHgFLhZZrToeBapEA62+FY+T70aTKAZZZZprlvYeFPtBloNd5ziA==", + "version": "3.632.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.632.0.tgz", + "integrity": "sha512-fr+xCIqMYsUD67vwE/IpboIqHiEYMQMrpPjnvpbbvyjTKspFh0GS7Qn1LVFCd5oNeu1rzAdJei1On2HBOwIiZQ==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.621.0", + "@aws-sdk/client-cognito-identity": "3.632.0", "@aws-sdk/types": "3.609.0", "@smithy/property-provider": "^3.1.3", "@smithy/types": "^3.3.0", @@ -395,16 +396,16 @@ } }, "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.621.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.621.0.tgz", - "integrity": "sha512-/jc2tEsdkT1QQAI5Dvoci50DbSxtJrevemwFsm0B73pwCcOQZ5ZwwSdVqGsPutzYzUVx3bcXg3LRL7jLACqRIg==", + "version": "3.622.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.622.0.tgz", + "integrity": "sha512-VUHbr24Oll1RK3WR8XLUugLpgK9ZuxEm/NVeVqyFts1Ck9gsKpRg1x4eH7L7tW3SJ4TDEQNMbD7/7J+eoL2svg==", "dependencies": { "@aws-sdk/types": "3.609.0", "@smithy/fetch-http-handler": "^3.2.4", "@smithy/node-http-handler": "^3.1.4", "@smithy/property-provider": "^3.1.3", "@smithy/protocol-http": "^4.1.0", - "@smithy/smithy-client": "^3.1.11", + "@smithy/smithy-client": "^3.1.12", "@smithy/types": "^3.3.0", "@smithy/util-stream": "^3.1.3", "tslib": "^2.6.2" @@ -414,14 +415,14 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.621.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.621.0.tgz", - "integrity": "sha512-0EWVnSc+JQn5HLnF5Xv405M8n4zfdx9gyGdpnCmAmFqEDHA8LmBdxJdpUk1Ovp/I5oPANhjojxabIW5f1uU0RA==", + "version": "3.632.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.632.0.tgz", + "integrity": "sha512-m6epoW41xa1ajU5OiHcmQHoGVtrbXBaRBOUhlCLZmcaqMLYsboM4iD/WZP8aatKEON5tTnVXh/4StV8D/+wemw==", "dependencies": { "@aws-sdk/credential-provider-env": "3.620.1", - "@aws-sdk/credential-provider-http": "3.621.0", + "@aws-sdk/credential-provider-http": "3.622.0", "@aws-sdk/credential-provider-process": "3.620.1", - "@aws-sdk/credential-provider-sso": "3.621.0", + "@aws-sdk/credential-provider-sso": "3.632.0", "@aws-sdk/credential-provider-web-identity": "3.621.0", "@aws-sdk/types": "3.609.0", "@smithy/credential-provider-imds": "^3.2.0", @@ -434,19 +435,19 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.621.0" + "@aws-sdk/client-sts": "^3.632.0" } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.621.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.621.0.tgz", - "integrity": "sha512-4JqpccUgz5Snanpt2+53hbOBbJQrSFq7E1sAAbgY6BKVQUsW5qyXqnjvSF32kDeKa5JpBl3bBWLZl04IadcPHw==", + "version": "3.632.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.632.0.tgz", + "integrity": "sha512-cL8fuJWm/xQBO4XJPkeuZzl3XinIn9EExWgzpG48NRMKR5us1RI/ucv7xFbBBaG+r/sDR2HpYBIA3lVIpm1H3Q==", "dependencies": { "@aws-sdk/credential-provider-env": "3.620.1", - "@aws-sdk/credential-provider-http": "3.621.0", - "@aws-sdk/credential-provider-ini": "3.621.0", + "@aws-sdk/credential-provider-http": "3.622.0", + "@aws-sdk/credential-provider-ini": "3.632.0", "@aws-sdk/credential-provider-process": "3.620.1", - "@aws-sdk/credential-provider-sso": "3.621.0", + "@aws-sdk/credential-provider-sso": "3.632.0", "@aws-sdk/credential-provider-web-identity": "3.621.0", "@aws-sdk/types": "3.609.0", "@smithy/credential-provider-imds": "^3.2.0", @@ -475,11 +476,11 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.621.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.621.0.tgz", - "integrity": "sha512-Kza0jcFeA/GEL6xJlzR2KFf1PfZKMFnxfGzJzl5yN7EjoGdMijl34KaRyVnfRjnCWcsUpBWKNIDk9WZVMY9yiw==", + "version": "3.632.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.632.0.tgz", + "integrity": "sha512-P/4wB6j7ym5QCPTL2xlMfvf2NcXSh+z0jmsZP4WW/tVwab4hvgabPPbLeEZDSWZ0BpgtxKGvRq0GSHuGeirQbA==", "dependencies": { - "@aws-sdk/client-sso": "3.621.0", + "@aws-sdk/client-sso": "3.632.0", "@aws-sdk/token-providers": "3.614.0", "@aws-sdk/types": "3.609.0", "@smithy/property-provider": "^3.1.3", @@ -509,20 +510,20 @@ } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.621.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.621.0.tgz", - "integrity": "sha512-FQbC7I8ae/72ZekLBa45jWJ+Q3d+YPhc3bW/rCks6RrldM6RgLTGr8pTOPCxHl828ky10RjkBiBmVU818rliyw==", + "version": "3.632.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.632.0.tgz", + "integrity": "sha512-Q4x2ARdgncZKOJE/NXJHY5s8/YDRugVUR4lBEtibE764w5ezAhI1aMChzAzv4j3WMSDZ29KyxaymHHt2vJED9g==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.621.0", - "@aws-sdk/client-sso": "3.621.0", - "@aws-sdk/client-sts": "3.621.0", - "@aws-sdk/credential-provider-cognito-identity": "3.621.0", + "@aws-sdk/client-cognito-identity": "3.632.0", + "@aws-sdk/client-sso": "3.632.0", + "@aws-sdk/client-sts": "3.632.0", + "@aws-sdk/credential-provider-cognito-identity": "3.632.0", "@aws-sdk/credential-provider-env": "3.620.1", - "@aws-sdk/credential-provider-http": "3.621.0", - "@aws-sdk/credential-provider-ini": "3.621.0", - "@aws-sdk/credential-provider-node": "3.621.0", + "@aws-sdk/credential-provider-http": "3.622.0", + "@aws-sdk/credential-provider-ini": "3.632.0", + "@aws-sdk/credential-provider-node": "3.632.0", "@aws-sdk/credential-provider-process": "3.620.1", - "@aws-sdk/credential-provider-sso": "3.621.0", + "@aws-sdk/credential-provider-sso": "3.632.0", "@aws-sdk/credential-provider-web-identity": "3.621.0", "@aws-sdk/types": "3.609.0", "@smithy/credential-provider-imds": "^3.2.0", @@ -576,12 +577,12 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.620.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.620.0.tgz", - "integrity": "sha512-bvS6etn+KsuL32ubY5D3xNof1qkenpbJXf/ugGXbg0n98DvDFQ/F+SMLxHgbnER5dsKYchNnhmtI6/FC3HFu/A==", + "version": "3.632.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.632.0.tgz", + "integrity": "sha512-yY/sFsHKwG9yzSf/DTclqWJaGPI2gPBJDCGBujSqTG1zlS7Ot4fqi91DZ6088BFWzbOorDzJFcAhAEFzc6LuQg==", "dependencies": { "@aws-sdk/types": "3.609.0", - "@aws-sdk/util-endpoints": "3.614.0", + "@aws-sdk/util-endpoints": "3.632.0", "@smithy/protocol-http": "^4.1.0", "@smithy/types": "^3.3.0", "tslib": "^2.6.2" @@ -637,9 +638,9 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.614.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-endpoints/-/util-endpoints-3.614.0.tgz", - "integrity": "sha512-wK2cdrXHH4oz4IomV/yrGkftU9A+ITB6nFL+rxxyO78is2ifHJpFdV4aqk4LSkXYPi6CXWNru/Dqc7yiKXgJPw==", + "version": "3.632.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/util-endpoints/-/util-endpoints-3.632.0.tgz", + "integrity": "sha512-LlYMU8pAbcEQphOpE6xaNLJ8kPGhklZZTVzZVpVW477NaaGgoGTMYNXTABYHcxeF5E2lLrxql9OmVpvr8GWN8Q==", "dependencies": { "@aws-sdk/types": "3.609.0", "@smithy/types": "^3.3.0", @@ -780,6 +781,14 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dependencies": { + "yallist": "^3.0.2" + } + }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz", @@ -788,6 +797,11 @@ "semver": "bin/semver.js" } }, + "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + }, "node_modules/@babel/helper-module-imports": { "version": "7.24.7", "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", @@ -888,9 +902,12 @@ } }, "node_modules/@babel/parser": { - "version": "7.25.0", - "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.25.0.tgz", - "integrity": "sha512-CzdIU9jdP0dg7HdyB+bHvDJGagUv+qtzZt5rYCWwW6tITNqV9odjp6Qu41gkG0ca5UfdDUWrKkiAnHHdGRnOrA==", + "version": "7.25.3", + "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.25.3.tgz", + "integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==", + "dependencies": { + "@babel/types": "^7.25.2" + }, "bin": { "parser": "bin/babel-parser.js" }, @@ -954,13 +971,13 @@ } }, "node_modules/@babel/traverse": { - "version": "7.25.2", - "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.25.2.tgz", - "integrity": "sha512-s4/r+a7xTnny2O6FcZzqgT6nE4/GHEdcqj4qAeglbUOh0TeglEfmNJFAd/OLoVtGd6ZhAO8GCVvCNUO5t/VJVQ==", + "version": "7.25.3", + "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.25.3.tgz", + "integrity": "sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==", "dependencies": { "@babel/code-frame": "^7.24.7", "@babel/generator": "^7.25.0", - "@babel/parser": "^7.25.0", + "@babel/parser": "^7.25.3", "@babel/template": "^7.25.0", "@babel/types": "^7.25.2", "debug": "^4.3.1", @@ -1100,15 +1117,15 @@ } }, "node_modules/@mongodb-js/devtools-connect": { - "version": "3.0.5", - "resolved": "https://registry.npmmirror.com/@mongodb-js/devtools-connect/-/devtools-connect-3.0.5.tgz", - "integrity": "sha512-L9GKPo119VpTt7K4DA99T9D+lpZTQNfUdKTLSgHCtoJa81bHu/bOneSlDA23dfT2ET3GNVNICWzNwOn2sXEA1Q==", + "version": "3.2.5", + "resolved": "https://registry.npmmirror.com/@mongodb-js/devtools-connect/-/devtools-connect-3.2.5.tgz", + "integrity": "sha512-hAYy39Dhss7ObSt21YJ30HKCod7lsO/mOQCHIaVHv9uNNAr02dFQHVA/Zd75wikcbpYybYxOM2Ou0zznvr8Jzg==", "dependencies": { + "@mongodb-js/devtools-proxy-support": "^0.3.5", "@mongodb-js/oidc-http-server-pages": "1.1.2", "lodash.merge": "^4.6.2", "mongodb-connection-string-url": "^3.0.0", - "socks": "^2.7.3", - "system-ca": "^2.0.0" + "socks": "^2.7.3" }, "optionalDependencies": { "kerberos": "^2.1.0", @@ -1117,11 +1134,29 @@ "resolve-mongodb-srv": "^1.1.1" }, "peerDependencies": { - "@mongodb-js/oidc-plugin": "^1.0.0", + "@mongodb-js/oidc-plugin": "^1.1.0", "mongodb": "^6.8.0", "mongodb-log-writer": "^1.4.2" } }, + "node_modules/@mongodb-js/devtools-proxy-support": { + "version": "0.3.5", + "resolved": "https://registry.npmmirror.com/@mongodb-js/devtools-proxy-support/-/devtools-proxy-support-0.3.5.tgz", + "integrity": "sha512-QiIj6kYANGsUeCa9j48GgnrG/MZc5eOh24QoesaHp+gr572uFuq4fRHn31WeZ+ndCknSjP9UG5iSzbmFhkpTOQ==", + "dependencies": { + "@mongodb-js/socksv5": "^0.0.10", + "agent-base": "^7.1.1", + "debug": "^4.3.6", + "http-proxy-agent": "^7.0.2", + "https-proxy-agent": "^7.0.5", + "lru-cache": "^11.0.0", + "node-fetch": "^3.3.2", + "pac-proxy-agent": "^7.0.2", + "socks-proxy-agent": "^8.0.4", + "ssh2": "^1.15.0", + "system-ca": "^2.0.0" + } + }, "node_modules/@mongodb-js/mongodb-constants": { "version": "0.10.2", "resolved": "https://registry.npmmirror.com/@mongodb-js/mongodb-constants/-/mongodb-constants-0.10.2.tgz", @@ -1136,9 +1171,9 @@ "integrity": "sha512-YcRlJ/HkKMahWvaPFTN/al5MGGX6CKQTsBHFTpNduxmeHd40jO8Cj5W7dfrqJAoit5E/G+GOwMaEfWdNrdlihg==" }, "node_modules/@mongodb-js/oidc-plugin": { - "version": "1.1.0", - "resolved": "https://registry.npmmirror.com/@mongodb-js/oidc-plugin/-/oidc-plugin-1.1.0.tgz", - "integrity": "sha512-edf5cMYpuJHfbxAyc6d0fDxeO3bE50w9vagi4NDfUH+Pz3gVN4Uj7rQUYCKMwjuKVE8hxyVqTgd0oSYAqsLjmA==", + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/@mongodb-js/oidc-plugin/-/oidc-plugin-1.1.1.tgz", + "integrity": "sha512-u2t3dvUpQJeTmMvXyZu730yJzqJ3aKraQ7ELlNwpKpl1AGxL6Dd9Z2AEu9ycExZjXhyjBW/lbaWuEhdNZHEgeg==", "dependencies": { "express": "^4.18.2", "open": "^9.1.0", @@ -1156,13 +1191,24 @@ "sparse-bitfield": "^3.0.3" } }, - "node_modules/@mongosh/arg-parser": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.15.tgz", - "integrity": "sha512-KGYiw5bl8cv6wDSrTCDF1B2PjddPhiD5BkulXvgpkfuD5bB2zTJSgpx+EGGcD60OSDRnMdk0tu9AY8uIExtNvA==", + "node_modules/@mongodb-js/socksv5": { + "version": "0.0.10", + "resolved": "https://registry.npmmirror.com/@mongodb-js/socksv5/-/socksv5-0.0.10.tgz", + "integrity": "sha512-JDz2fLKsjMiSNUxKrCpGptsgu7DzsXfu4gnUQ3RhUaBS1d4YbLrt6HejpckAiHIAa+niBpZAeiUsoop0IihWsw==", "dependencies": { - "@mongosh/errors": "2.2.15", - "@mongosh/i18n": "2.2.15", + "ip-address": "^9.0.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@mongosh/arg-parser": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.3.0.tgz", + "integrity": "sha512-4vWpODQfL/4WS+7DTaeXfGWtkHT7N5CZaTbaasi3pjPu49WC3sLko9civwRJWN3ygoyxADDZrfhRCDELvXg2eg==", + "dependencies": { + "@mongosh/errors": "2.3.0", + "@mongosh/i18n": "2.3.0", "mongodb-connection-string-url": "^3.0.1" }, "engines": { @@ -1170,9 +1216,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.15.tgz", - "integrity": "sha512-y7LyjulLYe0QodRa4YIpvpHt23VQWrFGx4C5AD3IVVFhgNd0yxg2bWLIMaFsM7wwgbGJU3BxnVecAnHOgiuRHg==", + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.3.0.tgz", + "integrity": "sha512-eYCxW76EeYDWZOsMHKIZAVXq0ePmiPOiy4SQ8sryDYluAzZR1e/2ZWMwwMG5tss1lkpG3q+nKTWsphFGCMUsLQ==", "dependencies": { "@babel/core": "^7.22.8", "@babel/plugin-transform-destructuring": "^7.22.5", @@ -1188,12 +1234,12 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.15.tgz", - "integrity": "sha512-R1rZVWLNmlOsOVGoHCdAxB0mx7J1A4ElPvzRBWcPW+PSEzlTT/9j0AT87exK/jjUE8ZnkzUw/soh4tqFQIjwAA==", + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.3.0.tgz", + "integrity": "sha512-64BZB+ruZ5leJrkA0QTKJpzYpezbpwdXD/e26D0H+zlKsL3/cX2+ZZVsZbBYTPbqickXPd52sYvz5H2bsiqVnA==", "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.2.15", + "@mongosh/shell-api": "2.3.0", "semver": "^7.5.4" }, "engines": { @@ -1201,25 +1247,25 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.15.tgz", - "integrity": "sha512-bpNQkJBTCY6Sj4iFveG+5S35vOUzaqw+nRd7PmJ0a5PQ4mE/qkaAUG1cUEYB/y2HJeK2SHQLiBqNlDtsekFhvg==", + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.3.0.tgz", + "integrity": "sha512-V0Lxc0YHqdIdZd8vLuMZIBLR4PyxoukY+GHX7NT5bYTFXjuF50ts/DEhUPPN9wIHD2RXBOlpeFIEBzKWfAJaqQ==", "dependencies": { - "@mongosh/arg-parser": "2.2.15", - "@mongosh/autocomplete": "2.2.15", - "@mongosh/editor": "2.2.15", - "@mongosh/errors": "2.2.15", - "@mongosh/history": "2.2.15", - "@mongosh/i18n": "2.2.15", - "@mongosh/import-node-fetch": "2.2.15", - "@mongosh/js-multiline-to-singleline": "2.2.15", - "@mongosh/logging": "2.2.15", - "@mongosh/service-provider-core": "2.2.15", - "@mongosh/service-provider-server": "2.2.15", - "@mongosh/shell-api": "2.2.15", - "@mongosh/shell-evaluator": "2.2.15", - "@mongosh/snippet-manager": "2.2.15", - "@mongosh/types": "2.2.15", + "@mongodb-js/devtools-proxy-support": "^0.3.4", + "@mongosh/arg-parser": "2.3.0", + "@mongosh/autocomplete": "2.3.0", + "@mongosh/editor": "2.3.0", + "@mongosh/errors": "2.3.0", + "@mongosh/history": "2.3.0", + "@mongosh/i18n": "2.3.0", + "@mongosh/js-multiline-to-singleline": "2.3.0", + "@mongosh/logging": "2.3.0", + "@mongosh/service-provider-core": "2.3.0", + "@mongosh/service-provider-server": "2.3.0", + "@mongosh/shell-api": "2.3.0", + "@mongosh/shell-evaluator": "2.3.0", + "@mongosh/snippet-manager": "2.3.0", + "@mongosh/types": "2.3.0", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -1231,7 +1277,6 @@ "mongodb-log-writer": "^1.4.2", "numeral": "^2.0.6", "pretty-repl": "^4.0.1", - "proxy-agent": "^6.4.0", "semver": "^7.5.4", "strip-ansi": "^6.0.0", "text-table": "^0.2.0", @@ -1246,21 +1291,21 @@ "optionalDependencies": { "get-console-process-list": "^1.0.5", "glibc-version": "^1.0.0", - "macos-export-certificate-and-key": "^1.1.2", + "macos-export-certificate-and-key": "^1.2.2", "mongodb-crypt-library-version": "^1.0.5", - "win-export-certificate-and-key": "^2.0.1" + "win-export-certificate-and-key": "^2.1.0" } }, "node_modules/@mongosh/editor": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.15.tgz", - "integrity": "sha512-7KB5kLibRTFBsJfVahsYzuoRnXbQatkM9JahSshPgdpLqXW+42l8CHsW6J1EadrCFS9oxjOxLCZJ1xN4elx5RQ==", + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.3.0.tgz", + "integrity": "sha512-MhCwP9RJHUOhEEbQx0VKcMz+QyNBWYo+i2h8xcSh8O2dl3OhHFPlgonwfzP0zyC5DZMrTUHSGDX0dfKdjHf/Jg==", "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.2.15", - "@mongosh/service-provider-core": "2.2.15", - "@mongosh/shell-api": "2.2.15", - "@mongosh/shell-evaluator": "2.2.15", - "@mongosh/types": "2.2.15", + "@mongosh/js-multiline-to-singleline": "2.3.0", + "@mongosh/service-provider-core": "2.3.0", + "@mongosh/shell-api": "2.3.0", + "@mongosh/shell-evaluator": "2.3.0", + "@mongosh/types": "2.3.0", "js-beautify": "^1.15.1" }, "engines": { @@ -1268,17 +1313,17 @@ } }, "node_modules/@mongosh/errors": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.15.tgz", - "integrity": "sha512-RHCRv3Fg/xWS5XV4hOyh6KDBrn2kld+J5PVtXfsuke73jfQTLlR2PGMzSEpPWiayRLgLExq56qdXGOtNecmhuA==", + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.3.0.tgz", + "integrity": "sha512-ul6OGLrCxWZ0C+g+WUwDZDXpZTATkri9yt3W/HP050h35jW37qWBeOi4FG9kwTwakgoaYiei87SwPfvN/M8oqg==", "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/history": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.15.tgz", - "integrity": "sha512-GV1i3RmG38+OUxBnqTeAlcPezkJ4fH3bBs4bwvLEV7iXMcVNzNoJBMyDa7gO6er45w38Kczx9kVDIOYdutt2Yg==", + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.3.0.tgz", + "integrity": "sha512-4ZBQxvaX1iazXImLzQsDR1hg7HY8FNtHsLFJYsMaTzN+995wAvqGUFYIFiETzArQ7/Vi+FVGx40kzIjYa5nzmA==", "dependencies": { "mongodb-connection-string-url": "^3.0.1", "mongodb-redact": "^1.1.2" @@ -1288,31 +1333,20 @@ } }, "node_modules/@mongosh/i18n": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.15.tgz", - "integrity": "sha512-7pjQbvJbtaglZKj86/2GRQnXLRekmpTPIVR2M58kAVXaNGqGrfCpe6mkBEkIwdjk6UHQIvkwMSzUIbFGm7nFvA==", + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.3.0.tgz", + "integrity": "sha512-JnIY7dxPOr3WFZ0YFfB/i53flYr0tIUiM3i9xo2DXWyeaQiuHxQxYwmCIDlVkGhvLVVlSXY2U0ptA0AW0YNztg==", "dependencies": { - "@mongosh/errors": "2.2.15" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/import-node-fetch": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.15.tgz", - "integrity": "sha512-ibhURnK4txTrim2sQZRwgfsrNgryUr/5WGvj1u8icZTSItM/sNU6L34Mi/R7UGsf7R4vEfHCIKp0rB1qEduvkg==", - "dependencies": { - "node-fetch": "^3.3.2" + "@mongosh/errors": "2.3.0" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.15.tgz", - "integrity": "sha512-eEJPE8yX7Frk9uZGzawOjU8A33hMvtKNZ8NXwTvs7fSMhVjSM+GhZnpncsQwzyQ9/R31V4ztbRAUKwGpWnTLbw==", + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.3.0.tgz", + "integrity": "sha512-WASW4luZIuZigPwdMED7wAQ+VkQIVcjXvkPJyFO5LfJ1mhrA16cP6Sv9C0mOaGlx/rJDzrN1AbcutSP7lYqu0w==", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" @@ -1322,14 +1356,14 @@ } }, "node_modules/@mongosh/logging": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.15.tgz", - "integrity": "sha512-65mZzQ633f0TK8QMN8i6Dj7DXP2oDrBuKRpSZhqp/xvy9gvpikgy96SdIdxd3kPyDT2Ja5OFZyJHihUvCvoFog==", + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.3.0.tgz", + "integrity": "sha512-fpyYdpNtZ9GeNuDgl2EYSds3z1zr54KrCXdLnBM4n/ynB6KPXZxEY5/qbkbCND3DRHyQNHFBsbZN7+hs+81pgw==", "dependencies": { - "@mongodb-js/devtools-connect": "^3.0.5", - "@mongosh/errors": "2.2.15", - "@mongosh/history": "2.2.15", - "@mongosh/types": "2.2.15", + "@mongodb-js/devtools-connect": "^3.2.5", + "@mongosh/errors": "2.3.0", + "@mongosh/history": "2.3.0", + "@mongosh/types": "2.3.0", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^1.1.2" }, @@ -1338,33 +1372,34 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.15.tgz", - "integrity": "sha512-Pk+Sxxf0rE7KacEMZvhGjr15cWkV+lcbI8cv5Hf7Taxj8kLXfbKM45WBIgGtMDTh/fbmbT15qI7StG5sCO8CCg==", + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.3.0.tgz", + "integrity": "sha512-0DQUKVhfpwJRiFvTc4gjG6dxNDZUWTAGnl9ihfIL5ShxNKXluo+9VcYEL1wxLTbF1xZaMeCDzH6rIM02G5PM3w==", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.2.15", + "@mongosh/errors": "2.3.0", "bson": "^6.7.0", "mongodb": "^6.8.0", - "mongodb-build-info": "^1.7.2" + "mongodb-build-info": "^1.7.2", + "mongodb-connection-string-url": "^3.0.1" }, "engines": { "node": ">=14.15.1" }, "optionalDependencies": { - "mongodb-client-encryption": "^6.0.0" + "mongodb-client-encryption": "^6.1.0" } }, "node_modules/@mongosh/service-provider-server": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.15.tgz", - "integrity": "sha512-TtQVsMlQhZqRQ6Aj9tUcSvNLL6tthkzx3m/FhBxyT/7rxxuK56w0IUVg31Cqq/gz9xUfkP3JiKounIgYqRCbXQ==", + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.3.0.tgz", + "integrity": "sha512-fzdhnUM9LPo1PWJ5QUphATnytRgzH9BhcyNhtL8yEHDP8lwwRplQrwk801u1imgI8e4oYggauMzNZQRgxQWVog==", "dependencies": { - "@mongodb-js/devtools-connect": "^3.0.5", - "@mongodb-js/oidc-plugin": "^1.0.2", - "@mongosh/errors": "2.2.15", - "@mongosh/service-provider-core": "2.2.15", - "@mongosh/types": "2.2.15", + "@mongodb-js/devtools-connect": "^3.2.5", + "@mongodb-js/oidc-plugin": "^1.1.1", + "@mongosh/errors": "2.3.0", + "@mongosh/service-provider-core": "2.3.0", + "@mongosh/types": "2.3.0", "aws4": "^1.12.0", "mongodb": "^6.8.0", "mongodb-connection-string-url": "^3.0.1", @@ -1375,19 +1410,19 @@ }, "optionalDependencies": { "kerberos": "^2.1.0", - "mongodb-client-encryption": "^6.0.0" + "mongodb-client-encryption": "^6.1.0" } }, "node_modules/@mongosh/shell-api": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.15.tgz", - "integrity": "sha512-HkJhDKWHRRqa7fznsRVp/ivolM7RKeCyTuJXMVFym3qt4wlC63Tc3IQjm8HYORlFGRz04AOOwCgzkIp8ddPXkg==", + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.3.0.tgz", + "integrity": "sha512-Xzyg1T20YVywE1lXwhxR2muDUA4F2ClYaeAPc4bjQabNT9fWbuJXqbGBSwy36sv0rpqTiZqWJoFQcAgMfAt0PQ==", "dependencies": { - "@mongosh/arg-parser": "2.2.15", - "@mongosh/errors": "2.2.15", - "@mongosh/history": "2.2.15", - "@mongosh/i18n": "2.2.15", - "@mongosh/service-provider-core": "2.2.15", + "@mongosh/arg-parser": "2.3.0", + "@mongosh/errors": "2.3.0", + "@mongosh/history": "2.3.0", + "@mongosh/i18n": "2.3.0", + "@mongosh/service-provider-core": "2.3.0", "mongodb-redact": "^1.1.2" }, "engines": { @@ -1395,27 +1430,27 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.15.tgz", - "integrity": "sha512-Km/rThnbklPiYfNd/K1qFUNXICMRaYVq1pOWWSYbrT7a97KcFHIoD2OgUUudksuva4zc24CfeP5GSWRtYpbq+w==", + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.3.0.tgz", + "integrity": "sha512-TvWFrFkZ+LORZbAWu6tZHeJs+OQwKPli1sEHAVKjhhjiNo4v/kV/3990Dcqre2IZNBpybaZweTChf3b7Y5Lijw==", "dependencies": { - "@mongosh/async-rewriter2": "2.2.15", - "@mongosh/history": "2.2.15", - "@mongosh/shell-api": "2.2.15" + "@mongosh/async-rewriter2": "2.3.0", + "@mongosh/history": "2.3.0", + "@mongosh/shell-api": "2.3.0" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.15.tgz", - "integrity": "sha512-iA5Z7QjxVRTZChbX7GNHlpZ80W020W0DJgUgFQzFUmrIIgFxZKwfNuXszP8gywKRXFlrNNcPInHLgZHRoI62eg==", + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.3.0.tgz", + "integrity": "sha512-UMcRRW5StsR6C3gZceVkQ83mjw1ENJKQLvYD7gv8TueuAarGNzcrbOdCTnMHDOCJ5YeEr9NgKjVqNsVWFG2w3A==", "dependencies": { - "@mongosh/errors": "2.2.15", - "@mongosh/import-node-fetch": "2.2.15", - "@mongosh/shell-api": "2.2.15", - "@mongosh/types": "2.2.15", + "@mongodb-js/devtools-proxy-support": "^0.3.5", + "@mongosh/errors": "2.3.0", + "@mongosh/shell-api": "2.3.0", + "@mongosh/types": "2.3.0", "bson": "^6.7.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", @@ -1427,11 +1462,11 @@ } }, "node_modules/@mongosh/types": { - "version": "2.2.15", - "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.15.tgz", - "integrity": "sha512-HkhZkjrkK9w+QHd2kPl7mspZUOpCUmgEvvHLMHmhpaYksLcxm2H4/H+s5F1Kj3EpuC9yyOHuvfC3ZMhDOgF0tg==", + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.3.0.tgz", + "integrity": "sha512-55V8S7Awj9fGi3cAf0/9svGagErnChrK4hOY2Z4C4y06vN5t/EUO15lyZYHJFUldnydfZzHODkPjjyWV53a1XQ==", "dependencies": { - "@mongodb-js/devtools-connect": "^3.0.5" + "@mongodb-js/devtools-connect": "^3.2.5" }, "engines": { "node": ">=14.15.1" @@ -1570,15 +1605,15 @@ } }, "node_modules/@smithy/core": { - "version": "2.3.1", - "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-2.3.1.tgz", - "integrity": "sha512-BC7VMXx/1BCmRPCVzzn4HGWAtsrb7/0758EtwOGFJQrlSwJBEjCcDLNZLFoL/68JexYa2s+KmgL/UfmXdG6v1w==", + "version": "2.3.2", + "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-2.3.2.tgz", + "integrity": "sha512-in5wwt6chDBcUv1Lw1+QzZxN9fBffi+qOixfb65yK4sDuKG7zAUO9HAFqmVzsZM3N+3tTyvZjtnDXePpvp007Q==", "dependencies": { "@smithy/middleware-endpoint": "^3.1.0", - "@smithy/middleware-retry": "^3.0.13", + "@smithy/middleware-retry": "^3.0.14", "@smithy/middleware-serde": "^3.0.3", "@smithy/protocol-http": "^4.1.0", - "@smithy/smithy-client": "^3.1.11", + "@smithy/smithy-client": "^3.1.12", "@smithy/types": "^3.3.0", "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" @@ -1679,14 +1714,14 @@ } }, "node_modules/@smithy/middleware-retry": { - "version": "3.0.13", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-3.0.13.tgz", - "integrity": "sha512-zvCLfaRYCaUmjbF2yxShGZdolSHft7NNCTA28HVN9hKcEbOH+g5irr1X9s+in8EpambclGnevZY4A3lYpvDCFw==", + "version": "3.0.14", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-3.0.14.tgz", + "integrity": "sha512-7ZaWZJOjUxa5hgmuMspyt8v/zVsh0GXYuF7OvCmdcbVa/xbnKQoYC+uYKunAqRGTkxjOyuOCw9rmFUFOqqC0eQ==", "dependencies": { "@smithy/node-config-provider": "^3.1.4", "@smithy/protocol-http": "^4.1.0", "@smithy/service-error-classification": "^3.0.3", - "@smithy/smithy-client": "^3.1.11", + "@smithy/smithy-client": "^3.1.12", "@smithy/types": "^3.3.0", "@smithy/util-middleware": "^3.0.3", "@smithy/util-retry": "^3.0.3", @@ -1841,9 +1876,9 @@ } }, "node_modules/@smithy/smithy-client": { - "version": "3.1.11", - "resolved": "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-3.1.11.tgz", - "integrity": "sha512-l0BpyYkciNyMaS+PnFFz4aO5sBcXvGLoJd7mX9xrMBIm2nIQBVvYgp2ZpPDMzwjKCavsXu06iuCm0F6ZJZc6yQ==", + "version": "3.1.12", + "resolved": "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-3.1.12.tgz", + "integrity": "sha512-wtm8JtsycthkHy1YA4zjIh2thJgIQ9vGkoR639DBx5lLlLNU0v4GARpQZkr2WjXue74nZ7MiTSWfVrLkyD8RkA==", "dependencies": { "@smithy/middleware-endpoint": "^3.1.0", "@smithy/middleware-stack": "^3.0.3", @@ -1933,12 +1968,12 @@ } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "3.0.13", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.13.tgz", - "integrity": "sha512-ZIRSUsnnMRStOP6OKtW+gCSiVFkwnfQF2xtf32QKAbHR6ACjhbAybDvry+3L5qQYdh3H6+7yD/AiUE45n8mTTw==", + "version": "3.0.14", + "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.14.tgz", + "integrity": "sha512-0iwTgKKmAIf+vFLV8fji21Jb2px11ktKVxbX6LIDPAUJyWQqGqBVfwba7xwa1f2FZUoolYQgLvxQEpJycXuQ5w==", "dependencies": { "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.1.11", + "@smithy/smithy-client": "^3.1.12", "@smithy/types": "^3.3.0", "bowser": "^2.11.0", "tslib": "^2.6.2" @@ -1948,15 +1983,15 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "3.0.13", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.13.tgz", - "integrity": "sha512-voUa8TFJGfD+U12tlNNLCDlXibt9vRdNzRX45Onk/WxZe7TS+hTOZouEZRa7oARGicdgeXvt1A0W45qLGYdy+g==", + "version": "3.0.14", + "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.14.tgz", + "integrity": "sha512-e9uQarJKfXApkTMMruIdxHprhcXivH1flYCe8JRDTzkkLx8dA3V5J8GZlST9yfDiRWkJpZJlUXGN9Rc9Ade3OQ==", "dependencies": { "@smithy/config-resolver": "^3.0.5", "@smithy/credential-provider-imds": "^3.2.0", "@smithy/node-config-provider": "^3.1.4", "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.1.11", + "@smithy/smithy-client": "^3.1.12", "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, @@ -2244,6 +2279,14 @@ "hijack-stream": "^2.0.0" } }, + "node_modules/asn1": { + "version": "0.2.6", + "resolved": "https://registry.npmmirror.com/asn1/-/asn1-0.2.6.tgz", + "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", + "dependencies": { + "safer-buffer": "~2.1.0" + } + }, "node_modules/ast-types": { "version": "0.13.4", "resolved": "https://registry.npmmirror.com/ast-types/-/ast-types-0.13.4.tgz", @@ -2256,9 +2299,9 @@ } }, "node_modules/aws4": { - "version": "1.13.0", - "resolved": "https://registry.npmmirror.com/aws4/-/aws4-1.13.0.tgz", - "integrity": "sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==" + "version": "1.13.1", + "resolved": "https://registry.npmmirror.com/aws4/-/aws4-1.13.1.tgz", + "integrity": "sha512-u5w79Rd7SU4JaIlA/zFqG+gOiuq25q5VLyZ8E+ijJeILuTxVzZgp2CaGw/UTw6pXYN9XMO9yiqj/nEHmhTG5CA==" }, "node_modules/balanced-match": { "version": "1.0.2", @@ -2292,6 +2335,14 @@ "node": ">=10.0.0" } }, + "node_modules/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, "node_modules/big-integer": { "version": "1.6.52", "resolved": "https://registry.npmmirror.com/big-integer/-/big-integer-1.6.52.tgz", @@ -2405,9 +2456,9 @@ } }, "node_modules/browserslist": { - "version": "4.23.2", - "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.23.2.tgz", - "integrity": "sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==", + "version": "4.23.3", + "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.23.3.tgz", + "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", "funding": [ { "type": "opencollective", @@ -2423,9 +2474,9 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001640", - "electron-to-chromium": "^1.4.820", - "node-releases": "^2.0.14", + "caniuse-lite": "^1.0.30001646", + "electron-to-chromium": "^1.5.4", + "node-releases": "^2.0.18", "update-browserslist-db": "^1.1.0" }, "bin": { @@ -2466,6 +2517,15 @@ "ieee754": "^1.2.1" } }, + "node_modules/buildcheck": { + "version": "0.0.6", + "resolved": "https://registry.npmmirror.com/buildcheck/-/buildcheck-0.0.6.tgz", + "integrity": "sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==", + "optional": true, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/bundle-name": { "version": "3.0.0", "resolved": "https://registry.npmmirror.com/bundle-name/-/bundle-name-3.0.0.tgz", @@ -2507,9 +2567,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001644", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001644.tgz", - "integrity": "sha512-YGvlOZB4QhZuiis+ETS0VXR+MExbFf4fZYYeMTEE0aTQd/RdIjkTyZjLrbYVKnHzppDvnOhritRVv+i7Go6mHw==", + "version": "1.0.30001651", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz", + "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==", "funding": [ { "type": "opencollective", @@ -2621,6 +2681,20 @@ "resolved": "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" }, + "node_modules/cpu-features": { + "version": "0.0.10", + "resolved": "https://registry.npmmirror.com/cpu-features/-/cpu-features-0.0.10.tgz", + "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==", + "hasInstallScript": true, + "optional": true, + "dependencies": { + "buildcheck": "~0.0.6", + "nan": "^2.19.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -2816,9 +2890,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.5.4", - "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz", - "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==" + "version": "1.5.9", + "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.9.tgz", + "integrity": "sha512-HfkT8ndXR0SEkU8gBQQM3rz035bpE/hxkZ1YIt4KJPEFES68HfIU6LzKukH0H794Lm83WJtkSAMfEToxCs15VA==" }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -3201,9 +3275,9 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/foreground-child": { - "version": "3.2.1", - "resolved": "https://registry.npmmirror.com/foreground-child/-/foreground-child-3.2.1.tgz", - "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", + "version": "3.3.0", + "resolved": "https://registry.npmmirror.com/foreground-child/-/foreground-child-3.3.0.tgz", + "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" @@ -3291,11 +3365,6 @@ "node": ">=8" } }, - "node_modules/fs-minipass/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz", @@ -3863,15 +3932,15 @@ } }, "node_modules/kerberos": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/kerberos/-/kerberos-2.1.0.tgz", - "integrity": "sha512-HvOl6O6cyEN/8Z4CAocHe/sekJtvt5UrxUdCuu7bXDZ2Hnsy6OpsQbISW+lpm03vrbO2ir+1QQ5Sx/vMEhHnog==", + "version": "2.1.2", + "resolved": "https://registry.npmmirror.com/kerberos/-/kerberos-2.1.2.tgz", + "integrity": "sha512-GjCJStBDjNXRgNdmiJLJhbgz/gpG32yvKrECFbP5wrCmJh8uwh7HhhM+LA7IC11fNqIL5TUo4mEsTjs855MF0A==", "hasInstallScript": true, "optional": true, "dependencies": { "bindings": "^1.5.0", "node-addon-api": "^6.1.0", - "prebuild-install": "7.1.1" + "prebuild-install": "^7.1.2" }, "engines": { "node": ">=12.9.0" @@ -3907,17 +3976,17 @@ } }, "node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dependencies": { - "yallist": "^3.0.2" + "version": "11.0.0", + "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-11.0.0.tgz", + "integrity": "sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==", + "engines": { + "node": "20 || >=22" } }, "node_modules/macos-export-certificate-and-key": { - "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/macos-export-certificate-and-key/-/macos-export-certificate-and-key-1.1.2.tgz", - "integrity": "sha512-kd4ba3kVKZXy46p4tg3X19dmwaXjtz0La5It6Rt6PbtwP+YcQ0F7ab8MjcSHOvz9NSXmAU15qQG53OlBDAPDzQ==", + "version": "1.2.2", + "resolved": "https://registry.npmmirror.com/macos-export-certificate-and-key/-/macos-export-certificate-and-key-1.2.2.tgz", + "integrity": "sha512-+LwU/wG3wawI3yZ/CMf9C6jSSugJ823EuNJeV8J+FTbmYDJ8G3sF9Fha/0BLEbRZU28+oVvBD3a4mYxLQzDvLA==", "hasInstallScript": true, "optional": true, "os": [ @@ -4066,11 +4135,6 @@ "node": ">=8" } }, - "node_modules/minizlib/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, "node_modules/mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz", @@ -4142,9 +4206,9 @@ } }, "node_modules/mongodb-client-encryption": { - "version": "6.0.1", - "resolved": "https://registry.npmmirror.com/mongodb-client-encryption/-/mongodb-client-encryption-6.0.1.tgz", - "integrity": "sha512-u6pKu9plR7hQH6VtsfYonC9dwWAM3HFEpi+Xy3EJIdUyoH6dlFgaxX8TnKx/Ycfi2I1cxTXq2IbhSpg157vVgg==", + "version": "6.1.0", + "resolved": "https://registry.npmmirror.com/mongodb-client-encryption/-/mongodb-client-encryption-6.1.0.tgz", + "integrity": "sha512-Y3Hakre82nXD/pNDUzBjxfgwWSj5E1ar9ZLkqyXDfvirv4huHMbg8Q2qVO/TXlNJuf1B2bzrEDXsTqHKQSQLtw==", "hasInstallScript": true, "optional": true, "dependencies": { @@ -4156,32 +4220,6 @@ "node": ">=16.20.1" } }, - "node_modules/mongodb-client-encryption/node_modules/prebuild-install": { - "version": "7.1.2", - "resolved": "https://registry.npmmirror.com/prebuild-install/-/prebuild-install-7.1.2.tgz", - "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==", - "optional": true, - "dependencies": { - "detect-libc": "^2.0.0", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^1.0.1", - "node-abi": "^3.3.0", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^4.0.0", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - }, - "bin": { - "prebuild-install": "bin.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/mongodb-connection-string-url": { "version": "3.0.1", "resolved": "https://registry.npmmirror.com/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.1.tgz", @@ -4227,6 +4265,12 @@ "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "node_modules/nan": { + "version": "2.20.0", + "resolved": "https://registry.npmmirror.com/nan/-/nan-2.20.0.tgz", + "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", + "optional": true + }, "node_modules/napi-build-utils": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz", @@ -4457,11 +4501,6 @@ "node": ">=10" } }, - "node_modules/openid-client/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, "node_modules/os-dns-native": { "version": "1.2.1", "resolved": "https://registry.npmmirror.com/os-dns-native/-/os-dns-native-1.2.1.tgz", @@ -4557,9 +4596,9 @@ "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==" }, "node_modules/prebuild-install": { - "version": "7.1.1", - "resolved": "https://registry.npmmirror.com/prebuild-install/-/prebuild-install-7.1.1.tgz", - "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", + "version": "7.1.2", + "resolved": "https://registry.npmmirror.com/prebuild-install/-/prebuild-install-7.1.2.tgz", + "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==", "optional": true, "dependencies": { "detect-libc": "^2.0.0", @@ -4677,37 +4716,6 @@ "node": ">= 0.10" } }, - "node_modules/proxy-agent": { - "version": "6.4.0", - "resolved": "https://registry.npmmirror.com/proxy-agent/-/proxy-agent-6.4.0.tgz", - "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==", - "dependencies": { - "agent-base": "^7.0.2", - "debug": "^4.3.4", - "http-proxy-agent": "^7.0.1", - "https-proxy-agent": "^7.0.3", - "lru-cache": "^7.14.1", - "pac-proxy-agent": "^7.0.1", - "proxy-from-env": "^1.1.0", - "socks-proxy-agent": "^8.0.2" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/proxy-agent/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "engines": { - "node": ">=12" - } - }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" - }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmmirror.com/pump/-/pump-3.0.0.tgz", @@ -5164,6 +5172,23 @@ "resolved": "https://registry.npmmirror.com/sprintf-js/-/sprintf-js-1.1.3.tgz", "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" }, + "node_modules/ssh2": { + "version": "1.15.0", + "resolved": "https://registry.npmmirror.com/ssh2/-/ssh2-1.15.0.tgz", + "integrity": "sha512-C0PHgX4h6lBxYx7hcXwu3QWdh4tg6tZZsTfXcdvc5caW/EMxaB4H9dWsl7qk+F7LAW762hp8VbXOX7x4xUYvEw==", + "hasInstallScript": true, + "dependencies": { + "asn1": "^0.2.6", + "bcrypt-pbkdf": "^1.0.2" + }, + "engines": { + "node": ">=10.16.0" + }, + "optionalDependencies": { + "cpu-features": "~0.0.9", + "nan": "^2.18.0" + } + }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/statuses/-/statuses-2.0.1.tgz", @@ -5301,12 +5326,12 @@ } }, "node_modules/system-ca": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/system-ca/-/system-ca-2.0.0.tgz", - "integrity": "sha512-eEWsCZHEyXdRPPMO680gLUhb9x8RK7YlXvv+I0zCvmGg9zf9OCchJxDf5NHqGPwAzLDEFpLXL5qv9KEU62N4Nw==", + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/system-ca/-/system-ca-2.0.1.tgz", + "integrity": "sha512-9ZDV9yl8ph6Op67wDGPr4LykX86usE9x3le+XZSHfVMiiVJ5IRgmCWjLgxyz35ju9H3GDIJJZm4ogAeIfN5cQQ==", "optionalDependencies": { - "macos-export-certificate-and-key": "^1.1.1", - "win-export-certificate-and-key": "^2.0.0" + "macos-export-certificate-and-key": "^1.2.0", + "win-export-certificate-and-key": "^2.1.0" } }, "node_modules/tar": { @@ -5367,11 +5392,6 @@ "node": ">=8" } }, - "node_modules/tar/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz", @@ -5432,6 +5452,11 @@ "node": "*" } }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmmirror.com/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" + }, "node_modules/type-is": { "version": "1.6.18", "resolved": "https://registry.npmmirror.com/type-is/-/type-is-1.6.18.tgz", @@ -5574,9 +5599,9 @@ } }, "node_modules/win-export-certificate-and-key": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/win-export-certificate-and-key/-/win-export-certificate-and-key-2.0.1.tgz", - "integrity": "sha512-GsPUuIn95CepWgfiaqyIBWlj1uzr0LMfWIHBESSa+f84Zll9SjIX7Jj0+xNs/FlhH5zEkPO6k+SRQX1dfv3zPg==", + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/win-export-certificate-and-key/-/win-export-certificate-and-key-2.1.0.tgz", + "integrity": "sha512-WeMLa/2uNZcS/HWGKU2G1Gzeh3vHpV/UFvwLhJLKxPHYFAbubxxVcJbqmPXaqySWK1Ymymh16zKK5WYIJ3zgzA==", "hasInstallScript": true, "optional": true, "os": [ @@ -5717,9 +5742,9 @@ "optional": true }, "node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yargs-parser": { "version": "20.2.9", diff --git a/pkgs/by-name/mo/mongosh/source.json b/pkgs/by-name/mo/mongosh/source.json index a022279fb2fc..f17f562633de 100644 --- a/pkgs/by-name/mo/mongosh/source.json +++ b/pkgs/by-name/mo/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "2.2.15", - "integrity": "sha512-9K9+S7toDI0QtGSM+KbQCm+m7ofNOrlJ75Pmmdg+l7Q7HW5prUzSiBF48lRumPqbp5f/mgDoQ7S6IhU5Zp3oCw==", - "filename": "mongosh-2.2.15.tgz", - "deps": "sha256-LPe54jox2q+KvQ8f36JrVUSwB7tcXFmt3csK65mLVNo=" + "version": "2.3.0", + "integrity": "sha512-IDJpIF15g64t4ooSJzR/teqiqT4lQJ2ezdz9bI9LJiXVPU9nOQcXtvaJlGzNgTsK9C+0mNc0a6qSK9MI25A0tA==", + "filename": "mongosh-2.3.0.tgz", + "deps": "sha256-C7SNmFxbk6rgnoe93cAx6dAYhRAm5VqpwlNqEDdS0jY=" } From 9c270a7bfad9f41d33434d5210b679cbd84e2da7 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Fri, 16 Aug 2024 12:58:55 +0200 Subject: [PATCH 258/357] esdm: 1.1.1 -> 1.2.0 This release contains bug fixes related to wait operations on time changes (CLOCK_REALTIME->CLOCK_MONOTONIC) and better cliend handling. Changes: https://github.com/smuellerDD/esdm/releases/tag/v1.2.0 As a small additional fix, esdm now sets propagatedBuildInputs correctly. Signed-off-by: Markus Theil --- pkgs/os-specific/linux/esdm/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/esdm/default.nix b/pkgs/os-specific/linux/esdm/default.nix index f49f25ece6cf..e11310da7255 100644 --- a/pkgs/os-specific/linux/esdm/default.nix +++ b/pkgs/os-specific/linux/esdm/default.nix @@ -59,24 +59,26 @@ assert cryptoBackend == "openssl" || cryptoBackend == "botan" || cryptoBackend = stdenv.mkDerivation rec { pname = "esdm"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "esdm"; rev = "v${version}"; - hash = "sha256-Z8cIjNI+Qi6O2e72vbEefbCCXyIA+lcEMDzWJReGrUs="; + hash = "sha256-5XctrI02pfCgK1P76AaSkMjiQqav6LX3SMjKr4F44sw="; }; nativeBuildInputs = [ meson pkg-config ninja ]; - buildInputs = [ protobufc ] - ++ lib.optional (cryptoBackend == "botan" || botanRng) botan3 + + buildInputs = lib.optional (cryptoBackend == "botan" || botanRng) botan3 ++ lib.optional (cryptoBackend == "openssl" || openSSLRandProvider) openssl ++ lib.optional selinux libselinux ++ lib.optional esJitterRng jitterentropy ++ lib.optional linuxDevFiles fuse3 ++ lib.optional esJitterRngKernel libkcapi; + propagatedBuildInputs = [ protobufc ]; + mesonFlags = [ (lib.mesonBool "b_lto" false) (lib.mesonBool "fips140" false) From e33d9a43b5f7fb2904f493f5c46bd3bc91ba0baf Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 16 Aug 2024 12:23:59 +0100 Subject: [PATCH 259/357] diffoscope: 274 -> 275 Changes: https://diffoscope.org/news/diffoscope-275-released/ --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 312a50bd67d7..7c20981b9651 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -102,11 +102,11 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "274"; + version = "275"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-XRh1wfsLE8YnaKWgFKvDQkhY1J76Dw5KLWtHQJtWbfI="; + hash = "sha256-mVbCsOPR0gm+93AG2p/W/TIOZItHSTOs40Q9uTiokEY="; }; outputs = [ From 3bd6a90e1b928d9469f4042d2d9a9d534cf96fa3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 11:27:08 +0000 Subject: [PATCH 260/357] plasmusic-toolbar: 1.4.0 -> 1.5.0 --- pkgs/by-name/pl/plasmusic-toolbar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix index 8a6e2d162631..73afe152d627 100644 --- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix +++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "plasmusic-toolbar"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ccatterina"; repo = "plasmusic-toolbar"; rev = "v${finalAttrs.version}"; - hash = "sha256-Em/5HXKVXAwsWYoJp+50Y+5Oe+JfJ4pYQd0+D7PoyGg="; + hash = "sha256-22eSrvigJHmwVB396APkDtiJjavpijUMuZ4mqQGVwf4="; }; installPhase = '' From f6a1ace8d8fe713ee3947a7808780711381adcca Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Fri, 16 Aug 2024 19:27:41 +0800 Subject: [PATCH 261/357] osu-lazer-bin: 2024.731.0 -> 2024.816.0 --- pkgs/games/osu-lazer/bin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index a9d60f24d41d..26256fa329a8 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,22 +7,22 @@ let pname = "osu-lazer-bin"; - version = "2024.731.0"; + version = "2024.816.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-Z6BIRFkaVBthkZXvewr4lAQCXVNz5SAsm9dR26lZu64="; + hash = "sha256-i56sgECdFVDcWDqEjKjXEjrlLEdfiBAvriRg7s19W2E="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-FWmkcmuMMj4B2dsIlliCuOiQjR+5sAU+b9Jmd+RCmiU="; + hash = "sha256-4pzal/ddWGxueOirroyHk+b09YVeaNtE7hmmR8uY9GY="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-6BxHRM7hC+v61BVqSFTzGpi7EyZQeo7kWua0CkrWiPM="; + hash = "sha256-5DlVwDVhiKCm1uwI0roV3Zj0BuXxVWxQsxgr0n95vXs="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); From 515b18c61ef5d615459d6cae72f8f847816ac55a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 16 Aug 2024 13:21:35 +0200 Subject: [PATCH 262/357] lexical: 0.7.0 -> 0.7.1 Diff: https://github.com/lexical-lsp/lexical/compare/refs/tags/v0.7.0...v0.7.1 Changelog: https://github.com/lexical-lsp/lexical/releases/tag/v0.7.1 --- pkgs/by-name/le/lexical/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/le/lexical/package.nix b/pkgs/by-name/le/lexical/package.nix index 18a73f2825de..3edf7e224b73 100644 --- a/pkgs/by-name/le/lexical/package.nix +++ b/pkgs/by-name/le/lexical/package.nix @@ -10,19 +10,19 @@ beamPackages.mixRelease rec { pname = "lexical"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "lexical-lsp"; repo = "lexical"; rev = "refs/tags/v${version}"; - hash = "sha256-veIFr8oovEhukwkGzj02pdc6vN1FCXGz1kn4FAcMALQ="; + hash = "sha256-YKp1IOBIt6StYpVZyTj3BMZM/+6Bp+galbFpuBKYeOM="; }; mixFodDeps = beamPackages.fetchMixDeps { inherit pname version src; - hash = "sha256-pqghYSBeDHfeZclC7jQU0FbadioTZ6uT3+InEUSW3rY="; + hash = "sha256-myxmQM46TELDu9wpr82qxqH4s/YR9t0gdAfGOm0Dw1k="; }; installPhase = '' From 7f2b9c10d4b214f89bd7b075dd2933a95b392c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 16 Aug 2024 13:28:02 +0200 Subject: [PATCH 263/357] Revert "bandwhich: 0.22.2 -> 0.22.2-unstable-2024-08-13" This reverts commit f0c5d2f5f1e4f9561ec286e6fe5aafc8828c99ba. Turns out that this package has been already fixed in https://github.com/NixOS/nixpkgs/pull/334824 --- pkgs/tools/networking/bandwhich/Cargo.lock | 1001 +++++++------------ pkgs/tools/networking/bandwhich/default.nix | 6 +- 2 files changed, 378 insertions(+), 629 deletions(-) diff --git a/pkgs/tools/networking/bandwhich/Cargo.lock b/pkgs/tools/networking/bandwhich/Cargo.lock index f43aee7979f1..feb4351cdb2a 100644 --- a/pkgs/tools/networking/bandwhich/Cargo.lock +++ b/pkgs/tools/networking/bandwhich/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", "cipher", @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "once_cell", @@ -42,18 +42,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "android-tzdata" @@ -72,48 +72,47 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -121,44 +120,35 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" dependencies = [ "backtrace", ] -[[package]] -name = "arbitrary" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" -dependencies = [ - "derive_arbitrary", -] - [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.48", ] [[package]] name = "autocfg" -version = "1.3.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -185,7 +175,7 @@ dependencies = [ "http_req", "insta", "ipnetwork", - "itertools 0.13.0", + "itertools", "log", "netstat2", "once_cell", @@ -208,6 +198,12 @@ dependencies = [ "zip", ] +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + [[package]] name = "bitflags" version = "1.3.2" @@ -216,9 +212,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "block-buffer" @@ -229,22 +225,11 @@ dependencies = [ "generic-array", ] -[[package]] -name = "bstr" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byteorder" @@ -254,9 +239,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bzip2" @@ -285,24 +270,14 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" -[[package]] -name = "castaway" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" -dependencies = [ - "rustversion", -] - [[package]] name = "cc" -version = "1.0.104" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", "libc", - "once_cell", ] [[package]] @@ -313,16 +288,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-targets 0.52.0", ] [[package]] @@ -337,9 +312,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.13" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", "clap_derive", @@ -347,9 +322,9 @@ dependencies = [ [[package]] name = "clap-verbosity-flag" -version = "2.2.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63d19864d6b68464c59f7162c9914a0b569ddc2926b4a2d71afe62a9738eff53" +checksum = "b57f73ca21b17a0352944b9bb61803b6007bd911b6cccfef7153f7f0600ac495" dependencies = [ "clap", "log", @@ -357,9 +332,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.13" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ "anstream", "anstyle", @@ -369,36 +344,36 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.12" +version = "4.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8670053e87c316345e384ca1f3eba3006fc6355ed8b8a1140d104e109e3df34" +checksum = "df631ae429f6613fcd3a7c1adbdb65f637271e561b03680adaa6573015dfb106" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.48", ] [[package]] name = "clap_lex" -version = "0.7.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clap_mangen" -version = "0.2.23" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f17415fd4dfbea46e3274fcd8d368284519b358654772afb700dc2e8d2b24eeb" +checksum = "4a7c2b01e5e779c19f46a94bbd398f33ae63b0f78c07108351fb4536845bb7fd" dependencies = [ "clap", "roff", @@ -406,22 +381,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" - -[[package]] -name = "compact_str" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" -dependencies = [ - "castaway", - "cfg-if", - "itoa", - "ryu", - "static_assertions", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "console" @@ -437,9 +399,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "core-foundation" @@ -466,26 +428,11 @@ dependencies = [ "libc", ] -[[package]] -name = "crc" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if", ] @@ -511,9 +458,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crossterm" @@ -521,10 +468,10 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.4.2", "crossterm_winapi", "libc", - "mio 0.8.11", + "mio", "parking_lot", "signal-hook", "signal-hook-mio", @@ -552,15 +499,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.6.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "deflate64" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "deranged" @@ -593,17 +534,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_arbitrary" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - [[package]] name = "digest" version = "0.10.7" @@ -615,22 +545,11 @@ dependencies = [ "subtle", ] -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - [[package]] name = "either" -version = "1.13.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -644,23 +563,17 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.48", ] -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - [[package]] name = "errno" -version = "0.3.9" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", "windows-sys 0.52.0", @@ -668,15 +581,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -762,7 +675,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.48", ] [[package]] @@ -779,9 +692,9 @@ checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.3" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" @@ -813,9 +726,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -824,9 +737,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -836,9 +749,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -850,17 +763,11 @@ 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" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" [[package]] name = "hex" @@ -890,9 +797,9 @@ dependencies = [ [[package]] name = "http_req" -version = "0.11.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0122ab6637149482eb66b57288ac597bc7eb9859cbaa79dee62fa19a350df3d2" +checksum = "90394b01e9de1f7eca6ca0664cc64bd92add9603c1aa4f961813f23789035e10" dependencies = [ "native-tls", "unicase", @@ -900,16 +807,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.52.0", + "windows-core", ] [[package]] @@ -942,14 +849,10 @@ dependencies = [ ] [[package]] -name = "indexmap" -version = "2.2.6" +name = "indoc" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "inout" @@ -962,14 +865,15 @@ dependencies = [ [[package]] name = "insta" -version = "1.39.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "lazy_static", "linked-hash-map", "similar", + "yaml-rust", ] [[package]] @@ -999,65 +903,50 @@ 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 = "itertools" -version = "0.12.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "linked-hash-map" @@ -1067,37 +956,31 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.12" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", ] -[[package]] -name = "lockfree-object-pool" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" - [[package]] name = "log" -version = "0.4.22" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" -version = "0.12.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" dependencies = [ "hashbrown", ] @@ -1111,16 +994,6 @@ dependencies = [ "linked-hash-map", ] -[[package]] -name = "lzma-rs" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" -dependencies = [ - "byteorder", - "crc", -] - [[package]] name = "match_cfg" version = "0.1.0" @@ -1129,24 +1002,24 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.11" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", @@ -1154,24 +1027,13 @@ 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 = "native-tls" -version = "0.2.12" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ + "lazy_static", "libc", "log", "openssl", @@ -1231,27 +1093,37 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.19" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[package]] -name = "num_threads" -version = "0.1.7" +name = "num_cpus" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" dependencies = [ "libc", ] [[package]] name = "object" -version = "0.36.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -1264,11 +1136,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.4.2", "cfg-if", "foreign-types", "libc", @@ -1285,7 +1157,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.48", ] [[package]] @@ -1296,9 +1168,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" dependencies = [ "cc", "libc", @@ -1319,9 +1191,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", "parking_lot_core", @@ -1329,31 +1201,44 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.10" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.6", + "windows-targets 0.48.5", +] + +[[package]] +name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core", + "subtle", ] [[package]] name = "paste" -version = "1.0.15" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbkdf2" -version = "0.12.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ "digest", "hmac", + "password-hash", + "sha2", ] [[package]] @@ -1364,9 +1249,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1376,9 +1261,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "pnet" @@ -1425,7 +1310,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.68", + "syn 2.0.48", ] [[package]] @@ -1483,20 +1368,11 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit", -] - [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -1507,7 +1383,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.4.2", "chrono", "flate2", "hex", @@ -1522,7 +1398,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.4.2", "chrono", "hex", ] @@ -1535,9 +1411,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.36" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1574,30 +1450,28 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.27.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16546c5b5962abf8ce6e2881e722b4e0ae3b6f1a08a26ae3573c55853ca68d3" +checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.4.2", "cassowary", - "compact_str", "crossterm", - "itertools 0.13.0", + "indoc", + "itertools", "lru", "paste", "stability", "strum", - "strum_macros", "unicode-segmentation", - "unicode-truncate", "unicode-width", ] [[package]] name = "rayon" -version = "1.10.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -1615,18 +1489,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags 2.6.0", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.10.5" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -1636,9 +1510,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -1647,15 +1521,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "relative-path" -version = "1.9.3" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" +checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" [[package]] name = "resolv-conf" @@ -1675,9 +1549,9 @@ checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" [[package]] name = "rstest" -version = "0.21.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" +checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199" dependencies = [ "futures", "futures-timer", @@ -1687,27 +1561,26 @@ dependencies = [ [[package]] name = "rstest_macros" -version = "0.21.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" +checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" dependencies = [ "cfg-if", "glob", - "proc-macro-crate", "proc-macro2", "quote", "regex", "relative-path", "rustc_version", - "syn 2.0.68", + "syn 2.0.48", "unicode-ident", ] [[package]] name = "rustc-demangle" -version = "0.1.24" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc_version" @@ -1720,11 +1593,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", @@ -1733,15 +1606,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "schannel" @@ -1760,11 +1627,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.11.0" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags 2.6.0", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -1773,9 +1640,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -1783,28 +1650,28 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.23" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.48", ] [[package]] @@ -1818,6 +1685,17 @@ dependencies = [ "digest", ] +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "signal-hook" version = "0.3.17" @@ -1830,35 +1708,29 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.4" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", - "mio 0.8.11", + "mio", "signal-hook", ] [[package]] name = "signal-hook-registry" -version = "1.4.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - [[package]] name = "similar" -version = "2.5.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" +checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" [[package]] name = "simplelog" @@ -1882,69 +1754,63 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "stability" -version = "0.2.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a" +checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" dependencies = [ "quote", - "syn 2.0.68", + "syn 1.0.109", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" -version = "0.11.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.26.3" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.4" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.68", + "syn 2.0.48", ] [[package]] name = "subtle" -version = "2.6.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -1959,9 +1825,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.68" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -1970,58 +1836,59 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.31.0" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a6b037e3af4ae9a9d6214198e4df53091363b2c96c88fc416a6c1bd92a2799" +checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" dependencies = [ - "bstr", + "cfg-if", "core-foundation-sys", "libc", - "memchr", "ntapi", + "once_cell", "rayon", "windows", ] [[package]] name = "tempfile" -version = "3.10.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand", + "redox_syscall", "rustix", "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.4.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.48", ] [[package]] @@ -2059,9 +1926,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -2074,34 +1941,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.2" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.1", + "mio", + "num_cpus", "pin-project-lite", "socket2", - "windows-sys 0.52.0", -] - -[[package]] -name = "toml_datetime" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", + "windows-sys 0.48.0", ] [[package]] @@ -2123,7 +1974,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.48", ] [[package]] @@ -2210,40 +2061,30 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-truncate" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5fbabedabe362c618c714dbefda9927b5afc8e2a8102f47f081089a9019226" -dependencies = [ - "itertools 0.12.1", - "unicode-width", -] +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "url" -version = "2.5.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -2252,9 +2093,9 @@ dependencies = [ [[package]] name = "utf8parse" -version = "0.2.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "vcpkg" @@ -2276,9 +2117,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2286,24 +2127,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2311,28 +2152,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "widestring" -version = "1.1.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "winapi" @@ -2352,11 +2193,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ - "windows-sys 0.52.0", + "winapi", ] [[package]] @@ -2367,12 +2208,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.57.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core 0.57.0", - "windows-targets 0.52.6", + "windows-core", + "windows-targets 0.52.0", ] [[package]] @@ -2381,50 +2222,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "windows-interface" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.0", ] [[package]] @@ -2442,7 +2240,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.0", ] [[package]] @@ -2462,18 +2260,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.6" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" dependencies = [ - "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.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -2484,9 +2281,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.6" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" @@ -2496,9 +2293,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.6" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" @@ -2508,15 +2305,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.6" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" @@ -2526,9 +2317,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.6" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" @@ -2538,9 +2329,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.6" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" @@ -2550,9 +2341,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.6" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" @@ -2562,18 +2353,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.6" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winreg" @@ -2586,111 +2368,78 @@ dependencies = [ ] [[package]] -name = "zerocopy" -version = "0.7.35" +name = "yaml-rust" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", + "syn 2.0.48", ] [[package]] name = "zip" -version = "2.1.6" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "aes", - "arbitrary", + "byteorder", "bzip2", "constant_time_eq", "crc32fast", "crossbeam-utils", - "deflate64", - "displaydoc", "flate2", "hmac", - "indexmap", - "lzma-rs", - "memchr", "pbkdf2", - "rand", "sha1", - "thiserror", "time", - "zeroize", - "zopfli", "zstd", ] -[[package]] -name = "zopfli" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" -dependencies = [ - "bumpalo", - "crc32fast", - "lockfree-object-pool", - "log", - "once_cell", - "simd-adler32", -] - [[package]] name = "zstd" -version = "0.13.1" +version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.1.0" +version = "5.0.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" dependencies = [ + "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.11+zstd.1.5.6" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 77b67409d745..eb361e1aac2d 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.22.2-unstable-2024-08-13"; + version = "0.22.2"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; - rev = "894ea319838cbfd75b00f08518bca41a9c8e060c"; - hash = "sha256-DjH48mkgz81ACvZ28P2HzhLvS7wVresWzIAPD7swzoY="; + rev = "v${version}"; + hash = "sha256-/uG1xjhxnIkS3rq7Tv1q1v8X7p1baDB8OiSEV9OLyfo="; }; cargoLock = { From 32109a4116bfb4bb07046eafebb344675f27f378 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 16 Aug 2024 09:41:43 +0300 Subject: [PATCH 264/357] kdePackages.karousel: init at 0.9.4 --- pkgs/kde/default.nix | 4 +- pkgs/kde/third-party/karousel/default.nix | 49 +++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 pkgs/kde/third-party/karousel/default.nix diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index 6f80e4eaadb4..0890c7e96376 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -61,7 +61,6 @@ libmediawiki = null; alpaka = self.callPackage ./misc/alpaka {}; - applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 {}; kdiagram = self.callPackage ./misc/kdiagram {}; kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {}; kirigami-addons = self.callPackage ./misc/kirigami-addons {}; @@ -78,6 +77,9 @@ phonon-vlc = self.callPackage ./misc/phonon-vlc {}; polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 {}; pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt {}; + + applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 {}; + karousel = self.callPackage ./third-party/karousel {}; } ); in diff --git a/pkgs/kde/third-party/karousel/default.nix b/pkgs/kde/third-party/karousel/default.nix new file mode 100644 index 000000000000..ebaf37cfa3a6 --- /dev/null +++ b/pkgs/kde/third-party/karousel/default.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitHub, + kpackage, + kwin, + nodejs, + typescript, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "karousel"; + version = "0.9.4"; + + src = fetchFromGitHub { + owner = "peterfajdiga"; + repo = "karousel"; + rev = "v${finalAttrs.version}"; + hash = "sha256-L6N1TCvc9AoTTJrAnO68lbSZq8M668BHAU7ynNzoTn8="; + }; + + postPatch = '' + patchShebangs run-ts.sh + ''; + + nativeBuildInputs = [ + kpackage + nodejs + typescript + ]; + buildInputs = [ kwin ]; + dontWrapQtApps = true; + + installPhase = '' + runHook preInstall + + kpackagetool6 --type=KWin/Script --install=./package --packageroot=$out/share/kwin/scripts + + runHook postInstall + ''; + + meta = { + description = "Scrollable tiling Kwin script"; + homepage = "https://github.com/peterfajdiga/karousel"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ k900 ]; + platforms = lib.platforms.all; + }; +}) From 3f73cc2cf6dcbe24ef3318d0575ca9d444fb1eb7 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 16 Aug 2024 09:42:00 +0300 Subject: [PATCH 265/357] kdePackages.kzones: init at 0.8 --- pkgs/kde/default.nix | 1 + pkgs/kde/third-party/kzones/default.nix | 45 +++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/kde/third-party/kzones/default.nix diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index 0890c7e96376..607b54d17c23 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -80,6 +80,7 @@ applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 {}; karousel = self.callPackage ./third-party/karousel {}; + kzones = self.callPackage ./third-party/kzones {}; } ); in diff --git a/pkgs/kde/third-party/kzones/default.nix b/pkgs/kde/third-party/kzones/default.nix new file mode 100644 index 000000000000..a53d88af099a --- /dev/null +++ b/pkgs/kde/third-party/kzones/default.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + kpackage, + kwin, + zip, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kzones"; + version = "0.8"; + + src = fetchFromGitHub { + owner = "gerritdevriese"; + repo = "kzones"; + rev = "v${finalAttrs.version}"; + hash = "sha256-6cZJEcvynlP9nXyBKRst8Bca0d8Mh51ft7ocRrgCV7w="; + }; + + nativeBuildInputs = [ + kpackage + zip + ]; + buildInputs = [ kwin ]; + dontWrapQtApps = true; + + buildFlags = [ "build" ]; + + installPhase = '' + runHook preInstall + + kpackagetool6 --type=KWin/Script --install=kzones.kwinscript --packageroot=$out/share/kwin/scripts + + runHook postInstall + ''; + + meta = { + description = "KDE KWin Script for snapping windows into zones"; + homepage = "https://github.com/gerritdevriese/kzones/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ k900 ]; + platforms = lib.platforms.all; + }; +}) From d0b50b84ba6cb7f1ffb797e8651fe47613db451a Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Fri, 16 Aug 2024 19:38:59 +0800 Subject: [PATCH 266/357] osu-lazer: 2024.731.0 -> 2024.816.0 --- pkgs/games/osu-lazer/default.nix | 4 ++-- pkgs/games/osu-lazer/deps.nix | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index d05d272639c5..47a669dddc7f 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2024.731.0"; + version = "2024.816.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - hash = "sha256-f7HkIWRxMLoBnPsca6wqr/KEx3IAXxX3ecBIZxlu78A="; + hash = "sha256-OzXxvQDCYoHiPj6WzLbNsJXxngg0w02wbU9LNPCkK8Y="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 1320c505c44c..d4a20ceeb389 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -130,23 +130,23 @@ (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.4"; hash = "sha256-4vNnamnIVNpVBOPXyyJcbj0pe/aixGLmvXzq3vkUXMs="; }) (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.4"; hash = "sha256-9jORi42+oYFdNEin9lYWMBGrktyTBMAl5sfr1jxAbVE="; }) (fetchNuGet { pname = "PolySharp"; version = "1.10.0"; hash = "sha256-30IBYsy7zYtEHDZGw6K9asFq2dXbW+CrBMpMCEdkERs="; }) - (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2024.517.0"; hash = "sha256-BVEAIMDUI7l9LSpnS9fn3sXMuNbJQ/w1K6l11pSmkBo="; }) - (fetchNuGet { pname = "ppy.LocalisationAnalyser.Tools"; version = "2024.517.0"; hash = "sha256-AJcU/oFiq6kCnScTaRkvV7vjKQ9YbJqCI5dEO2g5vrQ="; }) + (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2024.802.0"; hash = "sha256-vyRWbdPUp5n8hJPJReU9LUy2o/bwwLT1po9f2M16tMA="; }) + (fetchNuGet { pname = "ppy.LocalisationAnalyser.Tools"; version = "2024.802.0"; hash = "sha256-bniBSY8rS005OHO/ixn2NFM0/KIMiawHyMSXhlAEqwc="; }) (fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; hash = "sha256-yG3IWNixzv+kFgYw6yAkjw9PWMpyR0tvrkFsgWGQ1qY="; }) (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; hash = "sha256-VfIbFhCDsCRZW5bCbt8MSmE2kAlcKxxx6vdFOus4he8="; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; hash = "sha256-qUEGJHoYfDvHrpuXdVaiSoV2iVVh9X0yEB41u96+q6A="; }) (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; hash = "sha256-HzhypEVJA+6h3aBB95zNeGbmzEIRc5435Eh9nYpjVkA="; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.720.0"; hash = "sha256-OL78drEPNhpcfeR7rPIe4egGdNg/ADRF2wfD0Hfz21A="; }) - (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2024.326.0-nativelibs"; hash = "sha256-smHbz5/uBrY7cLKOOClrrVv0MyWNYQz6T9kmIv5DfZM="; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.809.2"; hash = "sha256-Q8AmtVjauwe0mJMkvY6SXTF0WsycjRyInQv8/Uo2iQs="; }) + (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2024.809.1-nativelibs"; hash = "sha256-F7xd66bCEDgEjYgqmx21lYde+ebCsX/E2fuqWXH4xyU="; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; hash = "sha256-XXV/qBJ9vEVF15fcOlDyoJ8j47azuSJaXHEgsn3fOwA="; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.731.0"; hash = "sha256-GKZo8rV0p1utWkUIzuL3nIVMoVpwQ2X7sdW3znnDpA4="; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.810.0"; hash = "sha256-p8aegRGVYUTKhV9qdIlvFxISMpFL761Q6RdbpT8gWWY="; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; hash = "sha256-Xu4uiYs1pqIXcBWeTBIc8OIqbLmH6MvaY6Dim4ZNikg="; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.741-alpha"; hash = "sha256-sdX+MoMlIPUyi4yEUVHtqxKWF/VK04e2VaUavmgBEJU="; }) - (fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.717.0"; hash = "sha256-duH4pLfI6IhTjA+abiOE57e7J41AP7+8ba09rIat1Pg="; }) + (fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.807.1"; hash = "sha256-9ppVYCkc43NIsfe9iKWlxd8elgECZqP+pRPT9ybxiAU="; }) (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.58-gfe61932a71"; hash = "sha256-+fZB3EJpXQPolB13mRNglznpUXgCh82MqymkCjteTPg="; }) (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.58-gfe61932a71"; hash = "sha256-BejLZdoBRcqCgoiHWi/vSr2apyxnpZ95tYjN9hj9ox4="; }) (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.58-gfe61932a71"; hash = "sha256-f1a/pHOWs0S5sWsiTRW1KUdqEpA1WVO+d96bdagt0eA="; }) - (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-gca6cec7843"; hash = "sha256-QXW/7e9P4+zw5jj4f+YnWZ2uGPzz9Jk4jVtJGhIj8SY="; }) + (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-g0c0fcee30c"; hash = "sha256-e5CtTT8/66xCtAf3oTuyoHvnWh6zegZYD3A9pHQE7Sc="; }) (fetchNuGet { pname = "ppy.Vk"; version = "1.0.26"; hash = "sha256-YA+U8RhOrGdtw3tlluiv1+M7FIMB0zQMnPVY8ynOxvE="; }) (fetchNuGet { pname = "Realm"; version = "11.5.0"; hash = "sha256-ykC2fyOh4XeRJyLoO3jQQC4sZcFhSms7wswSO6Iu8mQ="; }) (fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.5.0"; hash = "sha256-6QUO6jQC3VwxKsNY24WSgLNtOwcaGjQDtP0S4DSt670="; }) @@ -199,7 +199,7 @@ (fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; hash = "sha256-oNeQKFY4LcTdc3s78WxzODYNylrZmSg3BpMtmOBj6q0="; }) (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.13"; hash = "sha256-CB4681QJaYoL3MCFn4SwgCWxtFf7T/oZQQ6+pLT5oIg="; }) (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.13"; hash = "sha256-xoQQrf8RIeNwx4aZjXDECd2ROZCj3SFk8q+eJ64cu9I="; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; hash = "sha256-zOqHVIInvJiqmx4JF+8USYvdKAGRZVUqQpdncrrjRjM="; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.5"; hash = "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw="; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.8"; hash = "sha256-HGqUUFmkFaS6G/41vZD4xQA9CiATdDRk6ukDGGiEslQ="; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; hash = "sha256-jSI3SIE/HBLEvM+IzhfnAS0QU+JQzIokC/lGLNLvUyU="; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.8"; hash = "sha256-j7004Tk/GyQigot9Sx5cgAU9dzhFfOGs02zaj412x8g="; }) From 558fa6abc6d7ea107003d3be64c7861ec7aa2a1f Mon Sep 17 00:00:00 2001 From: oddlama Date: Sun, 10 Mar 2024 21:32:24 +0100 Subject: [PATCH 267/357] nixos/kanidm: add provisioning of groups, persons and oauth2 systems --- .../manual/release-notes/rl-2411.section.md | 2 + nixos/modules/services/security/kanidm.nix | 414 +++++++++++++- nixos/tests/all-tests.nix | 1 + nixos/tests/kanidm-provisioning.nix | 505 ++++++++++++++++++ nixos/tests/kanidm.nix | 13 +- pkgs/by-name/ka/kanidm/package.nix | 2 +- 6 files changed, 928 insertions(+), 9 deletions(-) create mode 100644 nixos/tests/kanidm-provisioning.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index a40b91d9467e..0e66c8e9825e 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -332,6 +332,8 @@ - `nixosTests` now provide a working IPv6 setup for VLAN 1 by default. +- Kanidm can now be provisioned using the new [`services.kanidm.provision`] option, but requires using a patched version available via `pkgs.kanidm.withSecretProvisioning`. + - To facilitate dependency injection, the `imgui` package now builds a static archive using vcpkg' CMake rules. The derivation now installs "impl" headers selectively instead of by a wildcard. Use `imgui.src` if you just want to access the unpacked sources. diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index 1ab9dac48d47..8cc7e2774fd6 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -62,6 +62,94 @@ let #UMask = "0066"; }; + mkPresentOption = what: + lib.mkOption { + description = "Whether to ensure that this ${what} is present or absent."; + type = lib.types.bool; + default = true; + }; + + filterPresent = lib.filterAttrs (_: v: v.present); + + provisionStateJson = pkgs.writeText "provision-state.json" (builtins.toJSON { + inherit (cfg.provision) groups persons systems; + }); + + # Only recover the admin account if a password should explicitly be provisioned + # for the account. Otherwise it is not needed for provisioning. + maybeRecoverAdmin = lib.optionalString (cfg.provision.adminPasswordFile != null) '' + KANIDM_ADMIN_PASSWORD=$(< ${cfg.provision.adminPasswordFile}) + # We always reset the admin account password if a desired password was specified. + if ! KANIDM_RECOVER_ACCOUNT_PASSWORD=$KANIDM_ADMIN_PASSWORD ${cfg.package}/bin/kanidmd recover-account -c ${serverConfigFile} admin --from-environment >/dev/null; then + echo "Failed to recover admin account" >&2 + exit 1 + fi + ''; + + # Recover the idm_admin account. If a password should explicitly be provisioned + # for the account we set it, otherwise we generate a new one because it is required + # for provisioning. + recoverIdmAdmin = if cfg.provision.idmAdminPasswordFile != null + then '' + KANIDM_IDM_ADMIN_PASSWORD=$(< ${cfg.provision.idmAdminPasswordFile}) + # We always reset the idm_admin account password if a desired password was specified. + if ! KANIDM_RECOVER_ACCOUNT_PASSWORD=$KANIDM_IDM_ADMIN_PASSWORD ${cfg.package}/bin/kanidmd recover-account -c ${serverConfigFile} idm_admin --from-environment >/dev/null; then + echo "Failed to recover idm_admin account" >&2 + exit 1 + fi + '' + else '' + # Recover idm_admin account + if ! recover_out=$(${cfg.package}/bin/kanidmd recover-account -c ${serverConfigFile} idm_admin -o json); then + echo "$recover_out" >&2 + echo "kanidm provision: Failed to recover admin account" >&2 + exit 1 + fi + if ! KANIDM_IDM_ADMIN_PASSWORD=$(grep '{"password' <<< "$recover_out" | ${lib.getExe pkgs.jq} -r .password); then + echo "$recover_out" >&2 + echo "kanidm provision: Failed to parse password for idm_admin account" >&2 + exit 1 + fi + ''; + + postStartScript = pkgs.writeShellScript "post-start" '' + set -euo pipefail + + # Wait for the kanidm server to come online + count=0 + while ! ${lib.getExe pkgs.curl} -L --silent --max-time 1 --connect-timeout 1 --fail \ + ${lib.optionalString cfg.provision.acceptInvalidCerts "--insecure"} \ + ${cfg.provision.instanceUrl} >/dev/null + do + sleep 1 + if [[ "$count" -eq 30 ]]; then + echo "Tried for at least 30 seconds, giving up..." + exit 1 + fi + count=$((count++)) + done + + ${recoverIdmAdmin} + ${maybeRecoverAdmin} + + KANIDM_PROVISION_IDM_ADMIN_TOKEN=$KANIDM_IDM_ADMIN_PASSWORD \ + ${lib.getExe pkgs.kanidm-provision} \ + ${lib.optionalString (!cfg.provision.autoRemove) "--no-auto-remove"} \ + ${lib.optionalString cfg.provision.acceptInvalidCerts "--accept-invalid-certs"} \ + --url "${cfg.provision.instanceUrl}" \ + --state ${provisionStateJson} + ''; + + serverPort = + # ipv6: + if lib.hasInfix "]:" cfg.serverSettings.bindaddress + then lib.last (lib.splitString "]:" cfg.serverSettings.bindaddress) + else + # ipv4: + if lib.hasInfix "." cfg.serverSettings.bindaddress + then lib.last (lib.splitString ":" cfg.serverSettings.bindaddress) + # default is 8443 + else "8443"; in { options.services.kanidm = { @@ -207,10 +295,267 @@ in for possible values. ''; }; + + provision = { + enable = lib.mkEnableOption "provisioning of groups, users and oauth2 resource servers"; + + instanceUrl = lib.mkOption { + description = "The instance url to which the provisioning tool should connect."; + default = "https://localhost:${serverPort}"; + defaultText = ''"https://localhost:"''; + type = lib.types.str; + }; + + acceptInvalidCerts = lib.mkOption { + description = '' + Whether to allow invalid certificates when provisioning the target instance. + By default this is only allowed when the instanceUrl is localhost. This is + dangerous when used with an external URL. + ''; + type = lib.types.bool; + default = lib.hasPrefix "https://localhost:" cfg.provision.instanceUrl; + defaultText = ''lib.hasPrefix "https://localhost:" cfg.provision.instanceUrl''; + }; + + adminPasswordFile = lib.mkOption { + description = "Path to a file containing the admin password for kanidm. Do NOT use a file from the nix store here!"; + example = "/run/secrets/kanidm-admin-password"; + default = null; + type = lib.types.nullOr lib.types.path; + }; + + idmAdminPasswordFile = lib.mkOption { + description = '' + Path to a file containing the idm admin password for kanidm. Do NOT use a file from the nix store here! + If this is not given but provisioning is enabled, the idm_admin password will be reset on each restart. + ''; + example = "/run/secrets/kanidm-idm-admin-password"; + default = null; + type = lib.types.nullOr lib.types.path; + }; + + autoRemove = lib.mkOption { + description = '' + Determines whether deleting an entity in this provisioning config should automatically + cause them to be removed from kanidm, too. This works because the provisioning tool tracks + all entities it has ever created. If this is set to false, you need to explicitly specify + `present = false` to delete an entity. + ''; + type = lib.types.bool; + default = true; + }; + + groups = lib.mkOption { + description = "Provisioning of kanidm groups"; + default = {}; + type = lib.types.attrsOf (lib.types.submodule (groupSubmod: { + options = { + present = mkPresentOption "group"; + + members = lib.mkOption { + description = "List of kanidm entities (persons, groups, ...) which are part of this group."; + type = lib.types.listOf lib.types.str; + apply = lib.unique; + default = []; + }; + }; + config.members = lib.concatLists (lib.flip lib.mapAttrsToList cfg.provision.persons (person: personCfg: + lib.optional (personCfg.present && builtins.elem groupSubmod.config._module.args.name personCfg.groups) person + )); + })); + }; + + persons = lib.mkOption { + description = "Provisioning of kanidm persons"; + default = {}; + type = lib.types.attrsOf (lib.types.submodule { + options = { + present = mkPresentOption "person"; + + displayName = lib.mkOption { + description = "Display name"; + type = lib.types.str; + example = "My User"; + }; + + legalName = lib.mkOption { + description = "Full legal name"; + type = lib.types.nullOr lib.types.str; + example = "Jane Doe"; + default = null; + }; + + mailAddresses = lib.mkOption { + description = "Mail addresses. First given address is considered the primary address."; + type = lib.types.listOf lib.types.str; + example = ["jane.doe@example.com"]; + default = []; + }; + + groups = lib.mkOption { + description = "List of groups this person should belong to."; + type = lib.types.listOf lib.types.str; + apply = lib.unique; + default = []; + }; + }; + }); + }; + + systems.oauth2 = lib.mkOption { + description = "Provisioning of oauth2 resource servers"; + default = {}; + type = lib.types.attrsOf (lib.types.submodule { + options = { + present = mkPresentOption "oauth2 resource server"; + + public = lib.mkOption { + description = "Whether this is a public client (enforces PKCE, doesn't use a basic secret)"; + type = lib.types.bool; + default = false; + }; + + displayName = lib.mkOption { + description = "Display name"; + type = lib.types.str; + example = "Some Service"; + }; + + originUrl = lib.mkOption { + description = "The origin URL of the service. OAuth2 redirects will only be allowed to sites under this origin. Must end with a slash."; + type = lib.types.strMatching ".*://.*/$"; + example = "https://someservice.example.com/"; + }; + + originLanding = lib.mkOption { + description = "When redirecting from the Kanidm Apps Listing page, some linked applications may need to land on a specific page to trigger oauth2/oidc interactions."; + type = lib.types.str; + example = "https://someservice.example.com/home"; + }; + + basicSecretFile = lib.mkOption { + description = '' + The basic secret to use for this service. If null, the random secret generated + by kanidm will not be touched. Do NOT use a path from the nix store here! + ''; + type = lib.types.nullOr lib.types.path; + example = "/run/secrets/some-oauth2-basic-secret"; + default = null; + }; + + enableLocalhostRedirects = lib.mkOption { + description = "Allow localhost redirects. Only for public clients."; + type = lib.types.bool; + default = false; + }; + + enableLegacyCrypto = lib.mkOption { + description = "Enable legacy crypto on this client. Allows JWT signing algorthms like RS256."; + type = lib.types.bool; + default = false; + }; + + allowInsecureClientDisablePkce = lib.mkOption { + description = '' + Disable PKCE on this oauth2 resource server to work around insecure clients + that may not support it. You should request the client to enable PKCE! + Only for non-public clients. + ''; + type = lib.types.bool; + default = false; + }; + + preferShortUsername = lib.mkOption { + description = "Use 'name' instead of 'spn' in the preferred_username claim"; + type = lib.types.bool; + default = false; + }; + + scopeMaps = lib.mkOption { + description = '' + Maps kanidm groups to returned oauth scopes. + See [Scope Relations](https://kanidm.github.io/kanidm/stable/integrations/oauth2.html#scope-relationships) for more information. + ''; + type = lib.types.attrsOf (lib.types.listOf lib.types.str); + default = {}; + }; + + supplementaryScopeMaps = lib.mkOption { + description = '' + Maps kanidm groups to additionally returned oauth scopes. + See [Scope Relations](https://kanidm.github.io/kanidm/stable/integrations/oauth2.html#scope-relationships) for more information. + ''; + type = lib.types.attrsOf (lib.types.listOf lib.types.str); + default = {}; + }; + + removeOrphanedClaimMaps = lib.mkOption { + description = "Whether claim maps not specified here but present in kanidm should be removed from kanidm."; + type = lib.types.bool; + default = true; + }; + + claimMaps = lib.mkOption { + description = '' + Adds additional claims (and values) based on which kanidm groups an authenticating party belongs to. + See [Claim Maps](https://kanidm.github.io/kanidm/master/integrations/oauth2.html#custom-claim-maps) for more information. + ''; + default = {}; + type = lib.types.attrsOf (lib.types.submodule { + options = { + joinType = lib.mkOption { + description = '' + Determines how multiple values are joined to create the claim value. + See [Claim Maps](https://kanidm.github.io/kanidm/master/integrations/oauth2.html#custom-claim-maps) for more information. + ''; + type = lib.types.enum ["array" "csv" "ssv"]; + default = "array"; + }; + + valuesByGroup = lib.mkOption { + description = "Maps kanidm groups to values for the claim."; + default = {}; + type = lib.types.attrsOf (lib.types.listOf lib.types.str); + }; + }; + }); + }; + }; + }); + }; + }; }; config = lib.mkIf (cfg.enableClient || cfg.enableServer || cfg.enablePam) { - assertions = + assertions = let + entityList = type: attrs: lib.flip lib.mapAttrsToList (filterPresent attrs) (name: _: { inherit type name; }); + entities = + entityList "group" cfg.provision.groups + ++ entityList "person" cfg.provision.persons + ++ entityList "oauth2" cfg.provision.systems.oauth2; + + # Accumulate entities by name. Track corresponding entity types for later duplicate check. + entitiesByName = lib.foldl' (acc: { type, name }: + acc // { + ${name} = (acc.${name} or []) ++ [type]; + } + ) {} entities; + + assertGroupsKnown = opt: groups: let + knownGroups = lib.attrNames (filterPresent cfg.provision.groups); + unknownGroups = lib.subtractLists knownGroups groups; + in { + assertion = (cfg.enableServer && cfg.provision.enable) -> unknownGroups == []; + message = "${opt} refers to unknown groups: ${toString unknownGroups}"; + }; + + assertEntitiesKnown = opt: entities: let + unknownEntities = lib.subtractLists (lib.attrNames entitiesByName) entities; + in { + assertion = (cfg.enableServer && cfg.provision.enable) -> unknownEntities == []; + message = "${opt} refers to unknown entities: ${toString unknownEntities}"; + }; + in [ { assertion = !cfg.enableServer || ((cfg.serverSettings.tls_chain or null) == null) || (!lib.isStorePath cfg.serverSettings.tls_chain); @@ -251,7 +596,69 @@ in the instance it follows. ''; } - ]; + { + assertion = cfg.provision.enable -> cfg.enableServer; + message = " requires to be true"; + } + # If any secret is provisioned, the kanidm package must have some required patches applied to it + { + assertion = (cfg.provision.enable && + (cfg.provision.adminPasswordFile != null + || cfg.provision.idmAdminPasswordFile != null + || lib.any (x: x.basicSecretFile != null) (lib.attrValues (filterPresent cfg.provision.systems.oauth2)) + )) -> cfg.package.enableSecretProvisioning; + message = '' + Specifying an admin account password or oauth2 basicSecretFile requires kanidm to be built with the secret provisioning patches. + You may want to set `services.kanidm.package = pkgs.kanidm.withSecretProvisioning;`. + ''; + } + # Entity names must be globally unique: + (let + # Filter all names that occurred in more than one entity type. + duplicateNames = lib.filterAttrs (_: v: builtins.length v > 1) entitiesByName; + in { + assertion = cfg.provision.enable -> duplicateNames == {}; + message = '' + services.kanidm.provision requires all entity names (group, person, oauth2, ...) to be unique! + ${lib.concatLines (lib.mapAttrsToList (name: xs: " - '${name}' used as: ${toString xs}") duplicateNames)}''; + }) + ] + ++ lib.flip lib.mapAttrsToList (filterPresent cfg.provision.persons) (person: personCfg: + assertGroupsKnown "services.kanidm.provision.persons.${person}.groups" personCfg.groups + ) + ++ lib.flip lib.mapAttrsToList (filterPresent cfg.provision.groups) (group: groupCfg: + assertEntitiesKnown "services.kanidm.provision.groups.${group}.members" groupCfg.members + ) + ++ lib.concatLists (lib.flip lib.mapAttrsToList (filterPresent cfg.provision.systems.oauth2) ( + oauth2: oauth2Cfg: + [ + (assertGroupsKnown "services.kanidm.provision.systems.oauth2.${oauth2}.scopeMaps" (lib.attrNames oauth2Cfg.scopeMaps)) + (assertGroupsKnown "services.kanidm.provision.systems.oauth2.${oauth2}.supplementaryScopeMaps" (lib.attrNames oauth2Cfg.supplementaryScopeMaps)) + ] + ++ lib.concatLists (lib.flip lib.mapAttrsToList oauth2Cfg.claimMaps (claim: claimCfg: [ + (assertGroupsKnown "services.kanidm.provision.systems.oauth2.${oauth2}.claimMaps.${claim}.valuesByGroup" (lib.attrNames claimCfg.valuesByGroup)) + # At least one group must map to a value in each claim map + { + assertion = (cfg.provision.enable && cfg.enableServer) -> lib.any (xs: xs != []) (lib.attrValues claimCfg.valuesByGroup); + message = "services.kanidm.provision.systems.oauth2.${oauth2}.claimMaps.${claim} does not specify any values for any group"; + } + # Public clients cannot define a basic secret + { + assertion = (cfg.provision.enable && cfg.enableServer && oauth2Cfg.public) -> oauth2Cfg.basicSecretFile == null; + message = "services.kanidm.provision.systems.oauth2.${oauth2} is a public client and thus cannot specify a basic secret"; + } + # Public clients cannot disable PKCE + { + assertion = (cfg.provision.enable && cfg.enableServer && oauth2Cfg.public) -> !oauth2Cfg.allowInsecureClientDisablePkce; + message = "services.kanidm.provision.systems.oauth2.${oauth2} is a public client and thus cannot disable PKCE"; + } + # Non-public clients cannot enable localhost redirects + { + assertion = (cfg.provision.enable && cfg.enableServer && !oauth2Cfg.public) -> !oauth2Cfg.enableLocalhostRedirects; + message = "services.kanidm.provision.systems.oauth2.${oauth2} is a non-public client and thus cannot enable localhost redirects"; + } + ])) + )); environment.systemPackages = lib.mkIf cfg.enableClient [ cfg.package ]; @@ -277,6 +684,7 @@ in StateDirectoryMode = "0700"; RuntimeDirectory = "kanidmd"; ExecStart = "${cfg.package}/bin/kanidmd server -c ${serverConfigFile}"; + ExecStartPost = lib.mkIf cfg.provision.enable postStartScript; User = "kanidm"; Group = "kanidm"; @@ -419,6 +827,6 @@ in ]; }; - meta.maintainers = with lib.maintainers; [ erictapen Flakebi ]; + meta.maintainers = with lib.maintainers; [ erictapen Flakebi oddlama ]; meta.buildDocsInSandbox = false; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 41e0e07da82a..12b19700458b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -484,6 +484,7 @@ in { k3s = handleTest ./k3s {}; kafka = handleTest ./kafka.nix {}; kanidm = handleTest ./kanidm.nix {}; + kanidm-provisioning = handleTest ./kanidm-provisioning.nix {}; karma = handleTest ./karma.nix {}; kavita = handleTest ./kavita.nix {}; kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {}; diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix new file mode 100644 index 000000000000..c96e9647b411 --- /dev/null +++ b/nixos/tests/kanidm-provisioning.nix @@ -0,0 +1,505 @@ +import ./make-test-python.nix ( + { pkgs, ... }: + let + certs = import ./common/acme/server/snakeoil-certs.nix; + serverDomain = certs.domain; + + provisionAdminPassword = "very-strong-password-for-admin"; + provisionIdmAdminPassword = "very-strong-password-for-idm-admin"; + provisionIdmAdminPassword2 = "very-strong-alternative-password-for-idm-admin"; + in + { + name = "kanidm-provisioning"; + meta.maintainers = with pkgs.lib.maintainers; [ oddlama ]; + + nodes.provision = + { pkgs, lib, ... }: + { + services.kanidm = { + package = pkgs.kanidm.withSecretProvisioning; + enableServer = true; + serverSettings = { + origin = "https://${serverDomain}"; + domain = serverDomain; + bindaddress = "[::]:443"; + ldapbindaddress = "[::1]:636"; + tls_chain = certs."${serverDomain}".cert; + tls_key = certs."${serverDomain}".key; + }; + # So we can check whether provisioning did what we wanted + enableClient = true; + clientSettings = { + uri = "https://${serverDomain}"; + verify_ca = true; + verify_hostnames = true; + }; + }; + + specialisation.credentialProvision.configuration = + { ... }: + { + services.kanidm.provision = lib.mkForce { + enable = true; + adminPasswordFile = pkgs.writeText "admin-pw" provisionAdminPassword; + idmAdminPasswordFile = pkgs.writeText "idm-admin-pw" provisionIdmAdminPassword; + }; + }; + + specialisation.changedCredential.configuration = + { ... }: + { + services.kanidm.provision = lib.mkForce { + enable = true; + idmAdminPasswordFile = pkgs.writeText "idm-admin-pw" provisionIdmAdminPassword2; + }; + }; + + specialisation.addEntities.configuration = + { ... }: + { + services.kanidm.provision = lib.mkForce { + enable = true; + # Test whether credential recovery works without specific idmAdmin password + #idmAdminPasswordFile = + + groups.supergroup1 = { + members = [ "testgroup1" ]; + }; + + groups.testgroup1 = { }; + + persons.testuser1 = { + displayName = "Test User"; + legalName = "Jane Doe"; + mailAddresses = [ "jane.doe@example.com" ]; + groups = [ + "testgroup1" + "service1-access" + ]; + }; + + persons.testuser2 = { + displayName = "Powerful Test User"; + legalName = "Ryouiki Tenkai"; + groups = [ "service1-admin" ]; + }; + + groups.service1-access = { }; + groups.service1-admin = { }; + systems.oauth2.service1 = { + displayName = "Service One"; + originUrl = "https://one.example.com/"; + originLanding = "https://one.example.com/landing"; + basicSecretFile = pkgs.writeText "bs-service1" "very-strong-secret-for-service1"; + scopeMaps.service1-access = [ + "openid" + "email" + "profile" + ]; + supplementaryScopeMaps.service1-admin = [ "admin" ]; + claimMaps.groups = { + valuesByGroup.service1-admin = [ "admin" ]; + }; + }; + + systems.oauth2.service2 = { + displayName = "Service Two"; + originUrl = "https://two.example.com/"; + originLanding = "https://landing2.example.com/"; + # Test not setting secret + # basicSecretFile = + allowInsecureClientDisablePkce = true; + preferShortUsername = true; + }; + }; + }; + + specialisation.changeAttributes.configuration = + { ... }: + { + services.kanidm.provision = lib.mkForce { + enable = true; + # Changing admin credentials at any time should not be a problem: + idmAdminPasswordFile = pkgs.writeText "idm-admin-pw" provisionIdmAdminPassword; + + groups.supergroup1 = { + #members = ["testgroup1"]; + }; + + groups.testgroup1 = { }; + + persons.testuser1 = { + displayName = "Test User (changed)"; + legalName = "Jane Doe (changed)"; + mailAddresses = [ + "jane.doe@example.com" + "second.doe@example.com" + ]; + groups = [ + #"testgroup1" + "service1-access" + ]; + }; + + persons.testuser2 = { + displayName = "Powerful Test User (changed)"; + legalName = "Ryouiki Tenkai (changed)"; + groups = [ "service1-admin" ]; + }; + + groups.service1-access = { }; + groups.service1-admin = { }; + systems.oauth2.service1 = { + displayName = "Service One (changed)"; + originUrl = "https://changed-one.example.com/"; + originLanding = "https://changed-one.example.com/landing-changed"; + basicSecretFile = pkgs.writeText "bs-service1" "changed-very-strong-secret-for-service1"; + scopeMaps.service1-access = [ + "openid" + "email" + #"profile" + ]; + supplementaryScopeMaps.service1-admin = [ "adminchanged" ]; + claimMaps.groups = { + valuesByGroup.service1-admin = [ "adminchanged" ]; + }; + }; + + systems.oauth2.service2 = { + displayName = "Service Two (changed)"; + originUrl = "https://changed-two.example.com/"; + originLanding = "https://changed-landing2.example.com/"; + # Test not setting secret + # basicSecretFile = + allowInsecureClientDisablePkce = false; + preferShortUsername = false; + }; + }; + }; + + specialisation.removeAttributes.configuration = + { ... }: + { + services.kanidm.provision = lib.mkForce { + enable = true; + idmAdminPasswordFile = pkgs.writeText "idm-admin-pw" provisionIdmAdminPassword; + + groups.supergroup1 = { }; + + persons.testuser1 = { + displayName = "Test User (changed)"; + }; + + persons.testuser2 = { + displayName = "Powerful Test User (changed)"; + groups = [ "service1-admin" ]; + }; + + groups.service1-access = { }; + groups.service1-admin = { }; + systems.oauth2.service1 = { + displayName = "Service One (changed)"; + originUrl = "https://changed-one.example.com/"; + originLanding = "https://changed-one.example.com/landing-changed"; + basicSecretFile = pkgs.writeText "bs-service1" "changed-very-strong-secret-for-service1"; + # Removing maps requires setting them to the empty list + scopeMaps.service1-access = [ ]; + supplementaryScopeMaps.service1-admin = [ ]; + }; + + systems.oauth2.service2 = { + displayName = "Service Two (changed)"; + originUrl = "https://changed-two.example.com/"; + originLanding = "https://changed-landing2.example.com/"; + }; + }; + }; + + specialisation.removeEntities.configuration = + { ... }: + { + services.kanidm.provision = lib.mkForce { + enable = true; + idmAdminPasswordFile = pkgs.writeText "idm-admin-pw" provisionIdmAdminPassword; + }; + }; + + security.pki.certificateFiles = [ certs.ca.cert ]; + + networking.hosts."::1" = [ serverDomain ]; + networking.firewall.allowedTCPPorts = [ 443 ]; + + users.users.kanidm.shell = pkgs.bashInteractive; + + environment.systemPackages = with pkgs; [ + kanidm + openldap + ripgrep + jq + ]; + }; + + testScript = + { nodes, ... }: + let + # We need access to the config file in the test script. + filteredConfig = pkgs.lib.converge (pkgs.lib.filterAttrsRecursive ( + _: v: v != null + )) nodes.provision.services.kanidm.serverSettings; + serverConfigFile = (pkgs.formats.toml { }).generate "server.toml" filteredConfig; + + specialisations = "${nodes.provision.system.build.toplevel}/specialisation"; + in + '' + import re + + def assert_contains(haystack, needle): + if needle not in haystack: + print("The haystack that will cause the following exception is:") + print("---") + print(haystack) + print("---") + raise Exception(f"Expected string '{needle}' was not found") + + def assert_matches(haystack, expr): + if not re.search(expr, haystack): + print("The haystack that will cause the following exception is:") + print("---") + print(haystack) + print("---") + raise Exception(f"Expected regex '{expr}' did not match") + + def assert_lacks(haystack, needle): + if needle in haystack: + print("The haystack that will cause the following exception is:") + print("---") + print(haystack, end="") + print("---") + raise Exception(f"Unexpected string '{needle}' was found") + + provision.start() + + def provision_login(pw): + provision.wait_for_unit("kanidm.service") + provision.wait_until_succeeds("curl -Lsf https://${serverDomain} | grep Kanidm") + if pw is None: + pw = provision.succeed("su - kanidm -c 'kanidmd recover-account -c ${serverConfigFile} idm_admin 2>&1 | rg -o \'[A-Za-z0-9]{48}\' '").strip().removeprefix("'").removesuffix("'") + out = provision.succeed(f"KANIDM_PASSWORD={pw} kanidm login -D idm_admin") + assert_contains(out, "Login Success for idm_admin") + + with subtest("Test Provisioning - setup"): + provision_login(None) + provision.succeed("kanidm logout -D idm_admin") + + with subtest("Test Provisioning - credentialProvision"): + provision.succeed('${specialisations}/credentialProvision/bin/switch-to-configuration test') + provision_login("${provisionIdmAdminPassword}") + + # Test provisioned admin pw + out = provision.succeed("KANIDM_PASSWORD=${provisionAdminPassword} kanidm login -D admin") + assert_contains(out, "Login Success for admin") + provision.succeed("kanidm logout -D admin") + provision.succeed("kanidm logout -D idm_admin") + + with subtest("Test Provisioning - changedCredential"): + provision.succeed('${specialisations}/changedCredential/bin/switch-to-configuration test') + provision_login("${provisionIdmAdminPassword2}") + provision.succeed("kanidm logout -D idm_admin") + + with subtest("Test Provisioning - addEntities"): + provision.succeed('${specialisations}/addEntities/bin/switch-to-configuration test') + # Unspecified idm admin password + provision_login(None) + + out = provision.succeed("kanidm group get testgroup1") + assert_contains(out, "name: testgroup1") + + out = provision.succeed("kanidm group get supergroup1") + assert_contains(out, "name: supergroup1") + assert_contains(out, "member: testgroup1") + + out = provision.succeed("kanidm person get testuser1") + assert_contains(out, "name: testuser1") + assert_contains(out, "displayname: Test User") + assert_contains(out, "legalname: Jane Doe") + assert_contains(out, "mail: jane.doe@example.com") + assert_contains(out, "memberof: testgroup1") + assert_contains(out, "memberof: service1-access") + + out = provision.succeed("kanidm person get testuser2") + assert_contains(out, "name: testuser2") + assert_contains(out, "displayname: Powerful Test User") + assert_contains(out, "legalname: Ryouiki Tenkai") + assert_contains(out, "memberof: service1-admin") + assert_lacks(out, "mail:") + + out = provision.succeed("kanidm group get service1-access") + assert_contains(out, "name: service1-access") + + out = provision.succeed("kanidm group get service1-admin") + assert_contains(out, "name: service1-admin") + + out = provision.succeed("kanidm system oauth2 get service1") + assert_contains(out, "name: service1") + assert_contains(out, "displayname: Service One") + assert_contains(out, "oauth2_rs_origin: https://one.example.com/") + assert_contains(out, "oauth2_rs_origin_landing: https://one.example.com/landing") + assert_matches(out, 'oauth2_rs_scope_map: service1-access.*{"email", "openid", "profile"}') + assert_matches(out, 'oauth2_rs_sup_scope_map: service1-admin.*{"admin"}') + assert_matches(out, 'oauth2_rs_claim_map: groups:.*"admin"') + + out = provision.succeed("kanidm system oauth2 show-basic-secret service1") + assert_contains(out, "very-strong-secret-for-service1") + + out = provision.succeed("kanidm system oauth2 get service2") + assert_contains(out, "name: service2") + assert_contains(out, "displayname: Service Two") + assert_contains(out, "oauth2_rs_origin: https://two.example.com/") + assert_contains(out, "oauth2_rs_origin_landing: https://landing2.example.com/") + assert_contains(out, "oauth2_allow_insecure_client_disable_pkce: true") + assert_contains(out, "oauth2_prefer_short_username: true") + + provision.succeed("kanidm logout -D idm_admin") + + with subtest("Test Provisioning - changeAttributes"): + provision.succeed('${specialisations}/changeAttributes/bin/switch-to-configuration test') + provision_login("${provisionIdmAdminPassword}") + + out = provision.succeed("kanidm group get testgroup1") + assert_contains(out, "name: testgroup1") + + out = provision.succeed("kanidm group get supergroup1") + assert_contains(out, "name: supergroup1") + assert_lacks(out, "member: testgroup1") + + out = provision.succeed("kanidm person get testuser1") + assert_contains(out, "name: testuser1") + assert_contains(out, "displayname: Test User (changed)") + assert_contains(out, "legalname: Jane Doe (changed)") + assert_contains(out, "mail: jane.doe@example.com") + assert_contains(out, "mail: second.doe@example.com") + assert_lacks(out, "memberof: testgroup1") + assert_contains(out, "memberof: service1-access") + + out = provision.succeed("kanidm person get testuser2") + assert_contains(out, "name: testuser2") + assert_contains(out, "displayname: Powerful Test User (changed)") + assert_contains(out, "legalname: Ryouiki Tenkai (changed)") + assert_contains(out, "memberof: service1-admin") + assert_lacks(out, "mail:") + + out = provision.succeed("kanidm group get service1-access") + assert_contains(out, "name: service1-access") + + out = provision.succeed("kanidm group get service1-admin") + assert_contains(out, "name: service1-admin") + + out = provision.succeed("kanidm system oauth2 get service1") + assert_contains(out, "name: service1") + assert_contains(out, "displayname: Service One (changed)") + assert_contains(out, "oauth2_rs_origin: https://changed-one.example.com/") + assert_contains(out, "oauth2_rs_origin_landing: https://changed-one.example.com/landing") + assert_matches(out, 'oauth2_rs_scope_map: service1-access.*{"email", "openid"}') + assert_matches(out, 'oauth2_rs_sup_scope_map: service1-admin.*{"adminchanged"}') + assert_matches(out, 'oauth2_rs_claim_map: groups:.*"adminchanged"') + + out = provision.succeed("kanidm system oauth2 show-basic-secret service1") + assert_contains(out, "changed-very-strong-secret-for-service1") + + out = provision.succeed("kanidm system oauth2 get service2") + assert_contains(out, "name: service2") + assert_contains(out, "displayname: Service Two (changed)") + assert_contains(out, "oauth2_rs_origin: https://changed-two.example.com/") + assert_contains(out, "oauth2_rs_origin_landing: https://changed-landing2.example.com/") + assert_lacks(out, "oauth2_allow_insecure_client_disable_pkce: true") + assert_lacks(out, "oauth2_prefer_short_username: true") + + provision.succeed("kanidm logout -D idm_admin") + + with subtest("Test Provisioning - removeAttributes"): + provision.succeed('${specialisations}/removeAttributes/bin/switch-to-configuration test') + provision_login("${provisionIdmAdminPassword}") + + out = provision.succeed("kanidm group get testgroup1") + assert_lacks(out, "name: testgroup1") + + out = provision.succeed("kanidm group get supergroup1") + assert_contains(out, "name: supergroup1") + assert_lacks(out, "member: testgroup1") + + out = provision.succeed("kanidm person get testuser1") + assert_contains(out, "name: testuser1") + assert_contains(out, "displayname: Test User (changed)") + assert_lacks(out, "legalname: Jane Doe (changed)") + assert_lacks(out, "mail: jane.doe@example.com") + assert_lacks(out, "mail: second.doe@example.com") + assert_lacks(out, "memberof: testgroup1") + assert_lacks(out, "memberof: service1-access") + + out = provision.succeed("kanidm person get testuser2") + assert_contains(out, "name: testuser2") + assert_contains(out, "displayname: Powerful Test User (changed)") + assert_lacks(out, "legalname: Ryouiki Tenkai (changed)") + assert_contains(out, "memberof: service1-admin") + assert_lacks(out, "mail:") + + out = provision.succeed("kanidm group get service1-access") + assert_contains(out, "name: service1-access") + + out = provision.succeed("kanidm group get service1-admin") + assert_contains(out, "name: service1-admin") + + out = provision.succeed("kanidm system oauth2 get service1") + assert_contains(out, "name: service1") + assert_contains(out, "displayname: Service One (changed)") + assert_contains(out, "oauth2_rs_origin: https://changed-one.example.com/") + assert_contains(out, "oauth2_rs_origin_landing: https://changed-one.example.com/landing") + assert_lacks(out, "oauth2_rs_scope_map") + assert_lacks(out, "oauth2_rs_sup_scope_map") + assert_lacks(out, "oauth2_rs_claim_map") + + out = provision.succeed("kanidm system oauth2 show-basic-secret service1") + assert_contains(out, "changed-very-strong-secret-for-service1") + + out = provision.succeed("kanidm system oauth2 get service2") + assert_contains(out, "name: service2") + assert_contains(out, "displayname: Service Two (changed)") + assert_contains(out, "oauth2_rs_origin: https://changed-two.example.com/") + assert_contains(out, "oauth2_rs_origin_landing: https://changed-landing2.example.com/") + assert_lacks(out, "oauth2_allow_insecure_client_disable_pkce: true") + assert_lacks(out, "oauth2_prefer_short_username: true") + + provision.succeed("kanidm logout -D idm_admin") + + with subtest("Test Provisioning - removeEntities"): + provision.succeed('${specialisations}/removeEntities/bin/switch-to-configuration test') + provision_login("${provisionIdmAdminPassword}") + + out = provision.succeed("kanidm group get testgroup1") + assert_lacks(out, "name: testgroup1") + + out = provision.succeed("kanidm group get supergroup1") + assert_lacks(out, "name: supergroup1") + + out = provision.succeed("kanidm person get testuser1") + assert_lacks(out, "name: testuser1") + + out = provision.succeed("kanidm person get testuser2") + assert_lacks(out, "name: testuser2") + + out = provision.succeed("kanidm group get service1-access") + assert_lacks(out, "name: service1-access") + + out = provision.succeed("kanidm group get service1-admin") + assert_lacks(out, "name: service1-admin") + + out = provision.succeed("kanidm system oauth2 get service1") + assert_lacks(out, "name: service1") + + out = provision.succeed("kanidm system oauth2 get service2") + assert_lacks(out, "name: service2") + + provision.succeed("kanidm logout -D idm_admin") + ''; + } +) diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix index 8ed9af63f1d4..a2f4b98a728c 100644 --- a/nixos/tests/kanidm.nix +++ b/nixos/tests/kanidm.nix @@ -9,9 +9,9 @@ import ./make-test-python.nix ({ pkgs, ... }: in { name = "kanidm"; - meta.maintainers = with pkgs.lib.maintainers; [ erictapen Flakebi ]; + meta.maintainers = with pkgs.lib.maintainers; [ erictapen Flakebi oddlama ]; - nodes.server = { config, pkgs, lib, ... }: { + nodes.server = { pkgs, ... }: { services.kanidm = { enableServer = true; serverSettings = { @@ -34,7 +34,7 @@ import ./make-test-python.nix ({ pkgs, ... }: environment.systemPackages = with pkgs; [ kanidm openldap ripgrep ]; }; - nodes.client = { pkgs, nodes, ... }: { + nodes.client = { nodes, ... }: { services.kanidm = { enableClient = true; clientSettings = { @@ -62,10 +62,10 @@ import ./make-test-python.nix ({ pkgs, ... }: (pkgs.lib.filterAttrsRecursive (_: v: v != null)) nodes.server.services.kanidm.serverSettings; serverConfigFile = (pkgs.formats.toml { }).generate "server.toml" filteredConfig; - in '' - start_all() + server.start() + client.start() server.wait_for_unit("kanidm.service") client.systemctl("start network-online.target") client.wait_for_unit("network-online.target") @@ -122,5 +122,8 @@ import ./make-test-python.nix ({ pkgs, ... }: client.wait_until_succeeds("systemctl is-active user@$(id -u testuser).service") client.send_chars("touch done\n") client.wait_for_file("/home/testuser@${serverDomain}/done") + + server.shutdown() + client.shutdown() ''; }) diff --git a/pkgs/by-name/ka/kanidm/package.nix b/pkgs/by-name/ka/kanidm/package.nix index cc80eb99ada3..dc032583ae07 100644 --- a/pkgs/by-name/ka/kanidm/package.nix +++ b/pkgs/by-name/ka/kanidm/package.nix @@ -107,7 +107,7 @@ rustPlatform.buildRustPackage rec { passthru = { tests = { - inherit (nixosTests) kanidm; + inherit (nixosTests) kanidm kanidm-provisioning; }; updateScript = nix-update-script { }; From 9a31181342b6f4c0855c0fb3af2bcfc14206e3eb Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Fri, 16 Aug 2024 21:26:41 +0800 Subject: [PATCH 268/357] dmlive: 5.3.2 -> 5.5.4 diff: https://github.com/THMonster/dmlive/compare/3736d83ac0920de78ac82fe331bc6b16dc72b5cd...688ddda12ed70a7ad25ede63e948e1cba143a307 --- pkgs/applications/video/dmlive/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/dmlive/default.nix b/pkgs/applications/video/dmlive/default.nix index 03affd1e00a7..db34d1da2749 100644 --- a/pkgs/applications/video/dmlive/default.nix +++ b/pkgs/applications/video/dmlive/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "dmlive"; - version = "5.3.2"; + version = "5.5.4"; src = fetchFromGitHub { owner = "THMonster"; repo = pname; - rev = "3736d83ac0920de78ac82fe331bc6b16dc72b5cd"; # no tag - hash = "sha256-3agUeAv6Nespn6GNw4wmy8HNPQ0VIgZAMnKiV/myKbA="; + rev = "688ddda12ed70a7ad25ede63e948e1cba143a307"; # no tag + hash = "sha256-M7IZ2UzusWovyhigyUXasmSEz4J79gnFyivHVUqfUKg="; }; - cargoHash = "sha256-MxkWaEn/gMMOuje7lu7PlqsQjnF0LWpV9JzmFBG1ukU="; + cargoHash = "sha256-d3vI2iv2Db1XZQc3uaNfkUpDyNKPvHkb/0zEwRTOWZ0="; OPENSSL_NO_VENDOR = true; From 017aad7fad27ebf1b9313acdc67c33d275f0caff Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Sat, 13 Jul 2024 02:00:21 +0200 Subject: [PATCH 269/357] gruvbox-gtk-theme: 0-unstable-2024-06-27 -> 0-unstable-2024-07-22 --- pkgs/by-name/gr/gruvbox-gtk-theme/package.nix | 136 +++++++++++++----- 1 file changed, 98 insertions(+), 38 deletions(-) diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix index f567da088067..f9c85dbcf6e9 100644 --- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix +++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix @@ -5,7 +5,12 @@ sassc, gnome-themes-extra, gtk-engine-murrine, - colorVariants ? [] # default: install all icons + unstableGitUpdater, + colorVariants ? [ ], + sizeVariants ? [ ], + themeVariants ? [ ], + tweakVariants ? [ ], + iconVariants ? [ ], }: let @@ -14,49 +19,104 @@ let "dark" "light" ]; - + sizeVariantList = [ + "compact" + "standard" + ]; + themeVariantList = [ + "default" + "green" + "grey" + "orange" + "pink" + "purple" + "red" + "teal" + "yellow" + "all" + ]; + tweakVariantList = [ + "medium" + "soft" + "black" + "float" + "outline" + "macos" + ]; + iconVariantList = [ + "Dark" + "Light" + ]; in -lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants +lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib.checkListOfEnum + "${pname}: sizeVariants" + sizeVariantList + sizeVariants + lib.checkListOfEnum + "${pname}: themeVariants" + themeVariantList + themeVariants + lib.checkListOfEnum + "${pname}: tweakVariants" + tweakVariantList + tweakVariants + lib.checkListOfEnum + "${pname}: iconVariants" + iconVariantList + iconVariants -stdenvNoCC.mkDerivation { - inherit pname; - version = "0-unstable-2024-06-27"; + stdenvNoCC.mkDerivation + { + inherit pname; + version = "0-unstable-2024-07-22"; - src = fetchFromGitHub { - owner = "Fausto-Korpsvart"; - repo = "Gruvbox-GTK-Theme"; - rev = "f568ccd7bf7570d8a27feb62e318b07b88e24b94"; - hash = "sha256-4vGwPggHdNjtQ03UFgN4OH5+ZEkdIlivCdYuZ0Dsd5Q="; - }; + src = fetchFromGitHub { + owner = "Fausto-Korpsvart"; + repo = "Gruvbox-GTK-Theme"; + rev = "f14a99e1369a6348a4ecd4a5b2d9c067b83f7b2a"; + hash = "sha256-WuZX2A5nLk8vMlK0ZlDlbeb79wCCWrGUf2CbqfnbUzk="; + }; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - nativeBuildInputs = [ sassc ]; - buildInputs = [ gnome-themes-extra ]; + nativeBuildInputs = [ sassc ]; + buildInputs = [ gnome-themes-extra ]; - dontBuild = true; + dontBuild = true; - postPatch = '' - patchShebangs themes/install.sh - ''; + passthru.updateScript = unstableGitUpdater { }; - installPhase = '' - runHook preInstall - mkdir -p $out/share/themes - cd themes - ./install.sh -n Gruvbox -c ${lib.concatStringsSep " " (if colorVariants != [] then colorVariants else colorVariantList)} --tweaks macos -d "$out/share/themes" - runHook postInstall - ''; + postPatch = '' + patchShebangs themes/install.sh + ''; - meta = { - description = "GTK theme based on the Gruvbox colour palette"; - homepage = "https://github.com/Fausto-Korpsvart/Gruvbox-GTK-Theme"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ - luftmensch-luftmensch - math-42 - d3vil0p3r - ]; - }; -} + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cd themes + ./install.sh -n Gruvbox \ + ${lib.optionalString (colorVariants != [ ]) "-c " + toString colorVariants} \ + ${lib.optionalString (sizeVariants != [ ]) "-s " + toString sizeVariants} \ + ${lib.optionalString (themeVariants != [ ]) "-t " + toString themeVariants} \ + ${lib.optionalString (tweakVariants != [ ]) "--tweaks " + toString tweakVariants} \ + -d "$out/share/themes" + cd ../icons + ${lib.optionalString (iconVariants != [ ]) '' + mkdir -p $out/share/icons + cp -a ${toString (map (v: "Gruvbox-${v}") iconVariants)} $out/share/icons/ + ''} + runHook postInstall + ''; + + meta = { + description = "GTK theme based on the Gruvbox colour palette"; + homepage = "https://github.com/Fausto-Korpsvart/Gruvbox-GTK-Theme"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + math-42 + d3vil0p3r + ]; + }; + } From e3a2b9da87fc4650d9e6d053b80f78739083c979 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:01:58 +0200 Subject: [PATCH 270/357] xcpc: remove 'with lib;' --- pkgs/applications/emulators/xcpc/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/xcpc/default.nix b/pkgs/applications/emulators/xcpc/default.nix index d2d946c400fd..d5a2a6a50fe1 100644 --- a/pkgs/applications/emulators/xcpc/default.nix +++ b/pkgs/applications/emulators/xcpc/default.nix @@ -3,7 +3,6 @@ , motifSupport ? false, lesstif }: -with lib; stdenv.mkDerivation rec { version = "20070122"; pname = "xcpc"; @@ -16,10 +15,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libdsk libXaw libX11 libXext ] - ++ optional libDSKSupport libdsk - ++ optional motifSupport lesstif; + ++ lib.optional libDSKSupport libdsk + ++ lib.optional motifSupport lesstif; - meta = { + meta = with lib; { description = "Portable Amstrad CPC 464/664/6128 emulator written in C"; homepage = "https://www.xcpc-emulator.net"; license = licenses.gpl2Plus; From afd41917e41ee5a83a7b6291c0e08e6c3522ad58 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:02:08 +0200 Subject: [PATCH 271/357] noice: remove 'with lib;' --- pkgs/applications/file-managers/noice/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/file-managers/noice/default.nix b/pkgs/applications/file-managers/noice/default.nix index d41c12faad8d..7421a3816d29 100644 --- a/pkgs/applications/file-managers/noice/default.nix +++ b/pkgs/applications/file-managers/noice/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchgit, ncurses, conf ? null }: -with lib; - stdenv.mkDerivation rec { pname = "noice"; version = "0.8"; @@ -18,8 +16,8 @@ stdenv.mkDerivation rec { substituteInPlace noice.c --replace 'printw(str);' 'printw("%s", str);' ''; - configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf); - preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + configFile = lib.optionalString (conf!=null) (builtins.toFile "config.def.h" conf); + preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h"; buildInputs = [ ncurses ]; @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; - meta = { + meta = with lib; { description = "Small ncurses-based file browser"; homepage = "https://git.2f30.org/noice/"; license = licenses.bsd2; From 3b193a7841574df181db5f8f0fc211ca97409a04 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:02:20 +0200 Subject: [PATCH 272/357] figma-linux: remove 'with lib;' --- pkgs/applications/graphics/figma-linux/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/figma-linux/default.nix b/pkgs/applications/graphics/figma-linux/default.nix index 72f5ed882c40..159dcd85b801 100644 --- a/pkgs/applications/graphics/figma-linux/default.nix +++ b/pkgs/applications/graphics/figma-linux/default.nix @@ -8,7 +8,6 @@ , wrapGAppsHook3 , ... }: -with lib; stdenv.mkDerivation (finalAttrs: { pname = "figma-linux"; version = "0.11.4"; @@ -82,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "Exec=/opt/figma-linux/figma-linux" "Exec=$out/bin/${finalAttrs.pname}" ''; - meta = { + meta = with lib; { description = "Unofficial Electron-based Figma desktop app for Linux"; homepage = "https://github.com/Figma-Linux/figma-linux"; platforms = [ "x86_64-linux" ]; From ec71a11431c2d21935d8432a0aef016870235328 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:02:39 +0200 Subject: [PATCH 273/357] gscan2pdf: remove 'with lib;' --- pkgs/applications/graphics/gscan2pdf/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 915a9966ef2c..62acb1713c17 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -6,8 +6,6 @@ # test dependencies xvfb-run, liberation_ttf, file, tesseract }: -with lib; - perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; version = "2.13.3"; @@ -132,7 +130,7 @@ perlPackages.buildPerlPackage rec { make test ''; - meta = { + meta = with lib; { description = "GUI to produce PDFs or DjVus from scanned documents"; homepage = "https://gscan2pdf.sourceforge.net/"; license = licenses.gpl3; From 78e434a4ac1554f1d14c7df03145303f5b5debef Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:02:52 +0200 Subject: [PATCH 274/357] image_optim: remove 'with lib;' --- .../graphics/image_optim/default.nix | 52 +++++++++---------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/graphics/image_optim/default.nix b/pkgs/applications/graphics/image_optim/default.nix index 1d9048cafaa6..feceb00c31e8 100644 --- a/pkgs/applications/graphics/image_optim/default.nix +++ b/pkgs/applications/graphics/image_optim/default.nix @@ -13,34 +13,32 @@ withSvgo ? true, svgo }: -with lib; - let - optionalDepsPath = optional withPngcrush pngcrush - ++ optional withPngout pngout - ++ optional withAdvpng advancecomp - ++ optional withOptipng optipng - ++ optional withPngquant pngquant - ++ optional withOxipng oxipng - ++ optional withJhead jhead - ++ optional withJpegoptim jpegoptim - ++ optional withJpegrecompress jpeg-archive - ++ optional withJpegtran libjpeg - ++ optional withGifsicle gifsicle - ++ optional withSvgo svgo; + optionalDepsPath = lib.optional withPngcrush pngcrush + ++ lib.optional withPngout pngout + ++ lib.optional withAdvpng advancecomp + ++ lib.optional withOptipng optipng + ++ lib.optional withPngquant pngquant + ++ lib.optional withOxipng oxipng + ++ lib.optional withJhead jhead + ++ lib.optional withJpegoptim jpegoptim + ++ lib.optional withJpegrecompress jpeg-archive + ++ lib.optional withJpegtran libjpeg + ++ lib.optional withGifsicle gifsicle + ++ lib.optional withSvgo svgo; - disabledWorkersFlags = optional (!withPngcrush) "--no-pngcrush" - ++ optional (!withPngout) "--no-pngout" - ++ optional (!withAdvpng) "--no-advpng" - ++ optional (!withOptipng) "--no-optipng" - ++ optional (!withPngquant) "--no-pngquant" - ++ optional (!withOxipng) "--no-oxipng" - ++ optional (!withJhead) "--no-jhead" - ++ optional (!withJpegoptim) "--no-jpegoptim" - ++ optional (!withJpegrecompress) "--no-jpegrecompress" - ++ optional (!withJpegtran) "--no-jpegtran" - ++ optional (!withGifsicle) "--no-gifsicle" - ++ optional (!withSvgo) "--no-svgo"; + disabledWorkersFlags = lib.optional (!withPngcrush) "--no-pngcrush" + ++ lib.optional (!withPngout) "--no-pngout" + ++ lib.optional (!withAdvpng) "--no-advpng" + ++ lib.optional (!withOptipng) "--no-optipng" + ++ lib.optional (!withPngquant) "--no-pngquant" + ++ lib.optional (!withOxipng) "--no-oxipng" + ++ lib.optional (!withJhead) "--no-jhead" + ++ lib.optional (!withJpegoptim) "--no-jpegoptim" + ++ lib.optional (!withJpegrecompress) "--no-jpegrecompress" + ++ lib.optional (!withJpegtran) "--no-jpegtran" + ++ lib.optional (!withGifsicle) "--no-gifsicle" + ++ lib.optional (!withSvgo) "--no-svgo"; in bundlerApp { @@ -53,7 +51,7 @@ bundlerApp { postBuild = '' wrapProgram $out/bin/image_optim \ - --prefix PATH : ${lib.escapeShellArg (makeBinPath optionalDepsPath)} \ + --prefix PATH : ${lib.escapeShellArg (lib.makeBinPath optionalDepsPath)} \ --add-flags "${lib.concatStringsSep " " disabledWorkersFlags}" ''; From 4766f0dac62ce7bd8c017c1d8c616e9c88d5affe Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:03:07 +0200 Subject: [PATCH 275/357] rx: remove 'with lib;' --- pkgs/applications/graphics/rx/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix index c2561ed82ae5..5b7162299952 100644 --- a/pkgs/applications/graphics/rx/default.nix +++ b/pkgs/applications/graphics/rx/default.nix @@ -3,8 +3,6 @@ , xorg ? null , libGL ? null }: -with lib; - rustPlatform.buildRustPackage rec { pname = "rx"; version = "0.5.2"; @@ -20,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - buildInputs = optionals stdenv.isLinux + buildInputs = lib.optionals stdenv.isLinux (with xorg; [ # glfw-sys dependencies: libX11 libXrandr libXinerama libXcursor libXi libXext @@ -29,13 +27,13 @@ rustPlatform.buildRustPackage rec { # FIXME: GLFW (X11) requires DISPLAY env variable for all tests doCheck = false; - postInstall = optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.isLinux '' mkdir -p $out/share/applications cp $src/rx.desktop $out/share/applications wrapProgram $out/bin/rx --prefix LD_LIBRARY_PATH : ${libGL}/lib ''; - meta = { + meta = with lib; { description = "Modern and extensible pixel editor implemented in Rust"; mainProgram = "rx"; homepage = "https://rx.cloudhead.io/"; From 04d23606b5a401043cdc349233afdcefd2164565 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:03:16 +0200 Subject: [PATCH 276/357] sane: remove 'with lib;' --- pkgs/applications/graphics/sane/config.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix index 0405eeb05c2c..c637ff3cfcd3 100644 --- a/pkgs/applications/graphics/sane/config.nix +++ b/pkgs/applications/graphics/sane/config.nix @@ -2,7 +2,7 @@ { paths, disabledDefaultBackends ? [] }: -with lib; + let installSanePath = path: '' if [ -e "${path}/lib/sane" ]; then @@ -48,6 +48,6 @@ stdenv.mkDerivation { mkdir -p $out/etc/sane.d $out/etc/sane.d/dll.d $out/lib/sane '' - + (concatMapStrings installSanePath paths) - + (concatMapStrings disableBackend disabledDefaultBackends); + + (lib.concatMapStrings installSanePath paths) + + (lib.concatMapStrings disableBackend disabledDefaultBackends); } From 83d6138b73d77ec83c94dbf068a692e61b880cfd Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:03:29 +0200 Subject: [PATCH 277/357] sxiv: remove 'with lib;' --- pkgs/applications/graphics/sxiv/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index f3d7086d4a09..09855af551fe 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, libXft, imlib2, giflib, libexif, conf ? null }: -with lib; - stdenv.mkDerivation rec { pname = "sxiv"; version = "26"; @@ -13,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0xaawlfdy7b277m38mgg4423kd7p1ffn0dq4hciqs6ivbb3q9c4f"; }; - configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf); - preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + configFile = lib.optionalString (conf!=null) (builtins.toFile "config.def.h" conf); + preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h"; buildInputs = [ libXft imlib2 giflib libexif ]; @@ -24,7 +22,7 @@ stdenv.mkDerivation rec { install -Dt $out/share/applications sxiv.desktop ''; - meta = { + meta = with lib; { description = "Simple X Image Viewer"; homepage = "https://github.com/muennich/sxiv"; license = lib.licenses.gpl2Plus; From 45b1650ab0e7e42f13115997ed3aa236bda912cb Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:03:43 +0200 Subject: [PATCH 278/357] hadoop: remove 'with lib;' --- .../networking/cluster/hadoop/default.nix | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index e02525e48f0a..d9f20411a5a0 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -23,9 +23,7 @@ , callPackage }: -with lib; - -assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; +assert lib.elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; let common = { pname, platformAttrs, jdk, tests }: @@ -34,7 +32,7 @@ let version = platformAttrs.${stdenv.system}.version or (throw "Unsupported system: ${stdenv.system}"); src = fetchurl { url = "mirror://apache/hadoop/common/hadoop-${finalAttrs.version}/hadoop-${finalAttrs.version}" - + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; + + lib.optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; inherit (platformAttrs.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")) hash; }; doCheck = true; @@ -47,24 +45,24 @@ let }) else ""; nativeBuildInputs = [ makeWrapper ] - ++ optionals stdenv.isLinux [ autoPatchelfHook ]; - buildInputs = optionals stdenv.isLinux [ stdenv.cc.cc.lib openssl protobuf zlib snappy libtirpc ]; + ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib openssl protobuf zlib snappy libtirpc ]; installPhase = '' mkdir $out mv * $out/ - '' + optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' for n in $(find ${finalAttrs.containerExecutor}/bin -type f); do ln -sf "$n" $out/bin done # these libraries are loaded at runtime by the JVM - ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/native/libsasl2.so.2 - ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/native/ - ln -s ${getLib zlib}/lib/libz.so.1 $out/lib/native/ - ln -s ${getLib zstd}/lib/libzstd.so.1 $out/lib/native/ - ln -s ${getLib bzip2}/lib/libbz2.so.1 $out/lib/native/ - ln -s ${getLib snappy}/lib/libsnappy.so.1 $out/lib/native/ + ln -s ${lib.getLib cyrus_sasl}/lib/libsasl2.so $out/lib/native/libsasl2.so.2 + ln -s ${lib.getLib openssl}/lib/libcrypto.so $out/lib/native/ + ln -s ${lib.getLib zlib}/lib/libz.so.1 $out/lib/native/ + ln -s ${lib.getLib zstd}/lib/libzstd.so.1 $out/lib/native/ + ln -s ${lib.getLib bzip2}/lib/libbz2.so.1 $out/lib/native/ + ln -s ${lib.getLib snappy}/lib/libsnappy.so.1 $out/lib/native/ # libjvm.so is in different paths for java 8 and 11 # libnativetask.so in hadooop 3 and libhdfs.so in hadoop 2 depend on it @@ -76,7 +74,7 @@ let # hadoop 3.3+ depends on protobuf 3.18, 3.2 depends on 3.8 find $out/lib/native -name 'libhdfspp.so*' | \ xargs -r -n1 patchelf --replace-needed libprotobuf.so.${ - if (versionAtLeast finalAttrs.version "3.3") then "18" + if (lib.versionAtLeast finalAttrs.version "3.3") then "18" else "8" } libprotobuf.so @@ -90,17 +88,17 @@ let --set-default HADOOP_HOME $out/\ --run "test -d /etc/hadoop-conf && export HADOOP_CONF_DIR=\''${HADOOP_CONF_DIR-'/etc/hadoop-conf/'}"\ --set-default HADOOP_CONF_DIR $out/etc/hadoop/\ - --prefix PATH : "${makeBinPath [ bash coreutils which]}"\ - --prefix JAVA_LIBRARY_PATH : "${makeLibraryPath finalAttrs.buildInputs}" + --prefix PATH : "${lib.makeBinPath [ bash coreutils which]}"\ + --prefix JAVA_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" done - '' + (optionalString sparkSupport '' + '' + (lib.optionalString sparkSupport '' # Add the spark shuffle service jar to YARN cp ${spark.src}/yarn/spark-${spark.version}-yarn-shuffle.jar $out/share/hadoop/yarn/ ''); passthru = { inherit tests; }; - meta = recursiveUpdate { + meta = with lib; recursiveUpdate { homepage = "https://hadoop.apache.org/"; description = "Framework for distributed processing of large data sets across clusters of computers"; license = licenses.asl20; From 871363c0759acd792199162f74d8669d75327dc6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:03:55 +0200 Subject: [PATCH 279/357] tryton: remove 'with lib;' --- pkgs/applications/office/tryton/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 6a9d1e471a9e..55d43623bc7a 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -17,8 +17,6 @@ , wrapGAppsHook3 }: -with lib; - python3Packages.buildPythonApplication rec { pname = "tryton"; version = "7.2.4"; @@ -61,7 +59,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; - meta = { + meta = with lib; { description = "Client of the Tryton application platform"; mainProgram = "tryton"; longDescription = '' From f9ffd234e90b38ade831b0901b92bfc112a8082b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:04:05 +0200 Subject: [PATCH 280/357] marvin: remove 'with lib;' --- pkgs/applications/science/chemistry/marvin/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 4228e818e488..e1e911e2d4df 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -1,14 +1,12 @@ { lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, openjdk17 }: -with lib; - stdenv.mkDerivation rec { pname = "marvin"; version = "23.17.0"; src = fetchurl { name = "marvin-${version}.deb"; - url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; + url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${lib.versions.majorMinor version}.deb"; hash = "sha256-zE/9EaOsNJwzE4Doasm9N8QG4t7wDOxqpV/Nhc4p7Ws="; }; @@ -22,7 +20,7 @@ stdenv.mkDerivation rec { wrapBin() { makeWrapper $1 $out/bin/$(basename $1) \ --set INSTALL4J_JAVA_HOME "${openjdk17}" \ - --prefix PATH : ${makeBinPath [ coreutils gawk gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ coreutils gawk gnugrep gnused ]} } cp -r opt $out mkdir -p $out/bin $out/share/pixmaps $out/share/applications @@ -33,12 +31,12 @@ stdenv.mkDerivation rec { for name in cxcalc cxtrain evaluate molconvert mview msketch; do wrapBin $out/opt/chemaxon/marvinsuite/bin/$name done - ${concatStrings (map (name: '' + ${lib.concatStrings (map (name: '' substitute ${./. + "/${name}.desktop"} $out/share/applications/${name}.desktop --subst-var out '') [ "LicenseManager" "MarvinSketch" "MarvinView" ])} ''; - meta = { + meta = with lib; { description = "Chemical modelling, analysis and structure drawing program"; homepage = "https://chemaxon.com/products/marvin"; maintainers = with maintainers; [ fusion809 ]; From bbe254322e7bc3ebd33504d61d760fdb889839e6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:04:15 +0200 Subject: [PATCH 281/357] fped: remove 'with lib;' --- pkgs/applications/science/electronics/fped/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index edfe34c0e25e..e3984dba77d8 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -3,7 +3,6 @@ , pkg-config }: -with lib; stdenv.mkDerivation { pname = "fped"; version = "unstable-2017-05-11"; @@ -39,7 +38,7 @@ stdenv.mkDerivation { gtk2 ]; - meta = { + meta = with lib; { description = "Editor that allows the interactive creation of footprints electronic components"; mainProgram = "fped"; homepage = "http://projects.qi-hardware.com/index.php/p/fped/"; From 09ade647a64c3f1e48b8fb8419c3dd273a93c809 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:04:30 +0200 Subject: [PATCH 282/357] monosat: remove 'with lib;' --- pkgs/applications/science/logic/monosat/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 067ba8ceb1b3..1bd2d29d4505 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -3,8 +3,6 @@ # annoying and break the python library, so let's not bother for now includeJava ? !stdenv.hostPlatform.isDarwin, includeGplCode ? true }: -with lib; - let boolToCmake = x: if x then "ON" else "OFF"; @@ -52,14 +50,14 @@ let "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; - postInstall = optionalString includeJava '' + postInstall = lib.optionalString includeJava '' mkdir -p $out/share/java cp monosat.jar $out/share/java ''; passthru = { inherit python; }; - meta = { + meta = with lib; { description = "SMT solver for Monotonic Theories"; mainProgram = "monosat"; platforms = platforms.unix; From 47891a407b76e8231186489ce4d68062e7fb5b89 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:04:44 +0200 Subject: [PATCH 283/357] z3: remove 'with lib;' --- .../applications/science/logic/z3/default.nix | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 2db1fc95f797..a17cc5561cf2 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -16,8 +16,6 @@ assert javaBindings -> jdk != null; assert ocamlBindings -> ocaml != null && findlib != null && zarith != null; -with lib; - let common = { version, sha256, patches ? [ ], tag ? "z3" }: stdenv.mkDerivation rec { pname = "z3"; @@ -32,25 +30,25 @@ let common = { version, sha256, patches ? [ ], tag ? "z3" }: strictDeps = true; nativeBuildInputs = [ python ] - ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames - ++ optional javaBindings jdk - ++ optionals ocamlBindings [ ocaml findlib ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames + ++ lib.optional javaBindings jdk + ++ lib.optionals ocamlBindings [ ocaml findlib ] ; propagatedBuildInputs = [ python.pkgs.setuptools ] - ++ optionals ocamlBindings [ zarith ]; + ++ lib.optionals ocamlBindings [ zarith ]; enableParallelBuilding = true; - postPatch = optionalString ocamlBindings '' + postPatch = lib.optionalString ocamlBindings '' export OCAMLFIND_DESTDIR=$ocaml/lib/ocaml/${ocaml.version}/site-lib mkdir -p $OCAMLFIND_DESTDIR/stublibs ''; - configurePhase = concatStringsSep " " + configurePhase = lib.concatStringsSep " " ( [ "${python.pythonOnBuildForHost.interpreter} scripts/mk_make.py --prefix=$out" ] - ++ optional javaBindings "--java" - ++ optional ocamlBindings "--ml" - ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" + ++ lib.optional javaBindings "--java" + ++ lib.optional ocamlBindings "--ml" + ++ lib.optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" ) + "\n" + "cd build"; doCheck = true; @@ -63,19 +61,19 @@ let common = { version, sha256, patches ? [ ], tag ? "z3" }: mkdir -p $dev $lib mv $out/lib $lib/lib mv $out/include $dev/include - '' + optionalString pythonBindings '' + '' + lib.optionalString pythonBindings '' mkdir -p $python/lib mv $lib/lib/python* $python/lib/ ln -sf $lib/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} $python/${python.sitePackages}/z3/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} - '' + optionalString javaBindings '' + '' + lib.optionalString javaBindings '' mkdir -p $java/share/java mv com.microsoft.z3.jar $java/share/java moveToOutput "lib/libz3java.${stdenv.hostPlatform.extensions.sharedLibrary}" "$java" ''; outputs = [ "out" "lib" "dev" "python" ] - ++ optional javaBindings "java" - ++ optional ocamlBindings "ocaml"; + ++ lib.optional javaBindings "java" + ++ lib.optional ocamlBindings "ocaml"; meta = with lib; { description = "High-performance theorem prover and SMT solver"; From 4cd79d95b526d3a6d2c5d46dcc6ab73b8ab7840c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:04:55 +0200 Subject: [PATCH 284/357] ripser: remove 'with lib;' --- .../science/math/ripser/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix index 3f536f25aa11..38a00d504406 100644 --- a/pkgs/applications/science/math/ripser/default.nix +++ b/pkgs/applications/science/math/ripser/default.nix @@ -5,14 +5,11 @@ , fileFormat ? "lowerTriangularCsv" }: -with lib; - -assert assertOneOf "fileFormat" fileFormat +assert lib.assertOneOf "fileFormat" fileFormat ["lowerTriangularCsv" "upperTriangularCsv" "dipha"]; assert useGoogleHashmap -> sparsehash != null; let - inherit (lib) optional; version = "1.2.1"; in stdenv.mkDerivation { @@ -26,19 +23,19 @@ stdenv.mkDerivation { sha256 = "sha256-BxmkPQ/nl5cF+xwQMTjXnLgkLgdmT/39y7Kzl2wDfpE="; }; - buildInputs = optional useGoogleHashmap sparsehash; + buildInputs = lib.optional useGoogleHashmap sparsehash; buildFlags = [ "-std=c++11" "-O3" "-D NDEBUG" ] - ++ optional useCoefficients "-D USE_COEFFICIENTS" - ++ optional indicateProgress "-D INDICATE_PROGRESS" - ++ optional useGoogleHashmap "-D USE_GOOGLE_HASHMAP" - ++ optional (fileFormat == "lowerTriangularCsv") "-D FILE_FORMAT_LOWER_TRIANGULAR_CSV" - ++ optional (fileFormat == "upperTriangularCsv") "-D FILE_FORMAT_UPPER_TRIANGULAR_CSV" - ++ optional (fileFormat == "dipha") "-D FILE_FORMAT_DIPHA" + ++ lib.optional useCoefficients "-D USE_COEFFICIENTS" + ++ lib.optional indicateProgress "-D INDICATE_PROGRESS" + ++ lib.optional useGoogleHashmap "-D USE_GOOGLE_HASHMAP" + ++ lib.optional (fileFormat == "lowerTriangularCsv") "-D FILE_FORMAT_LOWER_TRIANGULAR_CSV" + ++ lib.optional (fileFormat == "upperTriangularCsv") "-D FILE_FORMAT_UPPER_TRIANGULAR_CSV" + ++ lib.optional (fileFormat == "dipha") "-D FILE_FORMAT_DIPHA" ; buildPhase = "c++ ripser.cpp -o ripser $buildFlags"; From 4320b3788a18c83348e9aabca99c1cb5a24704f5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:05:07 +0200 Subject: [PATCH 285/357] wolfram-engine: remove 'with lib;' --- pkgs/applications/science/math/wolfram-engine/l10ns.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/wolfram-engine/l10ns.nix b/pkgs/applications/science/math/wolfram-engine/l10ns.nix index ae1886bae154..af80c3e37b32 100644 --- a/pkgs/applications/science/math/wolfram-engine/l10ns.nix +++ b/pkgs/applications/science/math/wolfram-engine/l10ns.nix @@ -45,7 +45,7 @@ let allVersions = with lib; flip map ] ({ version, lang, language, sha256, installer }: { inherit version lang; - name = "wolfram-engine-${version}" + optionalString (lang != "en") "-${lang}"; + name = "wolfram-engine-${version}" + lib.optionalString (lang != "en") "-${lang}"; src = requireFile { name = installer; message = '' @@ -58,9 +58,8 @@ let allVersions = with lib; flip map }; }); minVersion = - with lib; if majorVersion == null - then elemAt (builtins.splitVersion (elemAt allVersions 0).version) 0 + then lib.elemAt (builtins.splitVersion (lib.elemAt allVersions 0).version) 0 else majorVersion; maxVersion = toString (1 + builtins.fromJSON minVersion); in From 3e8f94136a7db049a9eda3cd7ee3836629f8e7ac Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:05:20 +0200 Subject: [PATCH 286/357] dcmtk: remove 'with lib;' --- pkgs/applications/science/medicine/dcmtk/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/pkgs/applications/science/medicine/dcmtk/default.nix index 0fa41ba08760..8dc85e2ee107 100644 --- a/pkgs/applications/science/medicine/dcmtk/default.nix +++ b/pkgs/applications/science/medicine/dcmtk/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv , libpng, cmake }: -with lib; stdenv.mkDerivation rec { pname = "dcmtk"; version = "3.6.8"; @@ -17,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with lib; { description = "Collection of libraries and applications implementing large parts of the DICOM standard"; longDescription = '' From ba269a9fec9f8f44917d457cac36cad7d6d8e1e6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:05:38 +0200 Subject: [PATCH 287/357] simgrid: remove 'with lib;' --- .../science/misc/simgrid/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index a2b04e1877f8..8d9373278e94 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -12,8 +12,6 @@ , withoutBin ? false }: -with lib; - let optionOnOff = option: if option then "on" else "off"; in @@ -32,15 +30,15 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ boost ]; nativeBuildInputs = [ cmake perl python3 ] - ++ optionals fortranSupport [ gfortran ] - ++ optionals buildJavaBindings [ openjdk ] - ++ optionals buildPythonBindings [ python3Packages.pybind11 ] - ++ optionals buildDocumentation [ fig2dev ghostscript doxygen ] - ++ optionals bmfSupport [ eigen ] - ++ optionals modelCheckingSupport [ libunwind libevent elfutils ]; + ++ lib.optionals fortranSupport [ gfortran ] + ++ lib.optionals buildJavaBindings [ openjdk ] + ++ lib.optionals buildPythonBindings [ python3Packages.pybind11 ] + ++ lib.optionals buildDocumentation [ fig2dev ghostscript doxygen ] + ++ lib.optionals bmfSupport [ eigen ] + ++ lib.optionals modelCheckingSupport [ libunwind libevent elfutils ]; outputs = [ "out" ] - ++ optionals buildPythonBindings [ "python" ]; + ++ lib.optionals buildPythonBindings [ "python" ]; # "Release" does not work. non-debug mode is Debug compiled with optimization cmakeBuildType = "Debug"; @@ -69,7 +67,7 @@ stdenv.mkDerivation rec { # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; - makeFlags = optional debug "VERBOSE=1"; + makeFlags = lib.optional debug "VERBOSE=1"; # needed to run tests and to ensure correct shabangs in output scripts preBuild = '' @@ -106,7 +104,7 @@ stdenv.mkDerivation rec { hardeningDisable = lib.optionals debug [ "fortify" ]; dontStrip = debug; - meta = { + meta = with lib; { description = "Framework for the simulation of distributed applications"; longDescription = '' SimGrid is a toolkit that provides core functionalities for the From 07440c4a2de2ea4849f9bba3f869c49f005d7d5f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:05:48 +0200 Subject: [PATCH 288/357] rxvt-unicode: remove 'with lib;' --- .../rxvt-unicode/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index e932fcdea05f..f28694db2949 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -33,8 +33,6 @@ let }; in -with lib; - stdenv.mkDerivation { name = "${pname}-unwrapped-${version}"; inherit pname version; @@ -49,8 +47,8 @@ stdenv.mkDerivation { [ libX11 libXt libXft ncurses # required to build the terminfo file fontconfig freetype libXrender libptytty - ] ++ optionals perlSupport [ perl libXext ] - ++ optional gdkPixbufSupport gdk-pixbuf; + ] ++ lib.optionals perlSupport [ perl libXext ] + ++ lib.optional gdkPixbufSupport gdk-pixbuf; outputs = [ "out" "terminfo" ]; @@ -73,19 +71,19 @@ stdenv.mkDerivation { ./patches/9.06-font-width.patch ]) ++ [ ./patches/256-color-resources.patch - ] ++ optional (perlSupport && versionAtLeast perl.version "5.38") (fetchpatch { + ] ++ lib.optional (perlSupport && lib.versionAtLeast perl.version "5.38") (fetchpatch { name = "perl538-locale-c.patch"; url = "https://github.com/exg/rxvt-unicode/commit/16634bc8dd5fc4af62faf899687dfa8f27768d15.patch"; excludes = [ "Changes" ]; sha256 = "sha256-JVqzYi3tcWIN2j5JByZSztImKqbbbB3lnfAwUXrumHM="; - }) ++ optional stdenv.isDarwin ./patches/makefile-phony.patch; + }) ++ lib.optional stdenv.isDarwin ./patches/makefile-phony.patch; configureFlags = [ "--with-terminfo=${placeholder "terminfo"}/share/terminfo" "--enable-256-color" - (enableFeature perlSupport "perl") - (enableFeature unicode3Support "unicode3") - ] ++ optional emojiSupport "--enable-wide-glyphs"; + (lib.enableFeature perlSupport "perl") + (lib.enableFeature unicode3Support "unicode3") + ] ++ lib.optional emojiSupport "--enable-wide-glyphs"; LDFLAGS = [ "-lfontconfig" "-lXrender" "-lpthread" ]; CFLAGS = [ "-I${freetype.dev}/include/freetype2" ]; @@ -111,7 +109,7 @@ stdenv.mkDerivation { passthru.tests.test = nixosTests.terminal-emulators.urxvt; - meta = { + meta = with lib; { inherit description; homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; From 95c1729ff82417f04c92efef74861e5e28859026 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:06:03 +0200 Subject: [PATCH 289/357] git-octopus: remove 'with lib;' --- .../applications/version-management/git-octopus/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-octopus/default.nix b/pkgs/applications/version-management/git-octopus/default.nix index 877c795e205d..3865c9ac83b8 100644 --- a/pkgs/applications/version-management/git-octopus/default.nix +++ b/pkgs/applications/version-management/git-octopus/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, git, perl, makeWrapper }: -with lib; - stdenv.mkDerivation rec { pname = "git-octopus"; version = "1.4"; @@ -13,7 +11,7 @@ stdenv.mkDerivation rec { # perl provides shasum postInstall = '' for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${makeBinPath [ git perl ]} + wrapProgram $f --prefix PATH : ${lib.makeBinPath [ git perl ]} done ''; @@ -24,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "14p61xk7jankp6gc26xciag9fnvm7r9vcbhclcy23f4ghf4q4sj1"; }; - meta = { + meta = with lib; { homepage = "https://github.com/lesfurets/git-octopus"; description = "Continuous merge workflow"; license = licenses.lgpl3; From bf74256b2074957d18d34aa91ece6f73082e260b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:06:15 +0200 Subject: [PATCH 290/357] gitkraken: remove 'with lib;' --- pkgs/applications/version-management/gitkraken/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 80c890046895..66bab500c664 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -55,8 +55,6 @@ cacert, }: -with lib; - let pname = "gitkraken"; version = "10.2.0"; @@ -82,7 +80,7 @@ let src = srcs.${stdenv.hostPlatform.system} or throwSystem; - meta = { + meta = with lib; { homepage = "https://www.gitkraken.com/git-client"; description = "Simplifying Git for any OS"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; @@ -108,7 +106,7 @@ let dontBuild = true; dontConfigure = true; - libPath = makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib curlWithGnuTls udev From 878b166cfa5a29c2a491b1bce149c0f3265d6891 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:06:28 +0200 Subject: [PATCH 291/357] gogs: remove 'with lib;' --- .../applications/version-management/gogs/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 534fd288d43e..5b7a986cf206 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -4,8 +4,6 @@ , pamSupport ? true }: -with lib; - buildGoModule rec { pname = "gogs"; version = "0.13.0"; @@ -27,19 +25,19 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper openssh ]; - buildInputs = optional pamSupport pam; + buildInputs = lib.optional pamSupport pam; tags = - ( optional sqliteSupport "sqlite" - ++ optional pamSupport "pam"); + ( lib.optional sqliteSupport "sqlite" + ++ lib.optional pamSupport "pam"); postInstall = '' wrapProgram $out/bin/gogs \ - --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} + --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} ''; - meta = { + meta = with lib; { description = "Painless self-hosted Git service"; homepage = "https://gogs.io"; license = licenses.mit; From 85f3221e9fbf2aeb94d9712cd8fd6981bdc05af5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:06:56 +0200 Subject: [PATCH 292/357] mpvScripts: remove 'with lib;' --- pkgs/applications/video/mpv/scripts/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index af321e094b20..873010ca3f5a 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -140,13 +140,12 @@ let }; in -with lib; -pipe scope [ - (makeScope newScope) +lib.pipe scope [ + (lib.makeScope newScope) ( self: assert builtins.intersectAttrs self aliases == { }; - self // optionalAttrs config.allowAliases aliases + self // lib.optionalAttrs config.allowAliases aliases ) - recurseIntoAttrs + lib.recurseIntoAttrs ] From a139f83d6f621614a2cb22205c7a0f1ec93511f5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:07:10 +0200 Subject: [PATCH 293/357] vcs: remove 'with lib;' --- pkgs/applications/video/vcs/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/applications/video/vcs/default.nix index 63a998913473..105823fec3ab 100644 --- a/pkgs/applications/video/vcs/default.nix +++ b/pkgs/applications/video/vcs/default.nix @@ -3,7 +3,6 @@ , util-linux, getopt , dejavu_fonts }: -with lib; let version = "1.13.4"; gopt = if stdenv.isLinux then util-linux else getopt; @@ -29,10 +28,10 @@ stdenv.mkDerivation { mv vcs $out/bin/vcs substituteAllInPlace $out/bin/vcs chmod +x $out/bin/vcs - wrapProgram $out/bin/vcs --argv0 vcs --set PATH "${makeBinPath runtimeDeps}" + wrapProgram $out/bin/vcs --argv0 vcs --set PATH "${lib.makeBinPath runtimeDeps}" ''; - meta = { + meta = with lib; { description = "Generates contact sheets from video files"; homepage = "http://p.outlyer.net/vcs"; license = licenses.lgpl21Plus; From b0290d872d29c33581673f8ce17035ec6f90a685 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:07:19 +0200 Subject: [PATCH 294/357] docker: remove 'with lib;' --- pkgs/applications/virtualization/docker/gc.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/docker/gc.nix b/pkgs/applications/virtualization/docker/gc.nix index 7d45427627fa..29df4bfea3a5 100644 --- a/pkgs/applications/virtualization/docker/gc.nix +++ b/pkgs/applications/virtualization/docker/gc.nix @@ -1,7 +1,4 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, docker, coreutils, procps, gnused, findutils, gnugrep }: - -with lib; - stdenv.mkDerivation rec { pname = "docker-gc"; version = "unstable-2015-10-5"; @@ -23,7 +20,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${lib.makeBinPath [ docker coreutils procps gnused findutils gnugrep ]}" ''; - meta = { + meta = with lib; { description = "Docker garbage collection of containers and images"; mainProgram = "docker-gc"; license = licenses.asl20; From fe7e5d12c5386045c9ef3443cfaa7050436f4495 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:07:31 +0200 Subject: [PATCH 295/357] virt-viewer: remove 'with lib;' --- .../virtualization/virt-viewer/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 8c621271e757..a4e32f618a04 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -32,9 +32,6 @@ , vte , wrapGAppsHook3 }: - -with lib; - stdenv.mkDerivation rec { pname = "virt-viewer"; version = "11.0"; @@ -76,18 +73,18 @@ stdenv.mkDerivation rec { libvirt-glib libxml2 vte - ] ++ optionals ovirtSupport [ + ] ++ lib.optionals ovirtSupport [ libgovirt - ] ++ optionals spiceSupport ([ + ] ++ lib.optionals spiceSupport ([ gdbm spice-gtk spice-protocol - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ libcap ]); # Required for USB redirection PolicyKit rules file - propagatedUserEnvPkgs = optional spiceSupport spice-gtk; + propagatedUserEnvPkgs = lib.optional spiceSupport spice-gtk; mesonFlags = [ (lib.mesonEnable "ovirt" ovirtSupport) @@ -99,7 +96,7 @@ stdenv.mkDerivation rec { patchShebangs build-aux/post_install.py ''; - meta = { + meta = with lib; { description = "Viewer for remote virtual machines"; maintainers = with maintainers; [ raskin atemu ]; platforms = with platforms; linux ++ darwin; From 99f015982f87eff07ae1b6f31118a95b85a1bf6c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:07:46 +0200 Subject: [PATCH 296/357] virtualbox: remove 'with lib;' --- pkgs/applications/virtualization/virtualbox/extpack.nix | 5 +---- .../virtualization/virtualbox/guest-additions/default.nix | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index c234c079b4c8..365c635a17ae 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -1,7 +1,4 @@ { fetchurl, lib, virtualbox }: - -with lib; - let inherit (virtualbox) version; in @@ -15,7 +12,7 @@ fetchurl rec { let value = "d750fb17688d70e0cb2d7b06f1ad3a661303793f4d1ac39cfa9a54806b89da25"; in assert (builtins.stringLength value) == 64; value; - meta = { + meta = with lib; { description = "Oracle Extension pack for VirtualBox"; license = licenses.virtualbox-puel; homepage = "https://www.virtualbox.org/"; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 4e0b8728f29b..f3eea8a5c171 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,9 +1,6 @@ { stdenv, kernel, callPackage, lib, dbus , xorg, zlib, patchelf, makeWrapper }: - -with lib; - let virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { }; @@ -103,7 +100,7 @@ in stdenv.mkDerivation { host/guest clipboard support. ''; sourceProvenance = with lib.sourceTypes; [ fromSource ]; - license = licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide ]; platforms = [ "i686-linux" "x86_64-linux" ]; broken = stdenv.hostPlatform.is32bit && (kernel.kernelAtLeast "5.10"); From 29918f97a4671f65f7600b22a7661ba1d1bcd128 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:08:17 +0200 Subject: [PATCH 297/357] fluxbox: remove 'with lib;' --- pkgs/applications/window-managers/fluxbox/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix index 934f8c9b3fc2..80c5c7a216be 100644 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -4,7 +4,6 @@ , libXinerama , imlib2 }: -with lib; stdenv.mkDerivation rec { pname = "fluxbox"; @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { --subst-var-by PREFIX "$out" ''; - meta = { + meta = with lib; { description = "Full-featured, light-resource X window manager"; longDescription = '' Fluxbox is a X window manager based on Blackbox 0.61.1 window From 4a22744d124a6976164a24d277f3aff0c625b45e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:08:38 +0200 Subject: [PATCH 298/357] i3blocks-gaps: remove 'with lib;' --- .../window-managers/i3/blocks-gaps.nix | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index 1d9043686bb2..6c32583aa063 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -4,11 +4,9 @@ "load_average" "memory" "volume" "wifi" ] }: -with lib; - let perlscripts = [ "battery" "cpu_usage" "openvpn" "temperature" ]; - contains_any = l1: l2: 0 < length( intersectLists l1 l2 ); + contains_any = l1: l2: 0 < lib.length( lib.intersectLists l1 l2 ); in stdenv.mkDerivation rec { @@ -25,24 +23,24 @@ stdenv.mkDerivation rec { makeFlags = [ "all" ]; installFlags = [ "PREFIX=\${out}" "VERSION=${version}" ]; - buildInputs = optional (contains_any scripts perlscripts) perl; + buildInputs = lib.optional (contains_any scripts perlscripts) perl; nativeBuildInputs = [ makeWrapper ]; - postFixup = optionalString (elem "bandwidth" scripts) '' + postFixup = lib.optionalString (lib.elem "bandwidth" scripts) '' wrapProgram $out/libexec/i3blocks/bandwidth \ - --prefix PATH : ${makeBinPath [ iproute2 ]} - '' + optionalString (elem "battery" scripts) '' + --prefix PATH : ${lib.makeBinPath [ iproute2 ]} + '' + lib.optionalString (lib.elem "battery" scripts) '' wrapProgram $out/libexec/i3blocks/battery \ - --prefix PATH : ${makeBinPath [ acpi ]} - '' + optionalString (elem "cpu_usage" scripts) '' + --prefix PATH : ${lib.makeBinPath [ acpi ]} + '' + lib.optionalString (lib.elem "cpu_usage" scripts) '' wrapProgram $out/libexec/i3blocks/cpu_usage \ - --prefix PATH : ${makeBinPath [ sysstat ]} - '' + optionalString (elem "iface" scripts) '' + --prefix PATH : ${lib.makeBinPath [ sysstat ]} + '' + lib.optionalString (lib.elem "iface" scripts) '' wrapProgram $out/libexec/i3blocks/iface \ - --prefix PATH : ${makeBinPath [ iproute2 ]} - '' + optionalString (elem "volume" scripts) '' + --prefix PATH : ${lib.makeBinPath [ iproute2 ]} + '' + lib.optionalString (lib.elem "volume" scripts) '' wrapProgram $out/libexec/i3blocks/volume \ - --prefix PATH : ${makeBinPath [ alsa-utils ]} + --prefix PATH : ${lib.makeBinPath [ alsa-utils ]} ''; meta = with lib; { From 99836b76afe090458b5a126070d9a832e877453e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:08:47 +0200 Subject: [PATCH 299/357] i3blocks: remove 'with lib;' --- pkgs/applications/window-managers/i3/blocks.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index d9ed823400d6..ad495723b6db 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -1,7 +1,5 @@ { fetchFromGitHub, fetchpatch, lib, stdenv, autoreconfHook, pkg-config }: -with lib; - stdenv.mkDerivation { pname = "i3blocks"; version = "1.5"; @@ -24,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; - meta = { + meta = with lib; { description = "Flexible scheduler for your i3bar blocks"; mainProgram = "i3blocks"; homepage = "https://github.com/vivien/i3blocks"; From 024004e57743b991f0f2cf6a13e927d73aeab31f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:09:05 +0200 Subject: [PATCH 300/357] deepin.dde-gsettings-schemas: remove 'with lib;' --- pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index b211250bc9cf..46fb6480ca4d 100644 --- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -27,8 +27,6 @@ let ] ++ extraGSettingsOverridePackages; in -with lib; - # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } '' @@ -37,7 +35,7 @@ runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } mkdir -p $schema_dir - ${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"$schema_dir\"") gsettingsOverridePackages} + ${lib.concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"$schema_dir\"") gsettingsOverridePackages} chmod -R a+w "$data_dir" From df46afcb617f50322555bfc35809195cff32ec14 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:09:49 +0200 Subject: [PATCH 301/357] flutter: remove 'with lib;' --- .../compilers/flutter/engine/package.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix index a87088dc8131..0e8b35520222 100644 --- a/pkgs/development/compilers/flutter/engine/package.nix +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -46,12 +46,11 @@ runtimeMode ? "release", isOptimized ? true, }: -with lib; let expandSingleDep = dep: lib.optionals (lib.isDerivation dep) ([ dep ] ++ map (output: dep.${output}) dep.outputs); - expandDeps = deps: flatten (map expandSingleDep deps); + expandDeps = deps: lib.flatten (map expandSingleDep deps); constants = callPackage ./constants.nix { inherit targetPlatform; }; @@ -103,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { paths = expandDeps ( - optionals (stdenv.isLinux) [ + lib.optionals (stdenv.isLinux) [ gtk3 wayland libepoxy @@ -128,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.xorgproto zlib ] - ++ optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.isDarwin) [ clang llvm ] @@ -160,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: { dart ] ++ lib.optionals (stdenv.isLinux) [ patchelf ] - ++ optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.isDarwin) [ darwin.system_cmds darwin.xcode tools.xcode-select @@ -237,7 +236,7 @@ stdenv.mkDerivation (finalAttrs: { "--embedder-for-target" "--no-goma" ] - ++ optionals (targetPlatform.isx86_64 == false) [ + ++ lib.optionals (targetPlatform.isx86_64 == false) [ "--linux" "--linux-cpu ${constants.alt-arch}" ]; @@ -311,7 +310,7 @@ stdenv.mkDerivation (finalAttrs: { dart = callPackage ./dart.nix { engine = finalAttrs.finalPackage; }; }; - meta = { + meta = with lib; { # Very broken on Darwin broken = stdenv.isDarwin; description = "The Flutter engine"; From eb4b691723a7d4a285e1fceda8dae4ecdeb1aa25 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:11:44 +0200 Subject: [PATCH 302/357] samsung-unified-linux-driver_1_00_36: remove 'with lib;' --- pkgs/misc/cups/drivers/samsung/1.00.36/module.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix index 3cf7c62c4e72..1b9ea38a3006 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix @@ -15,17 +15,16 @@ # again after turning the device off and on. atm i have no idea how # to fix this and no time to do more about it. {config, pkgs, lib ? pkgs.lib, ...}: -with lib; let cfg = config.services.samsung-unified-linux-driver_1_00_36; pkg = pkgs.samsung-unified-linux-driver_1_00_36; in { options = { services.samsung-unified-linux-driver_1_00_36 = { - enable = mkEnableOption "samsung-unified-linux-driver_1_00_36"; + enable = lib.mkEnableOption "samsung-unified-linux-driver_1_00_36"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.printing.drivers = [pkg]; hardware.sane.extraBackends = [pkg]; environment.etc = { From 259a3da588e0e292349506081165a60f8ac6db7d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:12:06 +0200 Subject: [PATCH 303/357] libcardiacarrest: remove 'with lib;' --- pkgs/misc/libcardiacarrest/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix index b5cfa1216eee..4c0d0fa97ad1 100644 --- a/pkgs/misc/libcardiacarrest/default.nix +++ b/pkgs/misc/libcardiacarrest/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, glib, libpulseaudio }: -with lib; - stdenv.mkDerivation rec { pname = "libcardiacarrest"; version = "12.2.8"; # . @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { moveToOutput $out/lib/cmake $dev ''; - meta = src.meta // { + meta = with lib; src.meta // { description = "Trivial implementation of libpulse PulseAudio library API"; longDescription = '' libcardiacarrest is a trivial implementation of libpulse From 8936e3a0b4f74ef73a5e711aeba0aff271bf2acb Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:12:17 +0200 Subject: [PATCH 304/357] stabber: remove 'with lib;' --- pkgs/misc/stabber/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix index c0b34982303d..fd64b3942b5a 100644 --- a/pkgs/misc/stabber/default.nix +++ b/pkgs/misc/stabber/default.nix @@ -1,9 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, expat , libmicrohttpd, darwin }: - -with lib; - stdenv.mkDerivation { pname = "stabber-unstable"; version = "2020-06-08"; @@ -28,7 +25,7 @@ stdenv.mkDerivation { buildInputs = [ glib expat libmicrohttpd ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - meta = { + meta = with lib; { description = "Stubbed XMPP Server"; mainProgram = "stabber"; homepage = "https://github.com/profanity-im/stabber"; From a41905ddf9c92437385c6b77cbb3539acf04c864 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:12:47 +0200 Subject: [PATCH 305/357] sundtek: remove 'with lib;' --- pkgs/misc/drivers/sundtek/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index da2852e70d56..3cba4a5f15c8 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -1,10 +1,7 @@ { fetchurl, lib, stdenv }: - -with lib; - let version = "2016-01-26"; - rpath = makeLibraryPath [ "$out/lib" "$out/bin" ]; + rpath = lib.makeLibraryPath [ "$out/lib" "$out/bin" ]; platform = with stdenv; if isx86_64 then "64bit" else @@ -13,7 +10,6 @@ let sha256 = with stdenv; if isx86_64 then "1jfsng5n3phw5rqpkid9m5j7m7zgj5bifh7swvba7f97y6imdaax" else "15y6r5w306pcq4g1rn9f7vf70f3a7qhq237ngaf0wxh2nr0aamxp"; - in stdenv.mkDerivation { src = fetchurl { @@ -42,7 +38,7 @@ in preferLocalBuild = true; - meta = { + meta = with lib; { description = "Sundtek MediaTV driver"; maintainers = [ maintainers.simonvandel ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; From 95cf21bab2b0f0f15a292f3270d439651cedda04 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:14:00 +0200 Subject: [PATCH 306/357] conky: remove 'with lib;' --- pkgs/os-specific/linux/conky/default.nix | 86 ++++++++++++------------ 1 file changed, 42 insertions(+), 44 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 0818850f7549..de2c16b8d55c 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -3,11 +3,11 @@ # dependencies , glib, libXinerama, catch2 -# optional features without extra dependencies +# lib.optional features without extra dependencies , mpdSupport ? true , ibmSupport ? true # IBM/Lenovo notebooks -# optional features with extra dependencies +# lib.optional features with extra dependencies # ouch, this is ugly, but this gives the man page , docsSupport ? true, docbook2x, libxslt ? null @@ -64,8 +64,6 @@ assert weatherMetarSupport -> curlSupport; assert weatherXoapSupport -> curlSupport && libxml2 != null; assert journalSupport -> systemd != null; -with lib; - stdenv.mkDerivation rec { pname = "conky"; version = "1.19.6"; @@ -77,11 +75,11 @@ stdenv.mkDerivation rec { hash = "sha256-L8YSbdk+qQl17L4IRajFD/AEWRXb2w7xH9sM9qPGrQo="; }; - postPatch = optionalString docsSupport '' + postPatch = lib.optionalString docsSupport '' substituteInPlace cmake/Conky.cmake --replace "# set(RELEASE true)" "set(RELEASE true)" cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp - '' + optionalString waylandSupport '' + '' + lib.optionalString waylandSupport '' substituteInPlace src/CMakeLists.txt \ --replace 'COMMAND ''${Wayland_SCANNER}' 'COMMAND wayland-scanner' ''; @@ -93,49 +91,49 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ] - ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] - ++ optional waylandSupport wayland-scanner - ++ optional luaImlib2Support toluapp - ++ optional luaCairoSupport toluapp + ++ lib.optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] + ++ lib.optional waylandSupport wayland-scanner + ++ lib.optional luaImlib2Support toluapp + ++ lib.optional luaCairoSupport toluapp ; buildInputs = [ glib libXinerama ] - ++ optional ncursesSupport ncurses - ++ optionals x11Support [ freetype xorg.libICE xorg.libX11 xorg.libXext xorg.libXft xorg.libSM ] - ++ optionals waylandSupport [ pango wayland wayland-protocols ] - ++ optional xdamageSupport libXdamage - ++ optional imlib2Support imlib2 - ++ optional luaSupport lua - ++ optional luaImlib2Support imlib2 - ++ optional luaCairoSupport cairo - ++ optional wirelessSupport wirelesstools - ++ optional curlSupport curl - ++ optional rssSupport libxml2 - ++ optional weatherXoapSupport libxml2 - ++ optional nvidiaSupport libXNVCtrl - ++ optional pulseSupport libpulseaudio - ++ optional journalSupport systemd + ++ lib.optional ncursesSupport ncurses + ++ lib.optionals x11Support [ freetype xorg.libICE xorg.libX11 xorg.libXext xorg.libXft xorg.libSM ] + ++ lib.optionals waylandSupport [ pango wayland wayland-protocols ] + ++ lib.optional xdamageSupport libXdamage + ++ lib.optional imlib2Support imlib2 + ++ lib.optional luaSupport lua + ++ lib.optional luaImlib2Support imlib2 + ++ lib.optional luaCairoSupport cairo + ++ lib.optional wirelessSupport wirelesstools + ++ lib.optional curlSupport curl + ++ lib.optional rssSupport libxml2 + ++ lib.optional weatherXoapSupport libxml2 + ++ lib.optional nvidiaSupport libXNVCtrl + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional journalSupport systemd ; cmakeFlags = [] - ++ optional docsSupport "-DMAINTAINER_MODE=ON" - ++ optional curlSupport "-DBUILD_CURL=ON" - ++ optional (!ibmSupport) "-DBUILD_IBM=OFF" - ++ optional imlib2Support "-DBUILD_IMLIB2=ON" - ++ optional luaCairoSupport "-DBUILD_LUA_CAIRO=ON" - ++ optional luaImlib2Support "-DBUILD_LUA_IMLIB2=ON" - ++ optional (!mpdSupport) "-DBUILD_MPD=OFF" - ++ optional (!ncursesSupport) "-DBUILD_NCURSES=OFF" - ++ optional rssSupport "-DBUILD_RSS=ON" - ++ optional (!x11Support) "-DBUILD_X11=OFF" - ++ optional waylandSupport "-DBUILD_WAYLAND=ON" - ++ optional xdamageSupport "-DBUILD_XDAMAGE=ON" - ++ optional doubleBufferSupport "-DBUILD_XDBE=ON" - ++ optional weatherMetarSupport "-DBUILD_WEATHER_METAR=ON" - ++ optional weatherXoapSupport "-DBUILD_WEATHER_XOAP=ON" - ++ optional wirelessSupport "-DBUILD_WLAN=ON" - ++ optional nvidiaSupport "-DBUILD_NVIDIA=ON" - ++ optional pulseSupport "-DBUILD_PULSEAUDIO=ON" - ++ optional journalSupport "-DBUILD_JOURNAL=ON" + ++ lib.optional docsSupport "-DMAINTAINER_MODE=ON" + ++ lib.optional curlSupport "-DBUILD_CURL=ON" + ++ lib.optional (!ibmSupport) "-DBUILD_IBM=OFF" + ++ lib.optional imlib2Support "-DBUILD_IMLIB2=ON" + ++ lib.optional luaCairoSupport "-DBUILD_LUA_CAIRO=ON" + ++ lib.optional luaImlib2Support "-DBUILD_LUA_IMLIB2=ON" + ++ lib.optional (!mpdSupport) "-DBUILD_MPD=OFF" + ++ lib.optional (!ncursesSupport) "-DBUILD_NCURSES=OFF" + ++ lib.optional rssSupport "-DBUILD_RSS=ON" + ++ lib.optional (!x11Support) "-DBUILD_X11=OFF" + ++ lib.optional waylandSupport "-DBUILD_WAYLAND=ON" + ++ lib.optional xdamageSupport "-DBUILD_XDAMAGE=ON" + ++ lib.optional doubleBufferSupport "-DBUILD_XDBE=ON" + ++ lib.optional weatherMetarSupport "-DBUILD_WEATHER_METAR=ON" + ++ lib.optional weatherXoapSupport "-DBUILD_WEATHER_XOAP=ON" + ++ lib.optional wirelessSupport "-DBUILD_WLAN=ON" + ++ lib.optional nvidiaSupport "-DBUILD_NVIDIA=ON" + ++ lib.optional pulseSupport "-DBUILD_PULSEAUDIO=ON" + ++ lib.optional journalSupport "-DBUILD_JOURNAL=ON" ; # `make -f src/CMakeFiles/conky.dir/build.make src/CMakeFiles/conky.dir/conky.cc.o`: From af0be7f49541232d64e74944721c3621604cdfab Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:14:20 +0200 Subject: [PATCH 307/357] pure-prompt: remove 'with lib;' --- pkgs/shells/zsh/pure-prompt/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index 2a1ba113ce19..20da12041805 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub }: -with lib; - stdenv.mkDerivation rec { pname = "pure-prompt"; version = "1.23.0"; @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { cp async.zsh "$OUTDIR/async" ''; - meta = { + meta = with lib; { description = "Pretty, minimal and fast ZSH prompt"; homepage = "https://github.com/sindresorhus/pure"; license = licenses.mit; From 0ec13b1b92f5f3340c4d7974675c2548ae46a15d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:14:35 +0200 Subject: [PATCH 308/357] grml-zsh-config: remove 'with lib;' --- pkgs/shells/zsh/grml-zsh-config/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index ed7e81fd88d6..00349696bd3f 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -1,8 +1,4 @@ -{ stdenv, fetchFromGitHub, lib -, zsh, coreutils, inetutils, procps, txt2tags }: - -with lib; - +{ stdenv, fetchFromGitHub, lib, zsh, coreutils, inetutils, procps, txt2tags }: stdenv.mkDerivation rec { pname = "grml-zsh-config"; version = "0.19.7"; @@ -17,7 +13,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ txt2tags ]; buildInputs = [ zsh coreutils procps ] - ++ optional stdenv.isLinux inetutils; + ++ lib.optional stdenv.isLinux inetutils; buildPhase = '' cd doc From 1de6841a2518ff9163e1a496e3131cb4a0cdec61 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:17:15 +0200 Subject: [PATCH 309/357] wpa_supplicant: remove 'with lib;' --- pkgs/os-specific/linux/wpa_supplicant/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 617eadbcc59f..4770f0956d56 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -5,7 +5,6 @@ , withPcsclite ? !stdenv.hostPlatform.isStatic, pcsclite }: -with lib; stdenv.mkDerivation rec { version = "2.11"; @@ -70,12 +69,12 @@ stdenv.mkDerivation rec { CONFIG_WPS_NFS=y CONFIG_SUITEB=y CONFIG_SUITEB192=y - '' + optionalString withPcsclite '' + '' + lib.optionalString withPcsclite '' CONFIG_EAP_SIM=y CONFIG_EAP_AKA=y CONFIG_EAP_AKA_PRIME=y CONFIG_PCSC=y - '' + optionalString dbusSupport '' + '' + lib.optionalString dbusSupport '' CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_CTRL_IFACE_DBUS_INTRO=y @@ -84,7 +83,7 @@ stdenv.mkDerivation rec { # not =n, as one may expect, but undefine. # # This config is sourced into makefile. - + optionalString (!dbusSupport) '' + + lib.optionalString (!dbusSupport) '' undefine CONFIG_CTRL_IFACE_DBUS undefine CONFIG_CTRL_IFACE_DBUS_NEW undefine CONFIG_CTRL_IFACE_DBUS_INTRO @@ -105,13 +104,13 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /usr/local $out export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \ -I$(echo "${lib.getDev libnl}"/include/libnl*/) \ - ${optionalString withPcsclite "-I${lib.getDev pcsclite}/include/PCSC/"}" + ${lib.optionalString withPcsclite "-I${lib.getDev pcsclite}/include/PCSC/"}" ''; buildInputs = [ openssl libnl ] - ++ optional dbusSupport dbus - ++ optional withReadline readline - ++ optional withPcsclite pcsclite; + ++ lib.optional dbusSupport dbus + ++ lib.optional withReadline readline + ++ lib.optional withPcsclite pcsclite; nativeBuildInputs = [ pkg-config ]; From 8cbfd35f75dd317cba206029c0a28d9f0096abbe Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:18:21 +0200 Subject: [PATCH 310/357] mwprocapture: remove 'with lib;' --- pkgs/os-specific/linux/mwprocapture/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 711a14845df7..b0513f5663d4 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -1,13 +1,11 @@ { lib, stdenv, fetchurl, kernel, alsa-lib }: -with lib; - let bits = if stdenv.is64bit then "64" else "32"; - libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc alsa-lib ]; + libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc alsa-lib ]; in stdenv.mkDerivation rec { @@ -56,7 +54,7 @@ stdenv.mkDerivation rec { "$out"/bin/mwcap-info ''; - meta = { + meta = with lib; { homepage = "https://www.magewell.com/"; description = "Linux driver for the Magewell Pro Capture family"; license = licenses.unfreeRedistributable; From 3269966314c0fdf99b8a14eabd797743509409e6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:18:34 +0200 Subject: [PATCH 311/357] setools: remove 'with lib;' --- pkgs/os-specific/linux/setools/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 5a2f180a0ad9..7442815f3a7d 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -3,10 +3,7 @@ , withGraphics ? false }: -with lib; -with python3.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "setools"; version = "4.5.1"; @@ -17,12 +14,12 @@ buildPythonApplication rec { hash = "sha256-/6dOzSz2Do4d6TSS50fuak0CysoQ532zJ0bJ532BUCE="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ python3.pkgs.cython ]; buildInputs = [ libsepol ]; - propagatedBuildInputs = [ enum34 libselinux networkx setuptools ] - ++ optionals withGraphics [ pyqt5 ]; + propagatedBuildInputs = with python3.pkgs; [ enum34 libselinux networkx setuptools ] + ++ lib.optionals withGraphics [ pyqt5 ]; - nativeCheckInputs = [ tox checkpolicy ]; + nativeCheckInputs = [ python3.pkgs.tox checkpolicy ]; preCheck = '' export CHECKPOLICY=${checkpolicy}/bin/checkpolicy ''; @@ -33,7 +30,7 @@ buildPythonApplication rec { export SEPOL="${lib.getLib libsepol}/lib/libsepol.a" ''; - meta = { + meta = with lib; { description = "SELinux Policy Analysis Tools"; homepage = "https://github.com/SELinuxProject/setools"; license = licenses.gpl2Only; From 7c4beba7bc4215f73593aa452f1a5cd29440a8f8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:18:45 +0200 Subject: [PATCH 312/357] selinux-sandbox: remove 'with lib;' --- pkgs/os-specific/linux/selinux-sandbox/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix index 0b4f0a203b81..cbddfc3ec50a 100644 --- a/pkgs/os-specific/linux/selinux-sandbox/default.nix +++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix @@ -4,7 +4,6 @@ # this is python3 only as it depends on selinux-python -with lib; with python3.pkgs; stdenv.mkDerivation rec { @@ -51,7 +50,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = { + meta = with lib; { description = "SELinux sandbox utility"; license = licenses.gpl2Only; homepage = "https://selinuxproject.org"; From e531f98846c62939f7bf8c81284dbd3867bf7939 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:18:55 +0200 Subject: [PATCH 313/357] selinux-python: remove 'with lib;' --- pkgs/os-specific/linux/selinux-python/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix index 121511401151..c2d91104bf4f 100644 --- a/pkgs/os-specific/linux/selinux-python/default.nix +++ b/pkgs/os-specific/linux/selinux-python/default.nix @@ -2,9 +2,6 @@ , libselinux, libsemanage, libsepol, setools }: # this is python3 only because setools only supports python3 - -with lib; - stdenv.mkDerivation rec { pname = "selinux-python"; version = "3.3"; @@ -42,7 +39,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = { + meta = with lib; { description = "SELinux policy core utilities written in Python"; license = licenses.gpl2Plus; homepage = "https://selinuxproject.org"; From 740cf778098e7b0a5b029fcb9a734d3475f2a86f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:20:58 +0200 Subject: [PATCH 314/357] rtl8192eu: remove 'with lib;' --- pkgs/os-specific/linux/rtl8192eu/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index 529f16fc1db4..425edf3309ca 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -1,7 +1,5 @@ { stdenv, lib, fetchFromGitHub, kernel, bc }: -with lib; - let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtl8192eu"; in stdenv.mkDerivation { From 22078ef36e04d80993f3bc092429b261e45d3aca Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:21:10 +0200 Subject: [PATCH 315/357] libsemanage: remove 'with lib;' --- pkgs/os-specific/linux/libsemanage/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 966ac7c945b0..1c1d66432db4 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -2,8 +2,6 @@ , enablePython ? true, swig ? null, python ? null }: -with lib; - stdenv.mkDerivation rec { pname = "libsemanage"; version = "3.7"; @@ -14,13 +12,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-4WbK4ppBfasAjbnKCHQCPzU6MBewdpOgNu2XSH7aNbE="; }; - outputs = [ "out" "dev" "man" ] ++ optional enablePython "py"; + outputs = [ "out" "dev" "man" ] ++ lib.optional enablePython "py"; strictDeps = true; - nativeBuildInputs = [ bison flex pkg-config ] ++ optional enablePython swig; + nativeBuildInputs = [ bison flex pkg-config ] ++ lib.optional enablePython swig; buildInputs = [ libsepol libselinux bzip2 audit ] - ++ optional enablePython python; + ++ lib.optional enablePython python; makeFlags = [ "PREFIX=$(out)" @@ -43,7 +41,7 @@ stdenv.mkDerivation rec { # cc1: all warnings being treated as errors env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=clobbered" ]; - installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ]; + installTargets = [ "install" ] ++ lib.optionals enablePython [ "install-pywrap" ]; enableParallelBuilding = true; From 400a0bbce50d0902162ac08119734d3d4e48d262 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:21:23 +0200 Subject: [PATCH 316/357] libselinux: remove 'with lib;' --- pkgs/os-specific/linux/libselinux/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 28cf291fd785..583f6af2bc67 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -6,14 +6,12 @@ assert enablePython -> swig != null && python3 != null; -with lib; - stdenv.mkDerivation (rec { pname = "libselinux"; version = "3.6"; inherit (libsepol) se_url; - outputs = [ "bin" "out" "dev" "man" ] ++ optional enablePython "py"; + outputs = [ "bin" "out" "dev" "man" ] ++ lib.optional enablePython "py"; src = fetchurl { url = "${se_url}/${version}/libselinux-${version}.tar.gz"; @@ -46,13 +44,13 @@ stdenv.mkDerivation (rec { }) ]; - nativeBuildInputs = [ pkg-config python3 ] ++ optionals enablePython [ + nativeBuildInputs = [ pkg-config python3 ] ++ lib.optionals enablePython [ python3Packages.pip python3Packages.setuptools python3Packages.wheel swig ]; - buildInputs = [ libsepol pcre2 fts ] ++ optionals enablePython [ python3 ]; + buildInputs = [ libsepol pcre2 fts ] ++ lib.optionals enablePython [ python3 ]; # drop fortify here since package uses it by default, leading to compile error: # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] @@ -72,11 +70,11 @@ stdenv.mkDerivation (rec { "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" "ARCH=${stdenv.hostPlatform.linuxArch}" - ] ++ optionals (fts != null) [ + ] ++ lib.optionals (fts != null) [ "FTS_LDLIBS=-lfts" - ] ++ optionals stdenv.hostPlatform.isStatic [ + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ "DISABLE_SHARED=y" - ] ++ optionals enablePython [ + ] ++ lib.optionals enablePython [ "PYTHON=${python3.pythonOnBuildForHost.interpreter}" "PYTHONLIBDIR=$(py)/${python3.sitePackages}" "PYTHON_SETUP_ARGS=--no-build-isolation" @@ -87,11 +85,11 @@ stdenv.mkDerivation (rec { --replace "#include " "" ''; - preInstall = optionalString enablePython '' + preInstall = lib.optionalString enablePython '' mkdir -p $py/${python3.sitePackages}/selinux ''; - installTargets = [ "install" ] ++ optional enablePython "install-pywrap"; + installTargets = [ "install" ] ++ lib.optional enablePython "install-pywrap"; meta = removeAttrs libsepol.meta ["outputsToInstall"] // { description = "SELinux core library"; From 3bf56ef4eacedc014a7f8278c4d76c71ceef5cd8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:21:35 +0200 Subject: [PATCH 317/357] rtl8192su-firmware: remove 'with lib;' --- pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix index 53f32ac31f9d..49a3b9c13ac4 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -1,5 +1,4 @@ { lib, stdenvNoCC, fetchFromGitHub }: -with lib; stdenvNoCC.mkDerivation { pname = "rtl8192su"; version = "unstable-2016-10-05"; From 92d44ea36fdcbfa79219ef58c951391c5ec10df1 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:21:53 +0200 Subject: [PATCH 318/357] cygwin-setup: remove 'with lib;' --- pkgs/os-specific/windows/cygwin-setup/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index 074157c182c3..a88d802c5cf7 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -2,8 +2,6 @@ , zlib, bzip2, xz, libgcrypt }: -with lib; - stdenv.mkDerivation rec { pname = "cygwin-setup"; version = "20131101"; @@ -18,9 +16,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool flex bison pkg-config ]; buildInputs = let - mkStatic = flip overrideDerivation (o: { + mkStatic = lib.flip lib.overrideDerivation (o: { dontDisableStatic = true; - configureFlags = toList (o.configureFlags or []) ++ [ "--enable-static" ]; + configureFlags = lib.toList (o.configureFlags or []) ++ [ "--enable-static" ]; buildInputs = map mkStatic (o.buildInputs or []); propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or []); }); @@ -41,6 +39,6 @@ stdenv.mkDerivation rec { meta = { homepage = "https://sourceware.org/cygwin-apps/setup.html"; description = "Tool for installing Cygwin"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } From 0a74830d712bc3d59837775dba4676dd9b037b29 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:24:22 +0200 Subject: [PATCH 319/357] linux: remove 'with lib;' --- .../linux/kernel/common-config.nix | 105 +++++++++--------- pkgs/os-specific/linux/kernel/gpio-utils.nix | 4 +- 2 files changed, 52 insertions(+), 57 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 6fbc10dcecf2..c0bc223b9a05 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -15,18 +15,15 @@ , features ? {} }: -with lib; with lib.kernel; with (lib.kernel.whenHelpers version); let - - # configuration items have to be part of a subattrs - flattenKConf = nested: mapAttrs (name: values: if length values == 1 then head values else throw "duplicate kernel configuration option: ${name}") (zipAttrs (attrValues nested)); + flattenKConf = nested: lib.mapAttrs (name: values: if lib.length values == 1 then lib.head values else throw "duplicate kernel configuration option: ${name}") (lib.zipAttrs (lib.attrValues nested)); whenPlatformHasEBPFJit = - mkIf (stdenv.hostPlatform.isAarch32 || + lib.mkIf (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isx86_64 || (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) || @@ -36,7 +33,7 @@ let debug = { # Necessary for BTF - DEBUG_INFO = mkMerge [ + DEBUG_INFO = lib.mkMerge [ (whenOlder "5.2" (if (features.debug or false) then yes else no)) (whenBetween "5.2" "5.18" yes) ]; @@ -129,7 +126,7 @@ let # Enable Pulse-Width-Modulation support, commonly used for fan and backlight. PWM = yes; - } // optionalAttrs (stdenv.hostPlatform.isx86) { + } // lib.optionalAttrs (stdenv.hostPlatform.isx86) { INTEL_IDLE = yes; INTEL_RAPL = whenAtLeast "5.3" module; X86_INTEL_LPSS = yes; @@ -170,7 +167,7 @@ let }; optimization = { - X86_GENERIC = mkIf (stdenv.hostPlatform.system == "i686-linux") yes; + X86_GENERIC = lib.mkIf (stdenv.hostPlatform.system == "i686-linux") yes; # Optimize with -O2, not -Os CC_OPTIMIZE_FOR_SIZE = no; }; @@ -188,7 +185,7 @@ let # Collect ECC errors and retire pages that fail too often RAS_CEC = yes; - } // optionalAttrs (stdenv.is32bit) { + } // lib.optionalAttrs (stdenv.is32bit) { # Enable access to the full memory range (aka PAE) on 32-bit architectures # This check isn't super accurate but it's close enough HIGHMEM = option yes; @@ -220,7 +217,7 @@ let timer = { # Enable Full Dynticks System. # NO_HZ_FULL depends on HAVE_VIRT_CPU_ACCOUNTING_GEN depends on 64BIT - NO_HZ_FULL = mkIf stdenv.is64bit yes; + NO_HZ_FULL = lib.mkIf stdenv.is64bit yes; }; # Enable NUMA. @@ -309,7 +306,7 @@ let # IPv6: Netfilter Configuration NF_TABLES_IPV6 = yes; # Bridge Netfilter Configuration - NF_TABLES_BRIDGE = mkMerge [ (whenOlder "5.3" yes) + NF_TABLES_BRIDGE = lib.mkMerge [ (whenOlder "5.3" yes) (whenAtLeast "5.3" module) ]; # Expose some debug info NF_CONNTRACK_PROCFS = yes; @@ -321,11 +318,11 @@ let # needed for ss # Use a lower priority to allow these options to be overridden in hardened/config.nix - INET_DIAG = mkDefault module; - INET_TCP_DIAG = mkDefault module; - INET_UDP_DIAG = mkDefault module; - INET_RAW_DIAG = mkDefault module; - INET_DIAG_DESTROY = mkDefault yes; + INET_DIAG = lib.mkDefault module; + INET_TCP_DIAG = lib.mkDefault module; + INET_UDP_DIAG = lib.mkDefault module; + INET_RAW_DIAG = lib.mkDefault module; + INET_DIAG_DESTROY = lib.mkDefault yes; # IPsec over TCP INET_ESPINTCP = whenAtLeast "5.8" yes; @@ -334,7 +331,7 @@ let # enable multipath-tcp MPTCP = whenAtLeast "5.6" yes; MPTCP_IPV6 = whenAtLeast "5.6" yes; - INET_MPTCP_DIAG = whenAtLeast "5.9" (mkDefault module); + INET_MPTCP_DIAG = whenAtLeast "5.9" (lib.mkDefault module); # Kernel TLS TLS = module; @@ -348,7 +345,7 @@ let # Enable debugfs for wireless drivers CFG80211_DEBUGFS = yes; MAC80211_DEBUGFS = yes; - } // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") { + } // lib.optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") { # Not enabled by default, hides modules behind it NET_VENDOR_MEDIATEK = yes; # Enable SoC interface for MT7915 module, required for MT798X. @@ -381,8 +378,8 @@ let B43_PHY_HT = option yes; BCMA_HOST_PCI = option yes; RTW88 = whenAtLeast "5.2" module; - RTW88_8822BE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; - RTW88_8822CE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; + RTW88_8822BE = lib.mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; + RTW88_8822CE = lib.mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; }; fb = { @@ -402,7 +399,7 @@ let FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = yes; FRAMEBUFFER_CONSOLE_ROTATION = yes; FRAMEBUFFER_CONSOLE_DETECT_PRIMARY = yes; - FB_GEODE = mkIf (stdenv.hostPlatform.system == "i686-linux") yes; + FB_GEODE = lib.mkIf (stdenv.hostPlatform.system == "i686-linux") yes; # Use simplefb on older kernels where we don't have simpledrm (enabled below) FB_SIMPLE = whenOlder "5.15" yes; DRM_FBDEV_EMULATION = yes; @@ -418,7 +415,7 @@ let }; video = let - whenHasDevicePrivate = mkIf (!stdenv.isx86_32 && versionAtLeast version "5.1"); + whenHasDevicePrivate = lib.mkIf (!stdenv.isx86_32 && lib.versionAtLeast version "5.1"); in { # compile in DRM so simpledrm can load before initrd if necessary AGP = yes; @@ -477,13 +474,13 @@ let # Enable CEC over DisplayPort DRM_DP_CEC = whenOlder "6.10" yes; DRM_DISPLAY_DP_AUX_CEC = whenAtLeast "6.10" yes; - } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { + } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { # Intel GVT-g graphics virtualization supports 64-bit only DRM_I915_GVT = yes; DRM_I915_GVT_KVMGT = module; # Enable Hyper-V Synthetic DRM Driver DRM_HYPERV = whenAtLeast "5.14" module; - } // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") { + } // lib.optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") { # enable HDMI-CEC on RPi boards DRM_VC4_HDMI_CEC = yes; }; @@ -493,7 +490,7 @@ let # of time to appear and this would hold up Linux kernel and Rust toolchain updates. # # Once Rust in the kernel has more users, we can reconsider enabling it by default. - rust = optionalAttrs ((features.rust or false) && versionAtLeast version "6.7") { + rust = lib.optionalAttrs ((features.rust or false) && lib.versionAtLeast version "6.7") { RUST = yes; GCC_PLUGINS = no; }; @@ -516,8 +513,8 @@ let SND_USB_CAIAQ_INPUT = yes; SND_USB_AUDIO_MIDI_V2 = whenAtLeast "6.5" yes; # Enable Sound Open Firmware support - } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" && - versionAtLeast version "5.5") { + } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" && + lib.versionAtLeast version "5.5") { SND_SOC_INTEL_SOUNDWIRE_SOF_MACH = whenAtLeast "5.10" module; SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES = whenAtLeast "5.10" yes; # dep of SOF_MACH SND_SOC_SOF_INTEL_SOUNDWIRE_LINK = whenBetween "5.10" "5.11" yes; # dep of SOF_MACH @@ -578,7 +575,7 @@ let TMPFS = yes; TMPFS_POSIX_ACL = yes; - FS_ENCRYPTION = if (versionAtLeast version "5.1") then yes else option module; + FS_ENCRYPTION = if (lib.versionAtLeast version "5.1") then yes else option module; EXT2_FS_XATTR = yes; EXT2_FS_POSIX_ACL = yes; @@ -685,8 +682,8 @@ let RANDOMIZE_BASE = option yes; STRICT_KERNEL_RWX = yes; STRICT_MODULE_RWX = yes; - STRICT_DEVMEM = mkDefault yes; # Filter access to /dev/mem - IO_STRICT_DEVMEM = mkDefault yes; + STRICT_DEVMEM = lib.mkDefault yes; # Filter access to /dev/mem + IO_STRICT_DEVMEM = lib.mkDefault yes; SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default # Prevent processes from ptracing non-children processes @@ -739,7 +736,7 @@ let # Enable stack smashing protections in schedule() # See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.8&id=0d9e26329b0c9263d4d9e0422d80a0e73268c52f SCHED_STACK_END_CHECK = yes; - } // optionalAttrs stdenv.hostPlatform.isx86_64 { + } // lib.optionalAttrs stdenv.hostPlatform.isx86_64 { # Enable Intel SGX X86_SGX = whenAtLeast "5.11" yes; # Allow KVM guests to load SGX enclaves @@ -761,7 +758,7 @@ let MITIGATION_SLS = whenAtLeast "6.9" yes; DEFAULT_MMAP_MIN_ADDR = freeform "65536"; - } // optionalAttrs stdenv.hostPlatform.isAarch64 { + } // lib.optionalAttrs stdenv.hostPlatform.isAarch64 { DEFAULT_MMAP_MIN_ADDR = freeform "32768"; }; @@ -840,9 +837,9 @@ let KSM = yes; VIRT_DRIVERS = yes; # We need 64 GB (PAE) support for Xen guest support - HIGHMEM64G = { optional = true; tristate = mkIf (!stdenv.is64bit) "y";}; + HIGHMEM64G = { optional = true; tristate = lib.mkIf (!stdenv.is64bit) "y";}; - VFIO_PCI_VGA = mkIf stdenv.is64bit yes; + VFIO_PCI_VGA = lib.mkIf stdenv.is64bit yes; UDMABUF = whenAtLeast "4.20" yes; @@ -902,7 +899,7 @@ let ZRAM_MULTI_COMP = whenAtLeast "6.2" yes; ZRAM_DEF_COMP_ZSTD = whenAtLeast "5.11" yes; ZSWAP = option yes; - ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" (mkOptionDefault yes); + ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" (lib.mkOptionDefault yes); ZPOOL = yes; ZSMALLOC = option yes; }; @@ -914,7 +911,7 @@ let }; # Support x2APIC (which requires IRQ remapping) - x2apic = optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { + x2apic = lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { X86_X2APIC = yes; IRQ_REMAP = yes; }; @@ -945,18 +942,18 @@ let # Allows soft-dirty tracking on pages, used by CRIU. # See https://docs.kernel.org/admin-guide/mm/soft-dirty.html - MEM_SOFT_DIRTY = mkIf (!stdenv.isx86_32) yes; + MEM_SOFT_DIRTY = lib.mkIf (!stdenv.isx86_32) yes; }; misc = let # Use zstd for kernel compression if 64-bit and newer than 5.9, otherwise xz. # i686 issues: https://github.com/NixOS/nixpkgs/pull/117961#issuecomment-812106375 - useZstd = stdenv.buildPlatform.is64bit && versionAtLeast version "5.9"; + useZstd = stdenv.buildPlatform.is64bit && lib.versionAtLeast version "5.9"; in { # stdenv.hostPlatform.linux-kernel.target assumes uncompressed on RISC-V. - KERNEL_UNCOMPRESSED = mkIf stdenv.hostPlatform.isRiscV yes; - KERNEL_XZ = mkIf (!stdenv.hostPlatform.isRiscV && !useZstd) yes; - KERNEL_ZSTD = mkIf (!stdenv.hostPlatform.isRiscV && useZstd) yes; + KERNEL_UNCOMPRESSED = lib.mkIf stdenv.hostPlatform.isRiscV yes; + KERNEL_XZ = lib.mkIf (!stdenv.hostPlatform.isRiscV && !useZstd) yes; + KERNEL_ZSTD = lib.mkIf (!stdenv.hostPlatform.isRiscV && useZstd) yes; HID_BATTERY_STRENGTH = yes; # enabled by default in x86_64 but not arm64, so we do that here @@ -1058,7 +1055,7 @@ let # Generic compression support for EFI payloads # Add new platforms only after they have been verified to build and boot. # This is unsupported on x86 due to a custom decompression mechanism. - EFI_ZBOOT = mkIf stdenv.hostPlatform.isAarch64 (whenAtLeast "6.1" yes); + EFI_ZBOOT = lib.mkIf stdenv.hostPlatform.isAarch64 (whenAtLeast "6.1" yes); CGROUPS = yes; # used by systemd FHANDLE = yes; # used by systemd @@ -1092,7 +1089,7 @@ let NVME_MULTIPATH = yes; - NVME_AUTH = mkMerge [ + NVME_AUTH = lib.mkMerge [ (whenBetween "6.0" "6.7" yes) (whenAtLeast "6.7" module) ]; @@ -1105,7 +1102,7 @@ let NVME_TARGET_AUTH = whenAtLeast "6.0" yes; NVME_TARGET_TCP_TLS = whenAtLeast "6.7" yes; - PCI_P2PDMA = mkIf (stdenv.hostPlatform.is64bit && versionAtLeast version "4.20") yes; + PCI_P2PDMA = lib.mkIf (stdenv.hostPlatform.is64bit && lib.versionAtLeast version "4.20") yes; PSI = whenAtLeast "4.20" yes; @@ -1171,8 +1168,8 @@ let HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support # Enable AMD's ROCm GPU compute stack - HSA_AMD = mkIf stdenv.hostPlatform.is64bit (whenAtLeast "4.20" yes); - ZONE_DEVICE = mkIf stdenv.hostPlatform.is64bit (whenAtLeast "5.3" yes); + HSA_AMD = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "4.20" yes); + ZONE_DEVICE = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "5.3" yes); HMM_MIRROR = whenAtLeast "5.3" yes; DRM_AMDGPU_USERPTR = whenAtLeast "5.3" yes; @@ -1190,7 +1187,7 @@ let LRU_GEN = whenAtLeast "6.1" yes; LRU_GEN_ENABLED = whenAtLeast "6.1" yes; - FSL_MC_UAPI_SUPPORT = mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "5.12" yes); + FSL_MC_UAPI_SUPPORT = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "5.12" yes); ASHMEM = { optional = true; tristate = whenBetween "5.0" "5.18" "y";}; ANDROID = { optional = true; tristate = whenBetween "5.0" "5.19" "y";}; @@ -1219,7 +1216,7 @@ let # Enable generic kernel watch queues # See https://docs.kernel.org/core-api/watch_queue.html WATCH_QUEUE = whenAtLeast "5.8" yes; - } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { + } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable CPU/memory hotplug support # Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot ACPI_HOTPLUG_CPU = yes; @@ -1236,7 +1233,7 @@ let # Enable LEDS to display link-state status of PHY devices (i.e. eth lan/wan interfaces) LED_TRIGGER_PHY = whenAtLeast "4.10" yes; - } // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.system == "aarch64-linux") { + } // lib.optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enables support for the Allwinner Display Engine 2.0 SUN8I_DE2_CCU = yes; @@ -1262,7 +1259,7 @@ let # This is the default on armv7l, anyway, but it is explicitly # enabled here for the sake of providing context for the # aarch64 compat option which follows. - ALIGNMENT_TRAP = mkIf (stdenv.hostPlatform.system == "armv7l-linux") yes; + ALIGNMENT_TRAP = lib.mkIf (stdenv.hostPlatform.system == "armv7l-linux") yes; # https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220701135322.3025321-1-ardb@kernel.org/ # tldr: @@ -1274,8 +1271,8 @@ let # This minimizes the potential for aarch32 userspace to behave # differently when run under aarch64 kernels compared to when # it is run under an aarch32 kernel. - COMPAT_ALIGNMENT_FIXUPS = mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "6.1" yes); - } // optionalAttrs (versionAtLeast version "5.4" && (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux")) { + COMPAT_ALIGNMENT_FIXUPS = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "6.1" yes); + } // lib.optionalAttrs (lib.versionAtLeast version "5.4" && (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux")) { # Required for various hardware features on Chrome OS devices CHROME_PLATFORMS = yes; CHROMEOS_TBMC = module; @@ -1290,10 +1287,10 @@ let CROS_KBD_LED_BACKLIGHT = module; TCG_TIS_SPI_CR50 = whenAtLeast "5.5" yes; - } // optionalAttrs (versionAtLeast version "5.4" && stdenv.hostPlatform.system == "x86_64-linux") { + } // lib.optionalAttrs (lib.versionAtLeast version "5.4" && stdenv.hostPlatform.system == "x86_64-linux") { CHROMEOS_LAPTOP = module; CHROMEOS_PSTORE = module; - } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { + } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { # Enable x86 resource control X86_CPU_RESCTRL = whenAtLeast "5.0" yes; diff --git a/pkgs/os-specific/linux/kernel/gpio-utils.nix b/pkgs/os-specific/linux/kernel/gpio-utils.nix index dc8f88b5769f..88b8efbe540c 100644 --- a/pkgs/os-specific/linux/kernel/gpio-utils.nix +++ b/pkgs/os-specific/linux/kernel/gpio-utils.nix @@ -1,7 +1,5 @@ { lib, stdenv, linux }: -with lib; - stdenv.mkDerivation { pname = "gpio-utils"; version = linux.version; @@ -15,7 +13,7 @@ stdenv.mkDerivation { separateDebugInfo = true; installFlags = [ "install" "DESTDIR=$(out)" "bindir=/bin" ]; - meta = { + meta = with lib; { description = "Linux tools to inspect the gpiochip interface"; maintainers = with maintainers; [ kwohlfahrt ]; platforms = platforms.linux; From 0020ef8cc4269cd75f76d25858cf71e6654ef39d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:24:49 +0200 Subject: [PATCH 320/357] linux/hardened: remove 'with lib;' --- pkgs/os-specific/linux/kernel/hardened/config.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 0ab89d23952d..f655f85f490e 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -10,11 +10,10 @@ { stdenv, lib, version }: -with lib; with lib.kernel; with (lib.kernel.whenHelpers version); -assert (versionAtLeast version "4.9"); +assert (lib.versionAtLeast version "4.9"); { # Mark LSM hooks read-only after init. SECURITY_WRITABLE_HOOKS n From 8a09548195896a0abe7dd014e397ae7e73531192 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:25:39 +0200 Subject: [PATCH 321/357] linuxPackages.nvidiaPackages: remove 'with lib;' --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 5907c6e81e43..87fde8db2340 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -59,19 +59,17 @@ , acceptLicense ? config.nvidia.acceptLicense or false }: -with lib; - assert !libsOnly -> kernel != null; -assert versionOlder version "391" -> sha256_32bit != null; +assert lib.versionOlder version "391" -> sha256_32bit != null; assert useSettings -> settingsSha256 != null; assert usePersistenced -> persistencedSha256 != null; assert useFabricmanager -> fabricmanagerSha256 != null; assert useFabricmanager -> !useSettings; let - nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; - pkgSuffix = optionalString (versionOlder version "304") "-pkg0"; - i686bundled = versionAtLeast version "391" && !disable32Bit; + nameSuffix = lib.optionalString (!libsOnly) "-${kernel.version}"; + pkgSuffix = lib.optionalString (lib.versionOlder version "304") "-pkg0"; + i686bundled = lib.versionAtLeast version "391" && !disable32Bit; libPathFor = pkgs: lib.makeLibraryPath (with pkgs; [ libdrm @@ -153,15 +151,15 @@ let inherit i686bundled; outputs = [ "out" ] - ++ optional i686bundled "lib32" - ++ optional (!libsOnly) "bin" - ++ optional (!libsOnly && firmware) "firmware"; + ++ lib.optional i686bundled "lib32" + ++ lib.optional (!libsOnly) "bin" + ++ lib.optional (!libsOnly && firmware) "firmware"; outputDev = if libsOnly then null else "bin"; kernel = if libsOnly then null else kernel.dev; kernelVersion = if libsOnly then null else kernel.modDirVersion; - makeFlags = optionals (!libsOnly) (kernel.makeFlags ++ [ + makeFlags = lib.optionals (!libsOnly) (kernel.makeFlags ++ [ "IGNORE_PREEMPT_RT_PRESENCE=1" "NV_BUILD_SUPPORTS_HMM=1" "SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" @@ -174,12 +172,12 @@ let dontPatchELF = true; libPath = libPathFor pkgs; - libPath32 = optionalString i686bundled (libPathFor pkgsi686Linux); + libPath32 = lib.optionalString i686bundled (libPathFor pkgsi686Linux); nativeBuildInputs = [ perl nukeReferences which libarchive jq ] - ++ optionals (!libsOnly) kernel.moduleBuildDependencies; + ++ lib.optionals (!libsOnly) kernel.moduleBuildDependencies; - disallowedReferences = optionals (!libsOnly) [ kernel.dev ]; + disallowedReferences = lib.optionals (!libsOnly) [ kernel.dev ]; passthru = let @@ -199,7 +197,7 @@ let }); in { - open = mapNullable + open = lib.mapNullable (hash: callPackage ./open.nix { inherit hash; nvidia_x11 = self; @@ -216,7 +214,7 @@ let } else { }; persistenced = if usePersistenced then - mapNullable + lib.mapNullable (hash: callPackage (import ./persistenced.nix self hash) { fetchFromGitHub = fetchFromGithubOrNvidia; }) @@ -224,12 +222,12 @@ let else { }; fabricmanager = if useFabricmanager then - mapNullable (hash: callPackage (import ./fabricmanager.nix self hash) { }) fabricmanagerSha256 + lib.mapNullable (hash: callPackage (import ./fabricmanager.nix self hash) { }) fabricmanagerSha256 else { }; inherit persistencedVersion settingsVersion; compressFirmware = false; ibtSupport = ibtSupport || (lib.versionAtLeast version "530"); - } // optionalAttrs (!i686bundled) { + } // lib.optionalAttrs (!i686bundled) { inherit lib32; }; @@ -238,8 +236,8 @@ let description = "${if useFabricmanager then "Data Center" else "X.org"} driver and kernel module for NVIDIA cards"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ] - ++ optionals (sha256_32bit != null) [ "i686-linux" ] - ++ optionals (sha256_aarch64 != null) [ "aarch64-linux" ]; + ++ lib.optionals (sha256_32bit != null) [ "i686-linux" ] + ++ lib.optionals (sha256_aarch64 != null) [ "aarch64-linux" ]; maintainers = with maintainers; [ kiskae edwtjo ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" inherit broken; From 9b63020bc6ce13a8b5d3c9b8add2693baa213634 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:26:07 +0200 Subject: [PATCH 322/357] julia.withPackages: remove 'with lib;' --- pkgs/development/julia-modules/extra-python-packages.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/julia-modules/extra-python-packages.nix b/pkgs/development/julia-modules/extra-python-packages.nix index 30e5179b3820..14731fb9de35 100644 --- a/pkgs/development/julia-modules/extra-python-packages.nix +++ b/pkgs/development/julia-modules/extra-python-packages.nix @@ -3,9 +3,6 @@ }: # This file contains an extra mapping from Julia packages to the Python packages they depend on. - -with lib; - rec { packageMapping = { ExcelFiles = ["xlrd"]; @@ -14,9 +11,9 @@ rec { SymPy = ["sympy"]; }; - getExtraPythonPackages = names: concatMap (name: let - allCandidates = if hasAttr name packageMapping then getAttr name packageMapping else []; + getExtraPythonPackages = names: lib.concatMap (name: let + allCandidates = if lib.hasAttr name packageMapping then lib.getAttr name packageMapping else []; in - filter (x: hasAttr x python3.pkgs) allCandidates + lib.filter (x: lib.hasAttr x python3.pkgs) allCandidates ) names; } From 1517dd9072c4db97dd2f3e785bbbafff38c48e81 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 13 Aug 2024 22:22:36 +0200 Subject: [PATCH 323/357] tests.kernel-config: remove 'with lib;' --- pkgs/test/kernel.nix | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/test/kernel.nix b/pkgs/test/kernel.nix index e345d9fa207e..210d69f7ffae 100644 --- a/pkgs/test/kernel.nix +++ b/pkgs/test/kernel.nix @@ -2,9 +2,6 @@ # common-config.nix { lib, pkgs }: -with lib; -with kernel; - let lts_kernel = pkgs.linuxPackages.kernel; @@ -14,29 +11,29 @@ let structuredExtraConfig = structuredConfig; }).configfile.structuredConfig; - mandatoryVsOptionalConfig = mkMerge [ - { NIXOS_FAKE_USB_DEBUG = yes;} - { NIXOS_FAKE_USB_DEBUG = option yes; } + mandatoryVsOptionalConfig = lib.mkMerge [ + { NIXOS_FAKE_USB_DEBUG = lib.kernel.yes;} + { NIXOS_FAKE_USB_DEBUG = lib.kernel.option lib.kernel.yes; } ]; - freeformConfig = mkMerge [ - { NIXOS_FAKE_MMC_BLOCK_MINORS = freeform "32"; } # same as default, won't trigger any error - { NIXOS_FAKE_MMC_BLOCK_MINORS = freeform "64"; } # will trigger an error but the message is not great: + freeformConfig = lib.mkMerge [ + { NIXOS_FAKE_MMC_BLOCK_MINORS = lib.kernel.freeform "32"; } # same as default, won't trigger any error + { NIXOS_FAKE_MMC_BLOCK_MINORS = lib.kernel.freeform "64"; } # will trigger an error but the message is not great: ]; - mkDefaultWorksConfig = mkMerge [ - { "NIXOS_TEST_BOOLEAN" = yes; } - { "NIXOS_TEST_BOOLEAN" = lib.mkDefault no; } + mkDefaultWorksConfig = lib.mkMerge [ + { "NIXOS_TEST_BOOLEAN" = lib.kernel.yes; } + { "NIXOS_TEST_BOOLEAN" = lib.mkDefault lib.kernel.no; } ]; - allOptionalRemainOptional = mkMerge [ - { NIXOS_FAKE_USB_DEBUG = option yes;} - { NIXOS_FAKE_USB_DEBUG = option yes;} + allOptionalRemainOptional = lib.mkMerge [ + { NIXOS_FAKE_USB_DEBUG = lib.kernel.option lib.kernel.yes;} + { NIXOS_FAKE_USB_DEBUG = lib.kernel.option lib.kernel.yes;} ]; - failures = runTests { + failures = lib.runTests { testEasy = { - expr = (getConfig { NIXOS_FAKE_USB_DEBUG = yes;}).NIXOS_FAKE_USB_DEBUG; + expr = (getConfig { NIXOS_FAKE_USB_DEBUG = lib.kernel.yes;}).NIXOS_FAKE_USB_DEBUG; expected = { tristate = "y"; optional = false; freeform = null; }; }; From 639a4a7026060513c504098c85649f0271c2b786 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 15 Aug 2024 19:49:20 +0200 Subject: [PATCH 324/357] wolfram-engine: remove 'with lib;' --- pkgs/applications/science/math/wolfram-engine/l10ns.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/wolfram-engine/l10ns.nix b/pkgs/applications/science/math/wolfram-engine/l10ns.nix index af80c3e37b32..2682b6d71a1b 100644 --- a/pkgs/applications/science/math/wolfram-engine/l10ns.nix +++ b/pkgs/applications/science/math/wolfram-engine/l10ns.nix @@ -63,8 +63,7 @@ minVersion = else majorVersion; maxVersion = toString (1 + builtins.fromJSON minVersion); in -with lib; -findFirst (l: (l.lang == lang +lib.findFirst (l: (l.lang == lang && l.version >= minVersion && l.version < maxVersion)) (throw "Version ${minVersion} in language ${lang} not supported") From 0d80a75fb3382d6ca554f10cedaf916dacd277cd Mon Sep 17 00:00:00 2001 From: e1mo Date: Tue, 6 Aug 2024 21:31:56 +0200 Subject: [PATCH 325/357] dokuwiki: 2023-04-04a -> 2023-04-04b Fixes an XSS Vulnerability reported in https://github.com/dokuwiki/dokuwiki/issues/4305 --- pkgs/servers/web-apps/dokuwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix index 658fed9de369..a08b15f3bfb7 100644 --- a/pkgs/servers/web-apps/dokuwiki/default.nix +++ b/pkgs/servers/web-apps/dokuwiki/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dokuwiki"; - version = "2024-02-06a"; + version = "2024-02-06b"; src = fetchFromGitHub { owner = "dokuwiki"; repo = pname; rev = "release-${version}"; - sha256 = "sha256-gAoEUskTTbcpHgDUBSsAv6QQDvPuxQ1jXZ4TTKrjWIU="; + sha256 = "sha256-jrxsVBStvRxHCAOGVUkqtzE75wRBiVR+KxSCNuI2vnk="; }; preload = writeText "preload.php" '' From e94d59e8e2afc4951ae81294e9b7cce93e58c1d8 Mon Sep 17 00:00:00 2001 From: e1mo Date: Tue, 6 Aug 2024 21:32:42 +0200 Subject: [PATCH 326/357] dokuwiki: add e1mo as maintainer --- pkgs/servers/web-apps/dokuwiki/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix index a08b15f3bfb7..cf20b3cc993e 100644 --- a/pkgs/servers/web-apps/dokuwiki/default.nix +++ b/pkgs/servers/web-apps/dokuwiki/default.nix @@ -86,6 +86,9 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; homepage = "https://www.dokuwiki.org"; platforms = platforms.all; - maintainers = with maintainers; [ _1000101 ]; + maintainers = with maintainers; [ + _1000101 + e1mo + ]; }; } From 38d30449612e41ab0a0ab4dbca3655bc4b2735aa Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 16 Aug 2024 17:10:44 +0300 Subject: [PATCH 327/357] angie: 1.6.1 -> 1.6.2 --- pkgs/servers/http/angie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix index bb27b5820e9a..e77647ffe4b1 100644 --- a/pkgs/servers/http/angie/default.nix +++ b/pkgs/servers/http/angie/default.nix @@ -8,12 +8,12 @@ }@args: callPackage ../nginx/generic.nix args rec { - version = "1.6.1"; + version = "1.6.2"; pname = if withQuic then "angieQuic" else "angie"; src = fetchurl { url = "https://download.angie.software/files/angie-${version}.tar.gz"; - hash = "sha256-VQreIqK6cIa2ffRx5mUtPbEuTnXrCmm2KLQH5US92Rs="; + hash = "sha256-5+7FFnf3WHzFf9EyYMAyL6dozaqEkhWzFdrU4OcfXFk="; }; configureFlags = lib.optionals withAcme [ From 5c30512e09c15ff9d5a214d75093eb368e83829c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 3 Aug 2024 11:18:53 +0200 Subject: [PATCH 328/357] doc/using/overrides: manage package option expectations We haven't been good at managing expectations about this, so let's tell people what level of support they can expect. I think the place people are most likely to see it is the place where they learn about overriding in the first place, so I've added it here. Co-authored-by: Valentin Gagarin --- doc/using/overrides.chapter.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/using/overrides.chapter.md b/doc/using/overrides.chapter.md index 8c6ed79076c2..27a042963dd6 100644 --- a/doc/using/overrides.chapter.md +++ b/doc/using/overrides.chapter.md @@ -40,6 +40,13 @@ import pkgs.path { overlays = [ (self: super: { In the first example, `pkgs.foo` is the result of a function call with some default arguments, usually a derivation. Using `pkgs.foo.override` will call the same function with the given new arguments. +Many packages, like the `foo` example above, provide package options with default values in their arguments, to facilitate overriding. +Because it's not usually feasible to test that packages build with all combinations of options, you might find that a package doesn't build if you override options to non-default values. + +Package maintainers are not expected to fix arbitrary combinations of options. +If you find that something doesn't work, please submit a fix, ideally with a regression test. +If you want to ensure that things keep working, consider [becoming a maintainer](https://github.com/NixOS/nixpkgs/tree/master/maintainers) for the package. + ## <pkg>.overrideAttrs {#sec-pkg-overrideAttrs} The function `overrideAttrs` allows overriding the attribute set passed to a `stdenv.mkDerivation` call, producing a new derivation based on the original one. This function is available on all derivations produced by the `stdenv.mkDerivation` function, which is most packages in the nixpkgs expression `pkgs`. From 63f91202f5cd071187ede5e5ffc56003cb442876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 16 Aug 2024 16:16:45 +0200 Subject: [PATCH 329/357] harmonia: 1.0.0 -> 1.0.1 --- pkgs/by-name/ha/harmonia/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/harmonia/package.nix b/pkgs/by-name/ha/harmonia/package.nix index 529282cdb73d..bf29a431d408 100644 --- a/pkgs/by-name/ha/harmonia/package.nix +++ b/pkgs/by-name/ha/harmonia/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "harmonia"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "harmonia"; rev = "refs/tags/harmonia-v${version}"; - hash = "sha256-S5UU6/JZzp4mJKplhpJjcACr+M1rQCFQFWuyk9Wwumg="; + hash = "sha256-K4pll1YUqCkiqUxyWMgPKzNEJ2AMf3C/5YVBOn0SFtw="; }; - cargoHash = "sha256-iCltPaWNq9vWgPfjNYikoU25X8wzlM4ruYI+WgHYv7U="; + cargoHash = "sha256-1ITnTlLVgSC0gsXtELHOPqM4jPZd0TeVgM5GYkqaNVA="; doCheck = false; From febde5e54bcf66b47fe0d3069b6cb435ce727718 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 16 Aug 2024 16:44:54 +0300 Subject: [PATCH 330/357] 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 331/357] 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 332/357] 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 a48be315e12d6055bb7bcf2cd862507aff669a74 Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Fri, 16 Aug 2024 16:24:13 +0100 Subject: [PATCH 333/357] home-assistant.frontend: Update homepage and description --- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 6a25625374a8..480b23216e3f 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -22,8 +22,8 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "Polymer frontend for Home Assistant"; - homepage = "https://github.com/home-assistant/home-assistant-polymer"; + description = "Frontend for Home Assistant"; + homepage = "https://github.com/home-assistant/frontend"; license = licenses.asl20; maintainers = teams.home-assistant.members; }; From 6f8ad7e4d0bcb4e93aced92ebe7a9b45a8150a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 16 Aug 2024 11:15:53 +0200 Subject: [PATCH 334/357] deconz: 2.27.6 -> 2.28.0 Fixes the login redirect issue: https://forum.phoscon.de/t/web-access-not-working/5023/4 --- pkgs/servers/deconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/deconz/default.nix b/pkgs/servers/deconz/default.nix index eb2189bcd3db..0d18de0781b7 100644 --- a/pkgs/servers/deconz/default.nix +++ b/pkgs/servers/deconz/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "deconz"; - version = "2.27.6"; + version = "2.28.0"; src = fetchurl { url = "https://deconz.dresden-elektronik.de/ubuntu/beta/deconz-${version}-qt5.deb"; - sha256 = "sha256-cEEkXVNyTP922Xgr5ekR9DX0n1uHy1dw77mlnVDRR1U="; + sha256 = "sha256-/lsPhpG8z4nNRuk55n7Xo1Q97muWk33Uo3vmX5GxPxU="; }; nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper wrapQtAppsHook ]; From bbfd5d10851a4953301e0373d8749b8fe41bc31f Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 14 Aug 2024 15:15:25 +0100 Subject: [PATCH 335/357] {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 336/357] 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 337/357] 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 338/357] 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 339/357] 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 340/357] 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 341/357] 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 342/357] 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 343/357] 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 344/357] 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 345/357] 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 346/357] 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 347/357] 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 348/357] 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 349/357] 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 350/357] 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 351/357] 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 352/357] 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 353/357] 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 354/357] 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 355/357] 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 356/357] 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 357/357] 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"];