From c957ca18cef708be6f1744573b4c06bd7b4934d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Oct 2023 05:48:57 +0000 Subject: [PATCH 01/73] miniupnpc: 2.2.4 -> 2.2.5 --- pkgs/tools/networking/miniupnpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 80b199b922c0..994649404530 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "miniupnpc"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz"; - sha256 = "0jrc84lkc7xb53rb8dbswxrxj21ndj1iiclmk3r9wkp6xm55w6j8"; + sha256 = "sha256-OKzV9GAvfPi83B7DCy1Y2y6ZEuXZ9TUN2ZsGv9/7UXw="; }; nativeBuildInputs = [ cmake ]; From e51dee59de9457044c41ca7fcadd94f2a17bc57d Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 10 Oct 2023 17:35:11 +0200 Subject: [PATCH 02/73] buildMozillaMach: allow distinct source and package versions Signed-off-by: Christoph Heiss --- pkgs/applications/networking/browsers/firefox/common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index bb4b1ba0a85d..8a9cc71d083f 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,5 +1,6 @@ { pname , version +, packageVersion ? version , meta , updateScript ? null , binaryName ? "firefox" @@ -206,7 +207,7 @@ in buildStdenv.mkDerivation { pname = "${pname}-unwrapped"; - inherit version; + version = packageVersion; inherit src unpackPhase meta; @@ -557,7 +558,6 @@ buildStdenv.mkDerivation { passthru = { inherit application extraPatches; inherit updateScript; - inherit version; inherit alsaSupport; inherit binaryName; inherit jackSupport; @@ -569,6 +569,7 @@ buildStdenv.mkDerivation { inherit tests; inherit gtk3; inherit wasiSysRoot; + version = packageVersion; } // extraPassthru; hardeningDisable = [ "format" ]; # -Werror=format-security From 049f547e9591e71632f9606183344727f04796b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Oct 2023 14:56:11 +0000 Subject: [PATCH 03/73] python310Packages.pysigma-backend-elasticsearch: 1.0.7 -> 1.0.9 --- .../python-modules/pysigma-backend-elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index 4461c02c8cab..e6b55788735a 100644 --- a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-elasticsearch"; - version = "1.0.7"; + version = "1.0.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; rev = "refs/tags/v${version}"; - hash = "sha256-qvWrMucaSx7LltWYru30qVPDTVHtuqf8tKGFL+Fl8fU="; + hash = "sha256-OZaUKEEvgEIukEcAHB9ci/XWCU+h1CvQTU3gwWBOBkY="; }; postPatch = '' From 1ab05aa5dfbf96a6ead9749b5ab98ed08a39d5e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Oct 2023 13:56:39 +0000 Subject: [PATCH 04/73] jellyfin-ffmpeg: 6.0-6 -> 6.0-7 --- pkgs/development/libraries/jellyfin-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index a14a220f5199..ff2fca37fba4 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -9,13 +9,13 @@ nv-codec-headers-11 = nv-codec-headers-12; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "6.0-6"; + version = "6.0-7"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-jOKVS+BMADS/jIagOnYwxeGTpTMySmGlOHkPD2LJdkA="; + sha256 = "sha256-Z4getn/mVYIRANkIOyt7jMpcqHBvq5GXLK/ST5zV1r4="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; From d9c88e76399d7b8928774df6f0f9fec3c9ea62ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Oct 2023 17:39:46 +0000 Subject: [PATCH 05/73] python311Packages.oci: 2.112.4 -> 2.113.0 --- pkgs/development/python-modules/oci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 34a79c198309..5101460704fd 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.112.4"; + version = "2.113.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-ilYlG0bPoMlCs0D49ZJaDgh/xoY+qsHlfJKHPkepe9Q="; + hash = "sha256-Ui7/rD307fSdAPexZF9VU4NC9udjEGcFpjg/Ob6GVvo="; }; pythonRelaxDeps = [ From dea0729772f44891abd92c3d5a2f5cb74cd037cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Oct 2023 00:53:52 +0000 Subject: [PATCH 06/73] qjackctl: 0.9.11 -> 0.9.12 --- pkgs/applications/audio/qjackctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index bc384f68a676..c7a6bd89328f 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - version = "0.9.11"; + version = "0.9.12"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally @@ -14,7 +14,7 @@ mkDerivation rec { owner = "rncbc"; repo = "qjackctl"; rev = "${pname}_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-dZW9bZ17O/1DxBr5faYSE+YkSuz7NIJSc1vqxzOOxyg="; + sha256 = "sha256-S8fEg8joFHgk6MKWeSxPyTM8O6Ffx5NG90OabPPDs7s="; }; buildInputs = [ From 08e942a74daef2d49d5c2661a2fc8af8d99f7fcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Oct 2023 09:29:22 +0000 Subject: [PATCH 07/73] doctl: 1.99.0 -> 1.100.0 --- pkgs/development/tools/doctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 31e6a3e71d54..074d4f54745e 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.99.0"; + version = "1.100.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-xwkbekTnwisgr1gkUewMkz0E5iQg6bWgVz8tne7ME9Y="; + sha256 = "sha256-1NQ09Cn62VUi670y1jq8W05a9dg1CdQypIIh1QmR0p0="; }; meta = with lib; { From 4c62744a6709d412eaa14887fab625fcc8fc11e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Oct 2023 05:21:10 +0000 Subject: [PATCH 08/73] egl-wayland: 1.1.12 -> 1.1.13 --- pkgs/development/libraries/egl-wayland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index 66e05dc9af11..f84b44007e29 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.12"; + version = "1.1.13"; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Nvidia"; repo = pname; rev = version; - hash = "sha256-KxlUuoj2HJhkqkIX+Pic/0+36g/N3qfAAlnvYO2Y6uQ="; + hash = "sha256-NA+jr27aYu0XPG9sxnBtjeBTFHmV7TENRsFy8dDdNUc="; }; postPatch = '' From b9da7b77e0b81de43cef9c41cf7252edcb2201cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Oct 2023 00:06:28 +0000 Subject: [PATCH 09/73] supabase-cli: 1.102.2 -> 1.107.0 --- pkgs/development/tools/supabase-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index c7807fc9c6d0..ccdd0ff05cba 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.102.2"; + version = "1.107.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-EhGGqBJdAnlccUFDUqzbujaVnQ8VggjY6vlGjI80TN8="; + hash = "sha256-uR7Iu1PdnzWp9+IJ5szUR6r+qKckyD6LFgsY5YQxT5c="; }; - vendorHash = "sha256-AiYLSXDmTrswAd64PjF0OH0/z4blAP68HfWlwL48fww="; + vendorHash = "sha256-gWGoRKlSo0C1gFU/kC4DcgOl0Mp5LCTpSZ1Yav0ZL9c="; ldflags = [ "-s" From 5c1fe73db9284938ae597591c3fe265ea08c215f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 10 Oct 2023 04:52:12 +0100 Subject: [PATCH 10/73] libsigcxx12: remove unused Rest of `nixpkgs` tree uses `libsigcxx` and libsigcxx30`. --- pkgs/development/libraries/libsigcxx/1.2.nix | 23 -------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 pkgs/development/libraries/libsigcxx/1.2.nix diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix deleted file mode 100644 index 2e8b788ecc25..000000000000 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ /dev/null @@ -1,23 +0,0 @@ -{lib, stdenv, fetchurl, pkg-config, m4}: - -stdenv.mkDerivation rec { - pname = "libsigc++"; - version = "1.2.7"; - - src = fetchurl { - url = "mirror://gnome/sources/libsigc++/1.2/libsigc++-${version}.tar.bz2"; - sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ m4]; - - meta = with lib; { - broken = stdenv.isDarwin; - homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; - description = "A typesafe callback system for standard C++"; - branch = "1.2"; - platforms = platforms.unix; - license = licenses.lgpl3; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e8a8f03a4841..6f0239515665 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -423,6 +423,7 @@ mapAliases ({ librtlsdr = rtl-sdr; # Added 2023-02-18 librewolf-wayland = librewolf; # Added 2022-11-15 libseat = seatd; # Added 2021-06-24 + libsigcxx12 = throw "'libsigcxx12' has been removed, please use newer versions"; # Added 2023-10-20 libsForQt515 = libsForQt5; # Added 2022-11-24 libtensorflow-bin = libtensorflow; # Added 2022-09-25 libtorrentRasterbar = libtorrent-rasterbar; # Added 2020-12-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ce74e11a25f..ffcf556e6d93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23648,8 +23648,6 @@ with pkgs; libsigcxx = callPackage ../development/libraries/libsigcxx { }; - libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { }; - libsigcxx30 = callPackage ../development/libraries/libsigcxx/3.0.nix { }; libsigsegv = callPackage ../development/libraries/libsigsegv { }; From e34d4d2001fad65879f3b8ab978cfe738e57a7f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Oct 2023 11:28:21 +0000 Subject: [PATCH 11/73] ooniprobe-cli: 3.18.1 -> 3.19.0 --- pkgs/tools/networking/ooniprobe-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix index 16287b417746..baf0ba802c0f 100644 --- a/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.18.1"; + version = "3.19.0"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; rev = "v${version}"; - hash = "sha256-abCglaMFW6zPc53IU8Bgl/SaoIh1N9i3xDcfOnJypls="; + hash = "sha256-W3C4KbZnOdljofnlYZk/F6E77/AXjdNTRoWrtoEVfqg="; }; - vendorHash = "sha256-olirtvnOIKvNXJsanv5UFTcpj7RpPAa5OP0qYTv4wtk="; + vendorHash = "sha256-wEhh0nMdFH9wLfNSxYvbkbtu69cNEmVpQDk57/gdnw8="; subPackages = [ "cmd/ooniprobe" ]; From dbd4d678f88e1d14c3d49ee8c2d5020808087e22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Oct 2023 05:26:54 +0000 Subject: [PATCH 12/73] trinsic-cli: 1.11.0 -> 1.12.0 --- pkgs/tools/admin/trinsic-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/trinsic-cli/default.nix b/pkgs/tools/admin/trinsic-cli/default.nix index cab4f195dc95..bc9b0568cf5f 100644 --- a/pkgs/tools/admin/trinsic-cli/default.nix +++ b/pkgs/tools/admin/trinsic-cli/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "trinsic-cli"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "https://github.com/trinsic-id/sdk/releases/download/v${version}/trinsic-cli-vendor-${version}.tar.gz"; - sha256 = "sha256-kWdayQRV/VHgvBhGLc67qTXFz6Ufec6h+1ihrIdkCs4="; + sha256 = "sha256-dKVbiqLhcN8QALOyvTIlgsODWOQv6zRBXrRVB6KxpJg="; }; cargoVendorDir = "vendor"; From 45fcd52d33782f3c3836ae1423ede853033a313f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Oct 2023 22:07:43 +0000 Subject: [PATCH 13/73] upbound: 0.19.1 -> 0.21.0 --- pkgs/development/tools/upbound/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/upbound/default.nix b/pkgs/development/tools/upbound/default.nix index 04b4e45500b5..c4b2a421b431 100644 --- a/pkgs/development/tools/upbound/default.nix +++ b/pkgs/development/tools/upbound/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "upbound"; - version = "0.19.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = pname; repo = "up"; rev = "v${version}"; - sha256 = "sha256-Dr6EKpKVy2DLhivJ42Bx+WJL2L710sQlXroaAm66Gpo="; + sha256 = "sha256-SvnmdpsdXbPSC+4inoMvu55az33Zucqf4c3yQ0g6EMw="; }; - vendorHash = "sha256-J7rZAvEx0jgkhJIEE19rV2WdBCIvkqYzB72ZiABs56U="; + vendorHash = "sha256-ai+Mro/ooUElJJq8BbnCo9PupIAwlanDeh+oe5otJJ4="; subPackages = [ "cmd/docker-credential-up" "cmd/up" ]; From d8a520abc7b2491a514a6473372018a59eee782b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 22 Oct 2023 18:32:29 +0900 Subject: [PATCH 14/73] python311Packages.anthropic: 0.3.13 -> 0.5.0 Diff: https://github.com/anthropics/anthropic-sdk-python/compare/refs/tags/v0.3.13...v0.5.0 Changelog: https://github.com/anthropics/anthropic-sdk-python/releases/tag/v0.5.0 --- pkgs/development/python-modules/anthropic/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index ef0ffe778e46..8086ecec1139 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry-core +, hatchling , anyio , distro , httpx @@ -16,8 +16,8 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.3.13"; - format = "pyproject"; + version = "0.5.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -25,11 +25,11 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-2sw/tzbKd0d4sSHM+PYTE/XeqkycFFLfG1c/lyrU4Jc="; + hash = "sha256-+EiFp55tPsILl6uuTh9qmeQDMKlUzegn3xUo6BupN2E="; }; nativeBuildInputs = [ - poetry-core + hatchling ]; propagatedBuildInputs = [ From 8b6acac9de563ce3ebca39036c2eb8c8882b5ff5 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Mon, 23 Oct 2023 10:22:11 +0200 Subject: [PATCH 15/73] floorp: init at 11.5.0 Signed-off-by: Christoph Heiss --- nixos/tests/all-tests.nix | 1 + .../networking/browsers/floorp/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 54 insertions(+) create mode 100644 pkgs/applications/networking/browsers/floorp/default.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3f19ed548121..1c8fe54d5acc 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -284,6 +284,7 @@ in { firewall-nftables = handleTest ./firewall.nix { nftables = true; }; fish = handleTest ./fish.nix {}; flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; + floorp = handleTest ./firefox.nix { firefoxPackage = pkgs.floorp; }; fluentd = handleTest ./fluentd.nix {}; fluidd = handleTest ./fluidd.nix {}; fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {}; diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix new file mode 100644 index 000000000000..c144704fa13f --- /dev/null +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, lib +, fetchFromGitHub +, buildMozillaMach +, nixosTests +}: + +((buildMozillaMach rec { + pname = "floorp"; + packageVersion = "11.5.0"; + applicationName = "Floorp"; + binaryName = "floorp"; + version = "155.4.0"; + + src = fetchFromGitHub { + owner = "Floorp-Projects"; + repo = "Floorp"; + fetchSubmodules = true; + rev = "v${packageVersion}"; + hash = "sha256-adK3LAu3cDh6d+GvtnkWmSnxansnSZoIgtA9TAqIMyA="; + }; + + extraConfigureFlags = [ + "--with-app-name=${pname}" + "--with-app-basename=${applicationName}" + "--with-branding=browser/branding/official" + "--with-distribution-id=app.floorp.Floorp" + "--with-unsigned-addon-scopes=app,system" + "--allow-addon-sideload" + ]; + + meta = { + description = "A fork of Firefox, focused on keeping the Open, Private and Sustainable Web alive, built in Japan"; + homepage = "https://floorp.app/"; + maintainers = with lib.maintainers; [ christoph-heiss ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) + license = lib.licenses.mpl20; + }; + tests = [ nixosTests.floorp ]; +}).override { + privacySupport = true; + enableOfficialBranding = false; +}).overrideAttrs (prev: { + MOZ_REQUIRE_SIGNING = ""; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1215a0ccb31..84fa50e49e6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32173,6 +32173,10 @@ with pkgs; flex-ndax = callPackage ../applications/radio/flex-ndax { }; + floorp-unwrapped = callPackage ../applications/networking/browsers/floorp { }; + + floorp = wrapFirefox floorp-unwrapped { }; + fluxbox = callPackage ../applications/window-managers/fluxbox { }; hackedbox = callPackage ../applications/window-managers/hackedbox { }; From f833d6f755e8cfeff579b5d9ac3562207dc88fbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 Oct 2023 16:36:41 +0200 Subject: [PATCH 16/73] python311Packages.fakeredis: 2.19.0 -> 2.20.0 Diff: https://github.com/dsoftwareinc/fakeredis-py/compare/refs/tags/v2.19.0...v2.20.0 Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.20.0 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 55685e35eb09..b1b1080d20b7 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.19.0"; + version = "2.20.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-EFgd7NnHcA4T/BZZUR/z3Z4JxA0dWricasKyJAaDsHc="; + hash = "sha256-pRvUgK4OXVP2GR+Iu4ddqwApw0gYN4FkKjTpwbC1oWM="; }; nativeBuildInputs = [ From 330b9300c5e9f44a01c1debb0d455f19aba6ceca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 30 Jul 2023 09:39:41 -0700 Subject: [PATCH 17/73] python310Packages.pyflakes: cleanup --- pkgs/development/python-modules/pyflakes/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 2dea4630c575..2da0f2698685 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyflakes"; version = "3.1.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; format = "setuptools"; From efdfbef18a8195ea3a204fe5f810309dd7ab709d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 30 Jul 2023 09:40:36 -0700 Subject: [PATCH 18/73] python310Packages.flake8: cleanup --- pkgs/development/python-modules/flake8/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 4a05efc146ba..7a3bd82a5145 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -5,8 +5,6 @@ , mccabe , pycodestyle , pyflakes -, importlib-metadata -, pythonAtLeast , pytestCheckHook }: @@ -29,13 +27,8 @@ buildPythonPackage rec { mccabe pycodestyle pyflakes - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; - # Tests fail on Python 3.7 due to importlib using a deprecated interface - doCheck = pythonAtLeast "3.7"; - nativeCheckInputs = [ pytestCheckHook ]; From b44bcba394c3c8c11bf262921c92144f42506028 Mon Sep 17 00:00:00 2001 From: Isidor Zeuner Date: Fri, 20 Oct 2023 00:36:30 +0200 Subject: [PATCH 19/73] python311Packages.tensorflow: 2.11.1 -> 2.13.0 --- .../tensorflow/absl_py_argparse_flags.patch | 11 + .../tensorflow/absl_to_std.patch | 389 ++++++++++++++++++ .../tensorflow/com_google_absl_add_log.patch | 166 ++++++++ .../python-modules/tensorflow/default.nix | 104 +++-- .../tensorflow/protobuf_python.patch | 19 + .../pybind11_protobuf_newer_version.patch | 16 + ...pybind11_protobuf_python_runtime_dep.patch | 30 ++ pkgs/top-level/python-packages.nix | 54 ++- 8 files changed, 751 insertions(+), 38 deletions(-) create mode 100644 pkgs/development/python-modules/tensorflow/absl_py_argparse_flags.patch create mode 100644 pkgs/development/python-modules/tensorflow/absl_to_std.patch create mode 100644 pkgs/development/python-modules/tensorflow/com_google_absl_add_log.patch create mode 100644 pkgs/development/python-modules/tensorflow/protobuf_python.patch create mode 100644 pkgs/development/python-modules/tensorflow/pybind11_protobuf_newer_version.patch create mode 100644 pkgs/development/python-modules/tensorflow/pybind11_protobuf_python_runtime_dep.patch diff --git a/pkgs/development/python-modules/tensorflow/absl_py_argparse_flags.patch b/pkgs/development/python-modules/tensorflow/absl_py_argparse_flags.patch new file mode 100644 index 000000000000..1b130e22662e --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/absl_py_argparse_flags.patch @@ -0,0 +1,11 @@ +diff -Naurd x/third_party/systemlibs/absl_py.absl.flags.BUILD y/third_party/systemlibs/absl_py.absl.flags.BUILD +--- x/third_party/systemlibs/absl_py.absl.flags.BUILD 2023-09-20 06:02:15.079683729 +0000 ++++ y/third_party/systemlibs/absl_py.absl.flags.BUILD 2023-09-20 06:04:58.491897303 +0000 +@@ -5,3 +5,7 @@ + py_library( + name = "flags", + ) ++ ++py_library( ++ name = "argparse_flags", ++) diff --git a/pkgs/development/python-modules/tensorflow/absl_to_std.patch b/pkgs/development/python-modules/tensorflow/absl_to_std.patch new file mode 100644 index 000000000000..b834ec983c94 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/absl_to_std.patch @@ -0,0 +1,389 @@ +diff -Naurd x/tensorflow/c/experimental/stream_executor/stream_executor.cc y/tensorflow/c/experimental/stream_executor/stream_executor.cc +--- x/tensorflow/c/experimental/stream_executor/stream_executor.cc 2023-10-19 14:25:48.648646416 +0000 ++++ y/tensorflow/c/experimental/stream_executor/stream_executor.cc 2023-10-19 14:29:11.700743574 +0000 +@@ -23,6 +23,7 @@ + + #include + #include ++#include + + #include "absl/functional/any_invocable.h" + #include "tensorflow/c/c_api_macros.h" +@@ -275,17 +276,17 @@ + stream_executor_->unified_memory_deallocate(&device_, mem); + } + +- absl::optional GetAllocatorStats() override { ++ std::optional GetAllocatorStats() override { + SP_AllocatorStats c_stats{SP_ALLOCATORSTATS_STRUCT_SIZE}; + TF_Bool has_stats = + stream_executor_->get_allocator_stats(&device_, &c_stats); + if (!has_stats) { +- return absl::nullopt; ++ return std::nullopt; + } + tsl::Status status = ValidateSPAllocatorStats(c_stats); + if (!status.ok()) { + LOG(ERROR) << status.message(); +- return absl::nullopt; ++ return std::nullopt; + } + ::stream_executor::AllocatorStats stats; + stats.num_allocs = c_stats.num_allocs; +diff -Naurd x/tensorflow/c/experimental/stream_executor/stream_executor_test.cc y/tensorflow/c/experimental/stream_executor/stream_executor_test.cc +--- x/tensorflow/c/experimental/stream_executor/stream_executor_test.cc 2023-10-19 14:25:48.648646416 +0000 ++++ y/tensorflow/c/experimental/stream_executor/stream_executor_test.cc 2023-10-19 14:29:11.700743574 +0000 +@@ -15,6 +15,7 @@ + #include "tensorflow/c/experimental/stream_executor/stream_executor.h" + + #include ++#include + + #include "tensorflow/c/experimental/stream_executor/stream_executor_internal.h" + #include "tensorflow/c/experimental/stream_executor/stream_executor_test_util.h" +@@ -239,7 +240,7 @@ + }; + + StreamExecutor* executor = GetExecutor(0); +- absl::optional optional_stats = executor->GetAllocatorStats(); ++ std::optional optional_stats = executor->GetAllocatorStats(); + ASSERT_TRUE(optional_stats.has_value()); + AllocatorStats stats = optional_stats.value(); + ASSERT_EQ(stats.bytes_in_use, 123); +diff -Naurd x/tensorflow/compiler/xla/stream_executor/allocator_stats.h y/tensorflow/compiler/xla/stream_executor/allocator_stats.h +--- x/tensorflow/compiler/xla/stream_executor/allocator_stats.h 2023-10-19 14:25:55.064649379 +0000 ++++ y/tensorflow/compiler/xla/stream_executor/allocator_stats.h 2023-10-19 14:29:11.700743574 +0000 +@@ -17,6 +17,7 @@ + #define TENSORFLOW_COMPILER_XLA_STREAM_EXECUTOR_ALLOCATOR_STATS_H_ + + #include ++#include + + #include "absl/types/optional.h" + #include "tensorflow/compiler/xla/stream_executor/platform/port.h" +diff -Naurd x/tensorflow/core/common_runtime/mkl_cpu_allocator.h y/tensorflow/core/common_runtime/mkl_cpu_allocator.h +--- x/tensorflow/core/common_runtime/mkl_cpu_allocator.h 2023-10-19 14:25:58.996651199 +0000 ++++ y/tensorflow/core/common_runtime/mkl_cpu_allocator.h 2023-10-19 14:29:11.700743574 +0000 +@@ -22,6 +22,7 @@ + #ifdef INTEL_MKL + + #include ++#include + + #include "tensorflow/core/common_runtime/bfc_allocator.h" + #include "tensorflow/core/common_runtime/pool_allocator.h" +@@ -80,7 +81,7 @@ + port::AlignedFree(ptr); + } + +- absl::optional GetStats() override { ++ std::optional GetStats() override { + mutex_lock l(mutex_); + return stats_; + } +@@ -242,7 +243,7 @@ + large_size_allocator_->DeallocateRaw(ptr); + } + } +- absl::optional GetStats() override { ++ std::optional GetStats() override { + auto s_stats = small_size_allocator_->GetStats(); + auto l_stats = large_size_allocator_->GetStats(); + +diff -Naurd x/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.cc y/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.cc +--- x/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.cc 2023-10-19 14:25:59.236651310 +0000 ++++ y/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.cc 2023-10-19 14:29:11.700743574 +0000 +@@ -32,7 +32,7 @@ + return sub_allocator_->Free(ptr, 0); + } + +-absl::optional PluggableDeviceSimpleAllocator::GetStats() { ++std::optional PluggableDeviceSimpleAllocator::GetStats() { + AllocatorStats stats_; + stats_.num_allocs = 0; + stats_.peak_bytes_in_use = 0; +diff -Naurd x/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.h y/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.h +--- x/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.h 2023-10-19 14:25:59.236651310 +0000 ++++ y/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.h 2023-10-19 14:29:11.700743574 +0000 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include "tensorflow/core/common_runtime/device/device_mem_allocator.h" + #include "tensorflow/core/platform/thread_annotations.h" +@@ -37,7 +38,7 @@ + + bool TracksAllocationSizes() const override { return false; } + string Name() override { return "Simple allocator"; } +- absl::optional GetStats() override; ++ std::optional GetStats() override; + + AllocatorMemoryType GetMemoryType() const override { + return sub_allocator_->GetMemoryType(); +diff -Naurd x/tensorflow/core/common_runtime/process_state.h y/tensorflow/core/common_runtime/process_state.h +--- x/tensorflow/core/common_runtime/process_state.h 2023-10-19 14:25:59.076651236 +0000 ++++ y/tensorflow/core/common_runtime/process_state.h 2023-10-19 14:29:11.704743576 +0000 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #include "tensorflow/core/framework/allocator.h" + #include "tensorflow/core/framework/allocator_registry.h" +@@ -144,7 +145,7 @@ + size_t AllocatedSize(const void* p) const override { + return a_->AllocatedSize(p); + } +- absl::optional GetStats() override { return a_->GetStats(); } ++ std::optional GetStats() override { return a_->GetStats(); } + bool ClearStats() override { return a_->ClearStats(); } + + AllocatorMemoryType GetMemoryType() const override { +diff -Naurd x/tensorflow/core/common_runtime/step_stats_collector.cc y/tensorflow/core/common_runtime/step_stats_collector.cc +--- x/tensorflow/core/common_runtime/step_stats_collector.cc 2023-10-19 14:25:59.112651253 +0000 ++++ y/tensorflow/core/common_runtime/step_stats_collector.cc 2023-10-19 14:29:11.704743576 +0000 +@@ -15,6 +15,7 @@ + #include "tensorflow/core/common_runtime/step_stats_collector.h" + + #include ++#include + + #include "tensorflow/core/common_runtime/costmodel_manager.h" + #include "tensorflow/core/framework/allocation_description.pb.h" +@@ -175,7 +176,7 @@ + memory->set_peak_bytes(std::get<1>(sizes)); + memory->set_live_bytes(std::get<2>(sizes)); + +- absl::optional stats = allocator->GetStats(); ++ std::optional stats = allocator->GetStats(); + if (stats) { + memory->set_allocator_bytes_in_use(stats->bytes_in_use); + } +diff -Naurd x/tensorflow/core/framework/allocator_test.cc y/tensorflow/core/framework/allocator_test.cc +--- x/tensorflow/core/framework/allocator_test.cc 2023-10-19 14:25:59.524651443 +0000 ++++ y/tensorflow/core/framework/allocator_test.cc 2023-10-19 14:29:11.704743576 +0000 +@@ -17,6 +17,7 @@ + + #include + #include ++#include + + #include "tensorflow/core/framework/typed_allocator.h" + #include "tensorflow/core/platform/logging.h" +@@ -33,7 +34,7 @@ + + static void CheckStats(Allocator* a, int64_t num_allocs, int64_t bytes_in_use, + int64_t peak_bytes_in_use, int64_t largest_alloc_size) { +- absl::optional stats = a->GetStats(); ++ std::optional stats = a->GetStats(); + EXPECT_TRUE(stats); + if (!stats) { + return; +@@ -255,7 +256,7 @@ + EXPECT_EQ(e0.Name(), "MemoryAllocation") + << "XSpace: " << xspace.DebugString(); + { +- absl::optional bytes_allocated, peak_bytes_in_use, ++ std::optional bytes_allocated, peak_bytes_in_use, + requested_bytes, allocation_bytes; + e0.ForEachStat([&](const ::tensorflow::profiler::XStatVisitor& stat) { + LOG(ERROR) << "STAT " << stat.Name() << ": " << stat.ToString(); +@@ -282,7 +283,7 @@ + EXPECT_EQ(e1.Name(), "MemoryDeallocation") + << "XSpace: " << xspace.DebugString(); + { +- absl::optional bytes_allocated, peak_bytes_in_use, ++ std::optional bytes_allocated, peak_bytes_in_use, + allocation_bytes; + e1.ForEachStat([&](const ::tensorflow::profiler::XStatVisitor& stat) { + if (stat.Name() == "bytes_allocated") { +diff -Naurd x/tensorflow/core/framework/tracking_allocator_test.cc y/tensorflow/core/framework/tracking_allocator_test.cc +--- x/tensorflow/core/framework/tracking_allocator_test.cc 2023-10-19 14:25:59.700651525 +0000 ++++ y/tensorflow/core/framework/tracking_allocator_test.cc 2023-10-19 14:29:11.704743576 +0000 +@@ -16,6 +16,7 @@ + #include "tensorflow/core/framework/tracking_allocator.h" + + #include ++#include + + #include "tensorflow/core/framework/allocator.h" + #include "tensorflow/core/platform/logging.h" +@@ -44,7 +45,7 @@ + EXPECT_NE(size_map_.end(), iter); + return iter->second; + } +- absl::optional GetStats() override { return absl::nullopt; } ++ std::optional GetStats() override { return std::nullopt; } + + private: + std::unordered_map size_map_; +@@ -58,7 +59,7 @@ + } + void DeallocateRaw(void* ptr) override {} + bool TracksAllocationSizes() const override { return true; } +- absl::optional GetStats() override { return absl::nullopt; } ++ std::optional GetStats() override { return std::nullopt; } + }; + + TEST(TrackingAllocatorTest, SimpleNoTracking) { +diff -Naurd x/tensorflow/core/grappler/clusters/single_machine.cc y/tensorflow/core/grappler/clusters/single_machine.cc +--- x/tensorflow/core/grappler/clusters/single_machine.cc 2023-10-19 14:25:59.964651648 +0000 ++++ y/tensorflow/core/grappler/clusters/single_machine.cc 2023-10-19 14:29:11.704743576 +0000 +@@ -17,6 +17,7 @@ + + #include + #include ++#include + + #include "tensorflow/cc/training/queue_runner.h" + #include "tensorflow/core/common_runtime/device.h" +@@ -230,7 +231,7 @@ + return Status(absl::StatusCode::kInvalidArgument, + "Tracking allocation is not enabled."); + } +- absl::optional stats = allocator->GetStats(); ++ std::optional stats = allocator->GetStats(); + (*device_peak_memory)[device->name()] = + (stats ? stats->peak_bytes_in_use : 0); + } +diff -Naurd x/tensorflow/core/kernels/stack.cc y/tensorflow/core/kernels/stack.cc +--- x/tensorflow/core/kernels/stack.cc 2023-10-19 14:26:01.668652437 +0000 ++++ y/tensorflow/core/kernels/stack.cc 2023-10-19 14:29:11.704743576 +0000 +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + + #include "tensorflow/core/common_runtime/device.h" + #include "tensorflow/core/framework/device_base.h" +@@ -245,7 +246,7 @@ + DeviceContext* device_ctxt = ctx->op_device_context(); + auto device = static_cast(ctx->device()); + Allocator* allocator = device->GetAllocator(alloc_attrs); +- absl::optional stats = allocator->GetStats(); ++ std::optional stats = allocator->GetStats(); + if (stats && *stats->bytes_limit && + stats->bytes_in_use > (*stats->bytes_limit * kOccupancy)) { + // Asynchronously copy the tensor from GPU to CPU memory. +diff -Naurd x/tensorflow/python/tfe_wrapper.cc y/tensorflow/python/tfe_wrapper.cc +--- x/tensorflow/python/tfe_wrapper.cc 2023-10-19 14:26:10.716656639 +0000 ++++ y/tensorflow/python/tfe_wrapper.cc 2023-10-19 14:29:11.708743578 +0000 +@@ -14,6 +14,7 @@ + ==============================================================================*/ + + #include ++#include + + #include "Python.h" + #include "absl/strings/match.h" +@@ -691,7 +692,7 @@ + tensorflow::AllocatorAttributes attrs; + tensorflow::Allocator* allocator = matched_device->GetAllocator(attrs); + +- if (absl::optional stats = ++ if (std::optional stats = + allocator->GetStats()) { + return std::map{{"current", stats->bytes_in_use}, + {"peak", stats->peak_bytes_in_use}}; +diff -Naurd x/tensorflow/tsl/framework/allocator.h y/tensorflow/tsl/framework/allocator.h +--- x/tensorflow/tsl/framework/allocator.h 2023-10-19 14:26:15.884659044 +0000 ++++ y/tensorflow/tsl/framework/allocator.h 2023-10-19 14:29:11.708743578 +0000 +@@ -216,7 +216,7 @@ + } + + // Fills in 'stats' with statistics collected by this allocator. +- virtual absl::optional GetStats() { return absl::nullopt; } ++ virtual std::optional GetStats() { return std::nullopt; } + + // If implemented, clears the internal stats except for the `in_use` fields + // and sets the `peak_bytes_in_use` to be equal to the `bytes_in_use`. Returns +diff -Naurd x/tensorflow/tsl/framework/bfc_allocator.cc y/tensorflow/tsl/framework/bfc_allocator.cc +--- x/tensorflow/tsl/framework/bfc_allocator.cc 2023-10-19 14:26:15.900659052 +0000 ++++ y/tensorflow/tsl/framework/bfc_allocator.cc 2023-10-19 14:29:11.708743578 +0000 +@@ -1205,7 +1205,7 @@ + return md; + } + +-absl::optional BFCAllocator::GetStats() { ++std::optional BFCAllocator::GetStats() { + mutex_lock l(lock_); + return stats_; + } +diff -Naurd x/tensorflow/tsl/framework/bfc_allocator.h y/tensorflow/tsl/framework/bfc_allocator.h +--- x/tensorflow/tsl/framework/bfc_allocator.h 2023-10-19 14:26:15.900659052 +0000 ++++ y/tensorflow/tsl/framework/bfc_allocator.h 2023-10-19 14:29:11.708743578 +0000 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include "absl/container/flat_hash_set.h" + #include "tensorflow/tsl/framework/allocator.h" +@@ -93,7 +94,7 @@ + + int64_t AllocationId(const void* ptr) const override; + +- absl::optional GetStats() override; ++ std::optional GetStats() override; + + bool ClearStats() override; + +diff -Naurd x/tensorflow/tsl/framework/cpu_allocator_impl.cc y/tensorflow/tsl/framework/cpu_allocator_impl.cc +--- x/tensorflow/tsl/framework/cpu_allocator_impl.cc 2023-10-19 14:26:15.928659065 +0000 ++++ y/tensorflow/tsl/framework/cpu_allocator_impl.cc 2023-10-19 14:29:11.708743578 +0000 +@@ -15,6 +15,7 @@ + + #include + #include ++#include + + #include "tensorflow/tsl/framework/allocator.h" + #include "tensorflow/tsl/framework/allocator_registry.h" +@@ -145,8 +146,8 @@ + /*level=*/tsl::profiler::TraceMeLevel::kInfo); + } + +- absl::optional GetStats() override { +- if (!cpu_allocator_collect_stats) return absl::nullopt; ++ std::optional GetStats() override { ++ if (!cpu_allocator_collect_stats) return std::nullopt; + mutex_lock l(mu_); + return stats_; + } +diff -Naurd x/tensorflow/tsl/framework/tracking_allocator.cc y/tensorflow/tsl/framework/tracking_allocator.cc +--- x/tensorflow/tsl/framework/tracking_allocator.cc 2023-10-19 14:26:15.968659084 +0000 ++++ y/tensorflow/tsl/framework/tracking_allocator.cc 2023-10-19 14:29:11.708743578 +0000 +@@ -152,7 +152,7 @@ + } + } + +-absl::optional TrackingAllocator::GetStats() { ++std::optional TrackingAllocator::GetStats() { + return allocator_->GetStats(); + } + +diff -Naurd x/tensorflow/tsl/framework/tracking_allocator.h y/tensorflow/tsl/framework/tracking_allocator.h +--- x/tensorflow/tsl/framework/tracking_allocator.h 2023-10-19 14:26:15.968659084 +0000 ++++ y/tensorflow/tsl/framework/tracking_allocator.h 2023-10-19 14:29:11.712743580 +0000 +@@ -17,6 +17,7 @@ + #define TENSORFLOW_TSL_FRAMEWORK_TRACKING_ALLOCATOR_H_ + + #include ++#include + + #include "tensorflow/tsl/framework/allocator.h" + #include "tensorflow/tsl/lib/gtl/inlined_vector.h" +@@ -66,7 +67,7 @@ + size_t RequestedSize(const void* ptr) const override; + size_t AllocatedSize(const void* ptr) const override; + int64_t AllocationId(const void* ptr) const override; +- absl::optional GetStats() override; ++ std::optional GetStats() override; + bool ClearStats() override; + + AllocatorMemoryType GetMemoryType() const override { diff --git a/pkgs/development/python-modules/tensorflow/com_google_absl_add_log.patch b/pkgs/development/python-modules/tensorflow/com_google_absl_add_log.patch new file mode 100644 index 000000000000..ebb2fb129c06 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/com_google_absl_add_log.patch @@ -0,0 +1,166 @@ +diff -Naurd x/third_party/absl/system.absl.base.BUILD y/third_party/absl/system.absl.base.BUILD +--- x/third_party/absl/system.absl.base.BUILD 2023-09-17 09:12:05.499753364 +0000 ++++ y/third_party/absl/system.absl.base.BUILD 2023-09-17 09:16:01.200082822 +0000 +@@ -22,7 +22,12 @@ + + cc_library( + name = "raw_logging_internal", +- linkopts = ["-labsl_raw_logging_internal"], ++ linkopts = [ ++ "-labsl_raw_logging_internal", ++ "-labsl_log_internal_conditions", ++ "-labsl_log_internal_message", ++ "-labsl_log_internal_nullguard", ++ ], + visibility = [ + "//absl:__subpackages__", + ], +diff -Naurd x/third_party/absl/system.absl.log.BUILD y/third_party/absl/system.absl.log.BUILD +--- x/third_party/absl/system.absl.log.BUILD 1970-01-01 00:00:00.000000000 +0000 ++++ y/third_party/absl/system.absl.log.BUILD 2023-09-17 09:12:11.795762177 +0000 +@@ -0,0 +1,134 @@ ++load("@rules_cc//cc:defs.bzl", "cc_library") ++ ++package(default_visibility = ["//visibility:public"]) ++ ++cc_library( ++ name = "absl_check", ++ deps = [ ++ ], ++) ++ ++cc_library( ++ name = "absl_log", ++ deps = [ ++ ], ++) ++ ++cc_library( ++ name = "check", ++ deps = [ ++ ], ++) ++ ++cc_library( ++ name = "die_if_null", ++ deps = [ ++ ":log", ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/strings", ++ ], ++) ++ ++cc_library( ++ name = "flags", ++ deps = [ ++ ":globals", ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/base:log_severity", ++ "//absl/flags:flag", ++ "//absl/flags:marshalling", ++ "//absl/strings", ++ ], ++) ++ ++cc_library( ++ name = "globals", ++ deps = [ ++ "//absl/base:atomic_hook", ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/base:log_severity", ++ "//absl/hash", ++ "//absl/strings", ++ ], ++) ++ ++cc_library( ++ name = "initialize", ++ deps = [ ++ ":globals", ++ "//absl/base:config", ++ "//absl/time", ++ ], ++) ++ ++cc_library( ++ name = "log", ++ deps = [ ++ ], ++) ++ ++cc_library( ++ name = "log_entry", ++ deps = [ ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/base:log_severity", ++ "//absl/strings", ++ "//absl/time", ++ "//absl/types:span", ++ ], ++) ++ ++cc_library( ++ name = "log_sink", ++ deps = [ ++ ":log_entry", ++ "//absl/base:config", ++ ], ++) ++ ++cc_library( ++ name = "log_sink_registry", ++ deps = [ ++ ":log_sink", ++ "//absl/base:config", ++ ], ++) ++ ++cc_library( ++ name = "log_streamer", ++ deps = [ ++ ":absl_log", ++ "//absl/base:config", ++ "//absl/base:log_severity", ++ "//absl/strings", ++ "//absl/strings:internal", ++ "//absl/types:optional", ++ "//absl/utility", ++ ], ++) ++ ++cc_library( ++ name = "scoped_mock_log", ++ deps = [ ++ ":log_entry", ++ ":log_sink", ++ ":log_sink_registry", ++ "//absl/base:config", ++ "//absl/base:log_severity", ++ "//absl/base:raw_logging_internal", ++ "//absl/strings", ++ "@com_google_googletest//:gtest", ++ ], ++) ++ ++cc_library( ++ name = "structured", ++ deps = [ ++ "//absl/base:config", ++ "//absl/strings", ++ ], ++) +diff -Naurd x/third_party/absl/workspace.bzl y/third_party/absl/workspace.bzl +--- x/third_party/absl/workspace.bzl 2023-09-17 09:12:05.499753364 +0000 ++++ y/third_party/absl/workspace.bzl 2023-09-17 09:12:11.795762177 +0000 +@@ -20,6 +20,7 @@ + "flags", + "functional", + "hash", ++ "log", + "memory", + "meta", + "numeric", diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 348f5197a9d6..ff95c847eae5 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,18 +1,18 @@ -{ stdenv, bazel_5, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin -, addOpenGLRunpath, fetchpatch +{ stdenv, bazel_5, buildBazelPackage, lib, fetchFromGitHub, symlinkJoin +, addOpenGLRunpath, fetchpatch, fetchzip, linkFarm # Python deps , buildPythonPackage, pythonOlder, python # Python libraries -, numpy, tensorboard, absl-py -, packaging, setuptools, wheel, keras, keras-preprocessing, google-pasta +, numpy, tensorboard, abseil-cpp, absl-py +, packaging, setuptools, wheel, keras-preprocessing, google-pasta , opt-einsum, astunparse, h5py , termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator-bin , dill, flatbuffers-python, portpicker, tblib, typing-extensions # Common deps -, git, pybind11, which, binutils, glibcLocales, cython, perl, coreutils +, git, pybind11, which, binutils, glibcLocales, cython, perl # Common libraries , jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp, nsync -, curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib, protobuf-core +, curl, snappy, flatbuffers-core, icu, double-conversion, libpng, libjpeg_turbo, giflib, protobuf-core # Upstream by default includes cuda support since tensorflow 1.15. We could do # that in nix as well. It would make some things easier and less confusing, but # it would also make the default tensorflow package unfree. See @@ -53,7 +53,18 @@ let if cudaSupport then cudaPackages.backendStdenv else if originalStdenv.isDarwin then llvmPackages_11.stdenv else originalStdenv; - inherit (cudaPackages) cudatoolkit cudnn nccl; + inherit (cudaPackages) cudatoolkit nccl; + # use compatible cuDNN (https://www.tensorflow.org/install/source#gpu) + # cudaPackages.cudnn led to this: + # https://github.com/tensorflow/tensorflow/issues/60398 + cudnn = cudaPackages.cudnn_8_6; + gentoo-patches = fetchzip { + url = "https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.12.0.tar.bz2"; + hash = "sha256-SCRX/5/zML7LmKEPJkcM5Tebez9vv/gmE4xhT/jyqWs="; + }; + protobuf-extra = linkFarm "protobuf-extra" [ + { name = "include"; path = protobuf-core.src; } + ]; in assert cudaSupport -> cudatoolkit != null @@ -99,7 +110,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.11.1"; + version = "2.13.0"; variant = lib.optionalString cudaSupport "-gpu"; pname = "tensorflow${variant}"; @@ -208,14 +219,14 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "refs/tags/v${version}"; - hash = "sha256-q59cUW6613byHk4LGl+sefO5czLSWxOrSyLbJ1pkNEY="; + hash = "sha256-Rq5pAVmxlWBVnph20fkAwbfy+iuBNlfFy14poDPd5h0="; }; # On update, it can be useful to steal the changes from gentoo # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow nativeBuildInputs = [ - which pythonEnv cython perl protobuf-core + which pythonEnv cython perl protobuf-core protobuf-extra ] ++ lib.optional cudaSupport addOpenGLRunpath; buildInputs = [ @@ -225,6 +236,7 @@ let git # libs taken from system through the TF_SYS_LIBS mechanism + abseil-cpp boringssl curl double-conversion @@ -236,7 +248,6 @@ let jsoncpp libjpeg_turbo libpng - lmdb-core (pybind11.overridePythonAttrs (_: { inherit stdenv; })) snappy sqlite @@ -265,6 +276,7 @@ let "astor_archive" "astunparse_archive" "boringssl" + "com_google_absl" # Not packaged in nixpkgs # "com_github_googleapis_googleapis" # "com_github_googlecloudplatform_google_cloud_cpp" @@ -284,7 +296,6 @@ let "icu" "jsoncpp_git" "libjpeg_turbo" - "lmdb" "nasm" "opt_einsum_archive" "org_sqlite" @@ -328,6 +339,25 @@ let GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/cc"; + patches = [ + "${gentoo-patches}/0002-systemlib-Latest-absl-LTS-has-split-cord-libs.patch" + "${gentoo-patches}/0005-systemlib-Updates-for-Abseil-20220623-LTS.patch" + "${gentoo-patches}/0007-systemlibs-Add-well_known_types_py_pb2-target.patch" + # https://github.com/conda-forge/tensorflow-feedstock/pull/329/commits/0a63c5a962451b4da99a9948323d8b3ed462f461 + (fetchpatch { + name = "fix-layout-proto-duplicate-loading.patch"; + url = "https://raw.githubusercontent.com/conda-forge/tensorflow-feedstock/0a63c5a962451b4da99a9948323d8b3ed462f461/recipe/patches/0001-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch"; + hash = "sha256-/7buV6DinKnrgfqbe7KKSh9rCebeQdXv2Uj+Xg/083w="; + }) + ./com_google_absl_add_log.patch + ./absl_py_argparse_flags.patch + ./protobuf_python.patch + ./pybind11_protobuf_python_runtime_dep.patch + ./pybind11_protobuf_newer_version.patch + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ + ./absl_to_std.patch + ]; + postPatch = '' # bazel 3.3 should work just as well as bazel 3.1 rm -f .bazelversion @@ -395,18 +425,30 @@ let fetchAttrs = { sha256 = { x86_64-linux = if cudaSupport - then "sha256-lURiR0Ra4kynDXyfuONG+A7CpxnAsfKzIdFTExKzp1o=" - else "sha256-lDvRgj+UlaneRGZOO9UVCb6uyxcbRJfUhABf/sgKPi0="; - aarch64-linux = "sha256-z2d45fqHz5HW+qkv3fR9hMg3sEwUzJfxF54vng85bHk="; - x86_64-darwin = "sha256-AAvuz8o6ZRkaSYMgaep74lDDQcxOupDCX4vRaK/jnCU="; - aarch64-darwin = "sha256-kexRSvfQqb92ZRuUqAO070RnUUBidAqghiA7Y8do9vc="; + then "sha256-5VFMNHeLrUxW5RTr6EhT3pay9nWJ5JkZTGirDds5QkU=" + else "sha256-KzgWV69Btr84FdwQ5JI2nQEsqiPg1/+TWdbw5bmxXOE="; + aarch64-linux = "sha256-9btXrNHqd720oXTPDhSmFidv5iaZRLjCVX8opmrMjXk="; + x86_64-darwin = "sha256-gqb03kB0z2pZQ6m1fyRp1/Nbt8AVVHWpOJSeZNCLc4w="; + aarch64-darwin = "sha256-WdgAaFZU+ePwWkVBhLzjlNT7ELfGHOTaMdafcAMD5yo="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; buildAttrs = { outputs = [ "out" "python" ]; + # need to rebuild schemas since we use a different flatbuffers version preBuild = '' + (cd tensorflow/lite/schema;${flatbuffers-core}/bin/flatc --gen-object-api -c schema.fbs) + (cd tensorflow/lite/schema;${flatbuffers-core}/bin/flatc --gen-object-api -c conversion_metadata.fbs) + (cd tensorflow/lite/acceleration/configuration;${flatbuffers-core}/bin/flatc -o configuration.fbs --proto configuration.proto) + sed -i s,tflite.proto,tflite,g tensorflow/lite/acceleration/configuration/configuration.fbs/configuration.fbs + (cd tensorflow/lite/acceleration/configuration;${flatbuffers-core}/bin/flatc --gen-compare --gen-object-api -c configuration.fbs/configuration.fbs) + cp -r tensorflow/lite/acceleration/configuration/configuration.fbs tensorflow/lite/experimental/acceleration/configuration + (cd tensorflow/lite/experimental/acceleration/configuration;${flatbuffers-core}/bin/flatc -c configuration.fbs/configuration.fbs) + (cd tensorflow/lite/delegates/gpu/cl;${flatbuffers-core}/bin/flatc -c compiled_program_cache.fbs) + (cd tensorflow/lite/delegates/gpu/cl;${flatbuffers-core}/bin/flatc -I $NIX_BUILD_TOP/source -c serialization.fbs) + (cd tensorflow/lite/delegates/gpu/common;${flatbuffers-core}/bin/flatc -I $NIX_BUILD_TOP/source -c gpu_model.fbs) + (cd tensorflow/lite/delegates/gpu/common/task;${flatbuffers-core}/bin/flatc -c serialization_base.fbs) patchShebangs . ''; @@ -448,10 +490,7 @@ let license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; platforms = with platforms; linux ++ darwin; - # More vulnerabilities in 2.11.1 really; https://github.com/tensorflow/tensorflow/releases - knownVulnerabilities = [ "CVE-2023-33976" ]; - broken = true || # most likely needs dealing with protobuf/abseil updates - !(xlaSupport -> cudaSupport) || python.pythonVersion == "3.11"; + broken = stdenv.isDarwin || !(xlaSupport -> cudaSupport); } // lib.optionalAttrs stdenv.isDarwin { timeout = 86400; # 24 hours maxSilent = 14400; # 4h, double the default of 7200s @@ -460,7 +499,7 @@ let in buildPythonPackage { inherit version pname; - disabled = !isPy3k; + disabled = pythonOlder "3.8"; src = bazel-build.python; @@ -493,6 +532,7 @@ in buildPythonPackage { # tensorflow/tools/pip_package/setup.py propagatedBuildInputs = [ absl-py + abseil-cpp astunparse flatbuffers-python gast @@ -529,7 +569,6 @@ in buildPythonPackage { # TEST_PACKAGES in tensorflow/tools/pip_package/setup.py nativeCheckInputs = [ dill - keras portpicker tblib ]; @@ -540,18 +579,15 @@ in buildPythonPackage { hello = tf.constant("Hello, world!") tf.print(hello) - # Fit a simple model to random data - import numpy as np - np.random.seed(0) tf.random.set_seed(0) - model = tf.keras.models.Sequential([ - tf.keras.layers.Dense(1, activation="linear") - ]) - model.compile(optimizer="sgd", loss="mse") - - x = np.random.uniform(size=(1,1)) - y = np.random.uniform(size=(1,)) - model.fit(x, y, epochs=1) + width = 512 + choice = 48 + t_in = tf.Variable(tf.random.uniform(shape=[width])) + with tf.GradientTape() as tape: + t_out = tf.slice(tf.nn.softmax(t_in), [choice], [1]) + diff = tape.gradient(t_out, t_in) + assert(0 < tf.reduce_min(tf.slice(diff, [choice], [1]))) + assert(0 > tf.reduce_max(tf.slice(diff, [1], [choice - 1]))) EOF ''; # Regression test for #77626 removed because not more `tensorflow.contrib`. diff --git a/pkgs/development/python-modules/tensorflow/protobuf_python.patch b/pkgs/development/python-modules/tensorflow/protobuf_python.patch new file mode 100644 index 000000000000..11de26605b4b --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/protobuf_python.patch @@ -0,0 +1,19 @@ +diff -Naurd x/tensorflow/workspace2.bzl y/tensorflow/workspace2.bzl +--- x/tensorflow/workspace2.bzl 2023-09-16 20:44:02.266422132 +0000 ++++ y/tensorflow/workspace2.bzl 2023-09-16 20:50:40.370998305 +0000 +@@ -469,6 +469,7 @@ + system_link_files = { + "//third_party/systemlibs:protobuf.bzl": "protobuf.bzl", + "//third_party/systemlibs:protobuf_deps.bzl": "protobuf_deps.bzl", ++ "//third_party/systemlibs:protobuf.python.BUILD": "python/BUILD", + }, + urls = tf_mirror_urls("https://github.com/protocolbuffers/protobuf/archive/v3.21.9.zip"), + ) +diff -Naurd x/third_party/systemlibs/protobuf.python.BUILD y/third_party/systemlibs/protobuf.python.BUILD +--- x/third_party/systemlibs/protobuf.python.BUILD 1970-01-01 00:00:00.000000000 +0000 ++++ y/third_party/systemlibs/protobuf.python.BUILD 2023-09-16 20:49:12.514890584 +0000 +@@ -0,0 +1,4 @@ ++cc_library( ++ name = "proto_api", ++ visibility = ["//visibility:public"] ++) diff --git a/pkgs/development/python-modules/tensorflow/pybind11_protobuf_newer_version.patch b/pkgs/development/python-modules/tensorflow/pybind11_protobuf_newer_version.patch new file mode 100644 index 000000000000..460ada1fb562 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/pybind11_protobuf_newer_version.patch @@ -0,0 +1,16 @@ +diff -Naurd x/tensorflow/workspace2.bzl y/tensorflow/workspace2.bzl +--- x/tensorflow/workspace2.bzl 2023-09-21 12:55:06.104407343 +0000 ++++ y/tensorflow/workspace2.bzl 2023-09-21 12:55:39.732453203 +0000 +@@ -872,9 +872,9 @@ + + tf_http_archive( + name = "pybind11_protobuf", +- urls = tf_mirror_urls("https://github.com/pybind/pybind11_protobuf/archive/80f3440cd8fee124e077e2e47a8a17b78b451363.zip"), +- sha256 = "c7ab64b1ccf9a678694a89035a8c865a693e4e872803778f91f0965c2f281d78", +- strip_prefix = "pybind11_protobuf-80f3440cd8fee124e077e2e47a8a17b78b451363", ++ urls = tf_mirror_urls("https://github.com/pybind/pybind11_protobuf/archive/c8cc30e2495309e3499b7d76033446236d21c837.zip"), ++ sha256 = "0663f73b34c0b4af55003edbb066e62aceff99bfcf12e47ea9a15d6013d81413", ++ strip_prefix = "pybind11_protobuf-c8cc30e2495309e3499b7d76033446236d21c837", + patch_file = [ + "//third_party/pybind11_protobuf:remove_license.patch", + "//third_party/pybind11_protobuf:python_runtime_dep.patch", diff --git a/pkgs/development/python-modules/tensorflow/pybind11_protobuf_python_runtime_dep.patch b/pkgs/development/python-modules/tensorflow/pybind11_protobuf_python_runtime_dep.patch new file mode 100644 index 000000000000..daebaac86892 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/pybind11_protobuf_python_runtime_dep.patch @@ -0,0 +1,30 @@ +diff -Naurd x/tensorflow/workspace2.bzl y/tensorflow/workspace2.bzl +--- x/tensorflow/workspace2.bzl 2023-09-17 22:22:22.029075202 +0000 ++++ y/tensorflow/workspace2.bzl 2023-09-17 22:25:27.501289587 +0000 +@@ -876,7 +876,10 @@ + urls = tf_mirror_urls("https://github.com/pybind/pybind11_protobuf/archive/80f3440cd8fee124e077e2e47a8a17b78b451363.zip"), + sha256 = "c7ab64b1ccf9a678694a89035a8c865a693e4e872803778f91f0965c2f281d78", + strip_prefix = "pybind11_protobuf-80f3440cd8fee124e077e2e47a8a17b78b451363", +- patch_file = ["//third_party/pybind11_protobuf:remove_license.patch"], ++ patch_file = [ ++ "//third_party/pybind11_protobuf:remove_license.patch", ++ "//third_party/pybind11_protobuf:python_runtime_dep.patch", ++ ], + ) + + tf_http_archive( +diff -Naurd x/third_party/pybind11_protobuf/python_runtime_dep.patch y/third_party/pybind11_protobuf/python_runtime_dep.patch +--- x/third_party/pybind11_protobuf/python_runtime_dep.patch 1970-01-01 00:00:00.000000000 +0000 ++++ y/third_party/pybind11_protobuf/python_runtime_dep.patch 2023-09-17 22:23:07.849128180 +0000 +@@ -0,0 +1,11 @@ ++diff -Naurd x/pybind11_protobuf/BUILD y/pybind11_protobuf/BUILD ++--- x/pybind11_protobuf/BUILD 2023-09-17 22:17:19.932725814 +0000 +++++ y/pybind11_protobuf/BUILD 2023-09-17 22:20:44.056961932 +0000 ++@@ -86,6 +86,7 @@ ++ "//visibility:private", ++ ], ++ deps = [ +++ "@org_tensorflow//third_party/python_runtime:headers", ++ "@com_google_absl//absl/container:flat_hash_map", ++ "@com_google_absl//absl/container:flat_hash_set", ++ "@com_google_absl//absl/meta:type_traits", diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e845f54927d..1a360e9dc051 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13605,16 +13605,62 @@ self: super: with self; { inherit (pkgs.config) cudaSupport; }; - tensorflow-build = callPackage ../development/python-modules/tensorflow { + tensorflow-build = let + compat = rec { + protobufTF = pkgs.protobuf3_21.override { + abseil-cpp = pkgs.abseil-cpp; + }; + grpcTF = (pkgs.grpc.overrideAttrs ( + oldAttrs: rec { + # nvcc fails on recent grpc versions, so we use the latest patch level + # of the grpc version bundled by upstream tensorflow to allow CUDA + # support + version = "1.27.3"; + src = pkgs.fetchFromGitHub { + owner = "grpc"; + repo = "grpc"; + rev = "v${version}"; + hash = "sha256-PpiOT4ZJe1uMp5j+ReQulC9jpT0xoR2sAl6vRYKA0AA="; + fetchSubmodules = true; + }; + patches = [ ]; + postPatch = '' + sed -i "s/-std=c++11/-std=c++17/" CMakeLists.txt + echo "set(CMAKE_CXX_STANDARD 17)" >> CMakeLists.txt + ''; + }) + ).override { + protobuf = protobufTF; + }; + protobuf-pythonTF = self.protobuf.override { + protobuf = protobufTF; + }; + grpcioTF = self.grpcio.override { + protobuf = protobufTF; + grpc = grpcTF; + }; + tensorboard-plugin-profileTF = self.tensorboard-plugin-profile.override { + protobuf = protobuf-pythonTF; + }; + tensorboardTF = self.tensorboard.override { + grpcio = grpcioTF; + protobuf = protobuf-pythonTF; + tensorboard-plugin-profile = tensorboard-plugin-profileTF; + }; + }; + in + callPackage ../development/python-modules/tensorflow { inherit (pkgs.darwin) cctools; inherit (pkgs.config) cudaSupport; inherit (self.tensorflow-bin) cudaPackages; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; flatbuffers-core = pkgs.flatbuffers; flatbuffers-python = self.flatbuffers; - protobuf-core = pkgs.protobuf; - protobuf-python = self.protobuf; - lmdb-core = pkgs.lmdb; + protobuf-core = compat.protobufTF; + protobuf-python = compat.protobuf-pythonTF; + grpc = compat.grpcTF; + grpcio = compat.grpcioTF; + tensorboard = compat.tensorboardTF; }; tensorflow-datasets = callPackage ../development/python-modules/tensorflow-datasets { }; From d32ccddafde4b949cc8f05b6f4044758ca9e215f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 24 Oct 2023 19:00:57 +0300 Subject: [PATCH 20/73] avidemux: mark as broken https://github.com/NixOS/nixpkgs/issues/239424 --- pkgs/applications/video/avidemux/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index ea7ba432a4a4..856bc95a477d 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -93,5 +93,13 @@ stdenv.mkDerivation rec { # "CPU not supported" errors on AArch64 platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.gpl2; + # Downstream we experience: + # + # https://github.com/NixOS/nixpkgs/issues/239424 + # + # Upstream doesn't have a contact page / Bug tracker, so it's not easy to + # notify them about it. Using firejail might help, as some commented + # downstream. + broken = true; }; } From 991c8a8cf7d2827de7a29f1afe27d6378d134477 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 25 Oct 2023 04:20:00 +0000 Subject: [PATCH 21/73] postgresqlPackages.pg_cron: 1.6.1 -> 1.6.2 Diff: https://github.com/citusdata/pg_cron/compare/v1.6.1...v1.6.2 Changelog: https://github.com/citusdata/pg_cron/raw/v1.6.2/CHANGELOG.md --- pkgs/servers/sql/postgresql/ext/pg_cron.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 1eefb5099aa9..02c6e6435ae7 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_cron"; - version = "1.6.1"; + version = "1.6.2"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = pname; rev = "v${version}"; - hash = "sha256-GvxlaSfsqOiF1mrGo9jVv/K3xVInutkRN3AJHXKUBHQ="; + hash = "sha256-/dD1gX0+RRsBFIjSV9TVk+ppPw0Jrzssl+rRZ2qAp4w="; }; installPhase = '' From ea02d8a9a51734526dc88c422821a62db4fada94 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Tue, 24 Oct 2023 00:06:05 -0400 Subject: [PATCH 22/73] sbcl: support using CLISP as bootstrap host MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Moves the bootstrap code into main derivation because it’s only used there, and this helps let the main derivation decide when to evaluate it in the first place (depending on the system), which helps on Hydra. Not actually enabled by default on any systems yet. --- pkgs/development/compilers/sbcl/2.x.nix | 71 +++++++++++++++++-- pkgs/development/compilers/sbcl/bootstrap.nix | 61 +--------------- pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 68 insertions(+), 68 deletions(-) diff --git a/pkgs/development/compilers/sbcl/2.x.nix b/pkgs/development/compilers/sbcl/2.x.nix index a4de7b8b876f..bd52b41dc809 100644 --- a/pkgs/development/compilers/sbcl/2.x.nix +++ b/pkgs/development/compilers/sbcl/2.x.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap, zstd -, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" +{ lib, stdenv, callPackage, clisp, fetchurl, fetchpatch, writeText, zstd , threadSupport ? (stdenv.hostPlatform.isx86 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system) , linkableRuntime ? stdenv.hostPlatform.isx86 , disableImmobileSpace ? false @@ -26,8 +25,62 @@ let sha256 = "sha256-fSiakSMgIgKL8BKJAMMr8A5MVDDDLyivBZTIpZKphlQ="; }; }; + # Collection of pre-built SBCL binaries for platforms that need them for + # bootstrapping. Ideally these are to be avoided. If CLISP (or any other + # non-binary-distributed Lisp) can run on any of these systems, that entry + # should be removed from this list. + bootstrapBinaries = rec { + aarch64-darwin = { + version = "2.1.2"; + system = "arm64-darwin"; + sha256 = "sha256-H0ALigXcWIypdA+fTf7jERscwbb7QIAfcoxCtGDh0RU="; + }; + x86_64-darwin = { + version = "2.2.9"; + system = "x86-64-darwin"; + sha256 = "sha256-b1BLkoLIOELAYBYA9eBmMgm1OxMxJewzNP96C9ADfKY="; + }; + x86_64-linux = { + version = "1.3.16"; + system = "x86-64-linux"; + sha256 = "0sq2dylwwyqfwkbdvcgqwz3vay9v895zpb0fyzsiwy31d1x9pr2s"; + }; + i686-linux = { + version = "1.2.7"; + system = "x86-linux"; + sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j"; + }; + aarch64-linux = { + version = "1.3.16"; + system = "arm64-linux"; + sha256 = "0q1brz9c49xgdljzfx8rpxxnlwhadxkcy5kg0mcd9wnxygind1cl"; + }; + armv7l-linux = { + version = "1.2.14"; + system = "armhf-linux"; + sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5"; + }; + armv6l-linux = armv7l-linux; + x86_64-freebsd = { + version = "1.2.7"; + system = "x86-64-freebsd"; + sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6"; + }; + x86_64-solaris = { + version = "1.2.7"; + system = "x86-64-solaris"; + sha256 = "05c12fmac4ha72k1ckl6i780rckd7jh4g5s5hiic7fjxnf1kx8d0"; + }; + }; + sbclBootstrap = callPackage ./bootstrap.nix { + cfg = bootstrapBinaries.${stdenv.hostPlatform.system}; + }; + bootstrapLisp = + if (builtins.hasAttr stdenv.hostPlatform.system bootstrapBinaries) + then "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" + else "${clisp}/bin/clisp -E UTF-8 --silent -norc"; -in with versionMap.${version}; +in stdenv.mkDerivation rec { pname = "sbcl"; @@ -35,7 +88,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; - inherit sha256; + inherit (versionMap.${version}) sha256; }; nativeBuildInputs = [ texinfo ]; @@ -108,7 +161,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${ + sh make.sh --prefix=$out --xc-host="${bootstrapLisp}" ${ lib.concatStringsSep " " (builtins.map (x: "--with-${x}") enableFeatures ++ builtins.map (x: "--without-${x}") disableFeatures) @@ -142,5 +195,11 @@ stdenv.mkDerivation rec { } ''); - meta = sbclBootstrap.meta; + meta = with lib; { + description = "Lisp compiler"; + homepage = "https://sbcl.org"; + license = licenses.publicDomain; # and FreeBSD + maintainers = lib.teams.lisp.members; + platforms = attrNames bootstrapBinaries; + }; } diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 05634d0c83f3..e23557c5a62f 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -1,59 +1,12 @@ -{ lib, stdenv, fetchurl, makeWrapper }: +{ lib, stdenv, fetchurl, makeWrapper, cfg }: -let - options = rec { - aarch64-darwin = { - version = "2.1.2"; - system = "arm64-darwin"; - sha256 = "sha256-H0ALigXcWIypdA+fTf7jERscwbb7QIAfcoxCtGDh0RU="; - }; - x86_64-darwin = { - version = "2.2.9"; - system = "x86-64-darwin"; - sha256 = "sha256-b1BLkoLIOELAYBYA9eBmMgm1OxMxJewzNP96C9ADfKY="; - }; - x86_64-linux = { - version = "1.3.16"; - system = "x86-64-linux"; - sha256 = "0sq2dylwwyqfwkbdvcgqwz3vay9v895zpb0fyzsiwy31d1x9pr2s"; - }; - i686-linux = { - version = "1.2.7"; - system = "x86-linux"; - sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j"; - }; - aarch64-linux = { - version = "1.3.16"; - system = "arm64-linux"; - sha256 = "0q1brz9c49xgdljzfx8rpxxnlwhadxkcy5kg0mcd9wnxygind1cl"; - }; - armv7l-linux = { - version = "1.2.14"; - system = "armhf-linux"; - sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5"; - }; - armv6l-linux = armv7l-linux; - x86_64-freebsd = { - version = "1.2.7"; - system = "x86-64-freebsd"; - sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6"; - }; - x86_64-solaris = { - version = "1.2.7"; - system = "x86-64-solaris"; - sha256 = "05c12fmac4ha72k1ckl6i780rckd7jh4g5s5hiic7fjxnf1kx8d0"; - }; - }; - cfg = options.${stdenv.hostPlatform.system}; -in -assert builtins.hasAttr stdenv.hostPlatform.system options; stdenv.mkDerivation rec { pname = "sbcl-bootstrap"; - version = cfg.version; + inherit (cfg) version; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/sbcl-${version}-${cfg.system}-binary.tar.bz2"; - sha256 = cfg.sha256; + inherit (cfg) sha256; }; nativeBuildInputs = [ makeWrapper ]; @@ -73,12 +26,4 @@ stdenv.mkDerivation rec { postFixup = lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; - - meta = with lib; { - description = "Lisp compiler"; - homepage = "http://www.sbcl.org"; - license = licenses.publicDomain; # and FreeBSD - maintainers = lib.teams.lisp.members; - platforms = attrNames options; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6909a953e36f..9b2360c30bca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26063,10 +26063,6 @@ with pkgs; }; # Steel Bank Common Lisp - sbclBootstrap = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {}; - faslExt = "fasl"; - }; sbcl_2_3_8 = wrapLisp { pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.8"; }; faslExt = "fasl"; From 83f2e6521d0e3110b203ce895ee83832629f17e2 Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Thu, 26 Oct 2023 10:45:45 +0200 Subject: [PATCH 23/73] python311Packages.picosvg: remove test patch as skia-pathops has been updated --- pkgs/development/python-modules/picosvg/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/development/python-modules/picosvg/default.nix b/pkgs/development/python-modules/picosvg/default.nix index d344fca85e59..f543b61b2bc9 100644 --- a/pkgs/development/python-modules/picosvg/default.nix +++ b/pkgs/development/python-modules/picosvg/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , setuptools-scm , absl-py , lxml @@ -20,17 +19,6 @@ buildPythonPackage rec { hash = "sha256-jG1rfamegnX8GXDwqkGFBFzUeycRLDObJvGbxNk6OpM="; }; - patches = [ - # see https://github.com/googlefonts/picosvg/issues/299 - # this patch fixed a failing test case after the update to skia-pathops 0.8 - # as soon as skia-pathops in nixpkgs is updated to 0.8, this patch should be removed - (fetchpatch { - url = "https://github.com/googlefonts/picosvg/commit/4e971ed6cd9afb412b2845d29296a0c24f086562.patch"; - hash = "sha256-OZEipNPCSuuqcy4XggBiuGv4HN604dI4N9wlznyAwF0="; - revert = true; - }) - ]; - nativeBuildInputs = [ setuptools-scm ]; From 375e1887a8886195c900b98487923e03c8fea05b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 26 Oct 2023 11:43:33 +0200 Subject: [PATCH 24/73] python311Packages.torchinfo: 1.64 -> 1.8.0 Changelog: https://github.com/TylerYep/torchinfo/releases/tag/v1.8.0 --- .../python-modules/torchinfo/default.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/torchinfo/default.nix b/pkgs/development/python-modules/torchinfo/default.nix index e22993e8d23f..6cc7bcf3e27c 100644 --- a/pkgs/development/python-modules/torchinfo/default.nix +++ b/pkgs/development/python-modules/torchinfo/default.nix @@ -1,26 +1,38 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook +, fetchpatch , pythonOlder , torch , torchvision +, pytestCheckHook +, transformers }: buildPythonPackage rec { pname = "torchinfo"; - version = "1.64"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "TylerYep"; - repo = pname; + repo = "torchinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-gcl8RxCD017FP4LtB60WVtOh7jg2Otv/vNd9hKneEAU="; + hash = "sha256-pPjg498aT8y4b4tqIzNxxKyobZX01u+66ScS/mee51Q="; }; + patches = [ + (fetchpatch { # Add support for Python 3.11 and pytorch 2.1 + url = "https://github.com/TylerYep/torchinfo/commit/c74784c71c84e62bcf56664653b7f28d72a2ee0d.patch"; + hash = "sha256-xSSqs0tuFpdMXUsoVv4sZLCeVnkK6pDDhX/Eobvn5mw="; + includes = [ + "torchinfo/model_statistics.py" + ]; + }) + ]; + propagatedBuildInputs = [ torch torchvision @@ -28,17 +40,23 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + transformers ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = [ # Skip as it downloads pretrained weights (require network access) "test_eval_order_doesnt_matter" + "test_flan_t5_small" # AssertionError in output "test_google" ]; disabledTestPaths = [ - # Wants "compressai", which we don't package (2023-03-23) + # Test requires network access "tests/torchinfo_xl_test.py" ]; From de4c6ac6272ecf43606d244e0df5a1ee6d1663f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Oct 2023 10:35:33 +0000 Subject: [PATCH 25/73] dt: 1.2.4 -> 1.2.5 --- pkgs/tools/text/dt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/dt/default.nix b/pkgs/tools/text/dt/default.nix index bc4c0dd9938e..303feb0fe942 100644 --- a/pkgs/tools/text/dt/default.nix +++ b/pkgs/tools/text/dt/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dt"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "so-dang-cool"; repo = "dt"; rev = "v${finalAttrs.version}"; - hash = "sha256-u9MI6mrP+QXr3VDgmXW7GRkHKCiDoA9HlznTEGNsck4="; + hash = "sha256-i8oMrsPcINVK5kXzrN+lcPqBfxIeed8W+NF7Qd0crrk="; }; nativeBuildInputs = [ zig_0_11.hook ]; From 9f6d07d23dbf4381f0ddbb42e978e573cdaea150 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Oct 2023 10:49:06 +0000 Subject: [PATCH 26/73] driversi686Linux.amdvlk: 2023.Q3.3 -> 2023.Q4.1 --- pkgs/development/libraries/amdvlk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index eacf704aa688..41466a9d7731 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2023.Q3.3"; + version = "2023.Q4.1"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "HHnMiU6mzhUSicXev53PP8y9ealtDMavJLp2F/JAWhI="; + sha256 = "5fSz8sksH3K9k0nIx9DUmGGUfIo4Fc4NMettaVqRsY8="; }; buildInputs = [ From 82ee010f3e7a9ae0943c411ac48cdcfae9aa7421 Mon Sep 17 00:00:00 2001 From: Gustavo Coutinho de Souza Date: Wed, 25 Oct 2023 19:50:31 -0300 Subject: [PATCH 27/73] aba: init at 0.7.0 --- pkgs/by-name/ab/aba/package.nix | 53 +++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 pkgs/by-name/ab/aba/package.nix diff --git a/pkgs/by-name/ab/aba/package.nix b/pkgs/by-name/ab/aba/package.nix new file mode 100644 index 000000000000..4e62d4da8d0c --- /dev/null +++ b/pkgs/by-name/ab/aba/package.nix @@ -0,0 +1,53 @@ +{ fetchFromSourcehut +, just +, lib +, nix-update-script +, rustPlatform +, scdoc +}: +let + version = "0.7.0"; +in +rustPlatform.buildRustPackage { + pname = "aba"; + inherit version; + + src = fetchFromSourcehut { + owner = "~onemoresuza"; + repo = "aba"; + rev = version; + hash = "sha256-YPE5HYa90BcNy5jdYbzkT81KavJcbSeGrsWRILnIiEE="; + domain = "sr.ht"; + }; + + cargoSha256 = "sha256-wzI+UMcVeFQNFlWDkyxk8tjpU7beNRKoPYbid8b15/Q="; + + nativeBuildInputs = [ + just + scdoc + ]; + + # There are no tests + doCheck = false; + + dontUseJustBuild = true; + dontUseJustCheck = true; + dontUseJustInstall = true; + + postInstall = '' + just --set PREFIX $out install-doc + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "An address book for aerc"; + homepage = "https://sr.ht/~onemoresuza/aba/"; + changelog = "https://git.sr.ht/~onemoresuza/aba/tree/main/item/CHANGELOG.md"; + downloadPage = "https://git.sr.ht/~onemoresuza/aba/refs/${version}"; + maintainers = with lib.maintainers; [ onemoresuza ]; + license = lib.licenses.isc; + platforms = lib.platforms.unix; + mainProgram = "aba"; + }; +} From fc33f967a71178cc88e799a6907554338e76b6ee Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 26 Oct 2023 13:29:38 +0100 Subject: [PATCH 28/73] netpbm: 11.4.2 -> 11.4.3 --- pkgs/tools/graphics/netpbm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 2bc674b59470..69af8d86b679 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.4.2"; + version = "11.4.3"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4709"; - sha256 = "HT1cw6y5cOTMrBolfXwhKtMQYBPCPPO+Flv3aWeOK0A="; + rev = "4776"; + sha256 = "h8QjYc4VYJY1fSwCyqn6am/L0tv02ux1lQZfYov1XFA="; }; nativeBuildInputs = [ From f50026f5fd7c05556c382688d0daf5a7face09ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Oct 2023 16:53:08 +0000 Subject: [PATCH 29/73] earthly: 0.7.19 -> 0.7.21 --- pkgs/development/tools/earthly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index c9d2cc352e15..d5d901e1d8de 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.7.19"; + version = "0.7.21"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - hash = "sha256-Qs2Ik559KOhkwTSaEoYLqy4m9y/mRp7XThArKOkH3uI="; + hash = "sha256-ts+XSPRkDQElyM8nr6Vtf8Ov6C5OoiIhMNnFv6YA2bw="; }; - vendorHash = "sha256-h3/FmhcXwRvDoOwJ643ze3GrV13tIhnnIMynQgf5emg="; + vendorHash = "sha256-/ZHoi5aHJ79kjUgbFKBVHDZyVyCdFfY/fJDrHdUmuUE="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; From b24f546ebd40ab9bad7510b407b9ac13272ecaab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 26 Oct 2023 19:01:07 +0200 Subject: [PATCH 30/73] arandr: 0.1.10 -> 0.1.11 --- pkgs/tools/X11/arandr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 6c4c89e88887..fd47e357375f 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -13,11 +13,11 @@ let in buildPythonApplication rec { pname = "arandr"; - version = "0.1.10"; + version = "0.1.11"; src = fetchurl { url = "https://christian.amsuess.com/tools/arandr/files/${pname}-${version}.tar.gz"; - sha256 = "135q0llvm077jil2fr92ssw3p095m4r8jfj0lc5rr3m71n4srj6v"; + hash = "sha256-5Mu+Npi7gSs5V3CHAXS+AJS7rrOREFqBH5X0LrGCrgI="; }; preBuild = '' @@ -31,10 +31,10 @@ buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = [ xrandr pygobject3 ]; - meta = { + meta = with lib; { homepage = "https://christian.amsuess.com/tools/arandr/"; description = "A simple visual front end for XRandR"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.domenkozar ]; + license = licenses.gpl3; + maintainers = with maintainers; [ domenkozar gepbird ]; }; } From 58e0d04646f54dde03547b2955fd2b84138700ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Oct 2023 18:26:43 +0000 Subject: [PATCH 31/73] eksctl: 0.161.0 -> 0.163.0 --- pkgs/by-name/ek/eksctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 91f98463a85c..a670490ef0ad 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.161.0"; + version = "0.163.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-hlHwzZ0U3G6IGJjeHZPlO2+thJ1UKxHhRb28EQ39pZk="; + hash = "sha256-rpyLjoHMSgEHTILeEQpUKD7BOJHn/uT3GK6Fquirzdk="; }; - vendorHash = "sha256-9rT2zkgwxDQlxTWF1zHpYOOI7uK5Q/GYFWIrKgP2GaQ="; + vendorHash = "sha256-NOhssVWEkvoXpmnsCVVT7Li0ePGWDSGIlB2MyFtMnpI="; doCheck = false; From 47f5af6aee281a413fa981b6ed4a81aad34abebd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Oct 2023 17:19:49 +0200 Subject: [PATCH 32/73] python311Packages.pyocd: 0.35.1 -> 0.36.0 https://github.com/pyocd/pyOCD/releases/tag/v0.36.0 --- .../python-modules/pyocd/default.nix | 41 ++++++++++++++----- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix index ecc92bc3bd38..19980b7c0ca2 100644 --- a/pkgs/development/python-modules/pyocd/default.nix +++ b/pkgs/development/python-modules/pyocd/default.nix @@ -5,14 +5,19 @@ , capstone , cmsis-pack-manager , colorama +, importlib-metadata +, importlib-resources , intelhex , intervaltree +, lark , natsort , prettytable , pyelftools , pylink-square , pyusb , pyyaml +, setuptools +, setuptools-scm , typing-extensions , stdenv , hidapi @@ -21,11 +26,12 @@ buildPythonPackage rec { pname = "pyocd"; - version = "0.35.1"; + version = "0.36.0"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-AugIT007JtTXx0cLtHD9TtxsK/K6eB492U2k+EVxyXU="; + hash = "sha256-k3eCrMna/wVNUPt8b3iM2UqE+A8LhfJarKuZ3Jgihkg="; }; patches = [ @@ -37,12 +43,25 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "libusb-package>=1.0,<2.0" "" + ''; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ capstone cmsis-pack-manager colorama + importlib-metadata + importlib-resources intelhex intervaltree + lark natsort prettytable pyelftools @@ -54,19 +73,19 @@ buildPythonPackage rec { hidapi ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "pyocd" + ]; - pythonImportsCheck = [ "pyocd" ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "libusb-package>=1.0,<2.0" "" \ - --replace "pylink-square>=0.11.1,<1.0" "pylink-square>=0.11.1,<2.0" - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { + changelog = "https://github.com/pyocd/pyOCD/releases/tag/v${version}"; description = "Python library for programming and debugging Arm Cortex-M microcontrollers"; - homepage = "https://pyocd.io/"; + downloadPage = "https://github.com/pyocd/pyOCD"; + homepage = "https://pyocd.io"; license = licenses.asl20; maintainers = with maintainers; [ frogamic sbruder ]; }; From efb9f909d6102d8f7eb02c2bec049a391578f6d4 Mon Sep 17 00:00:00 2001 From: Ivan Timokhin Date: Sun, 20 Aug 2023 17:40:34 +0300 Subject: [PATCH 33/73] junicode: 1.003 -> 2.001 Release announcement: https://github.com/psb1558/Junicode-font/releases/tag/v2.001 This is a breaking change, at least in font file naming (Junicode.ttf is now Junicode-Regular.ttf). In general, 2.0 adds a lot more font variants and opentype and web font versions of the font. Seeing as backward compatibility is broken anyway, I opted to break it a bit more and change custom install path (`junicode-ttf`) to seemingly more conventional `truetype`; new .otf and .woff2 variants are then naturally placed in corresponding directories. This does *not* affect the `fonts.packages` NixOS option, which rearranges font files anyway, but brings a degree of consistency with other fonts. Both the file renaming and the directory structure change break satysfi, however, so I adjusted its builder accordingly, copying over only those font variants that were also present in 1.0 series. --- .../manual/release-notes/rl-2311.section.md | 2 ++ pkgs/data/fonts/junicode/default.nix | 24 ++++++++++--------- pkgs/tools/typesetting/satysfi/default.nix | 6 +++-- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 822ba67a40df..e720885b5d91 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -339,6 +339,8 @@ - `mkDerivation` now rejects MD5 hashes. +- The `junicode` font package has been updated to [major version 2](https://github.com/psb1558/Junicode-font/releases/tag/v2.001), which is now a font family. In particular, plain `Junicode.ttf` no longer exists. In addition, TrueType font files are now placed in `font/truetype` instead of `font/junicode-ttf`; this change does not affect use via `fonts.packages` NixOS option. + ## Other Notable Changes {#sec-release-23.11-notable-changes} - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration. diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 4e42cf1c4174..622f9d841611 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -1,22 +1,24 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchzip }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation rec { pname = "junicode"; - version = "1.003"; + version = "2.001"; - src = fetchFromGitHub { - owner = "psb1558"; - repo = "Junicode-font"; - rev = "55d816d91a5e19795d9b66edec478379ee2b9ddb"; - hash = "sha256-eTiMgI8prnpR4H6sqKRaB3Gcnt4C5QWZalRajWW49G4="; + src = fetchzip { + url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip"; + hash = "sha256-AEbRU0KiB9gLdxcXn8Mn/XLjBEm0qa4cV6+xE1HKU5s="; }; + outputs = [ "out" "doc" ]; + installPhase = '' runHook preInstall - local out_ttf=$out/share/fonts/junicode-ttf - mkdir -p $out_ttf - cp legacy/*.ttf $out_ttf + install -Dt $out/share/fonts/truetype TTF/*.ttf VAR/*.ttf + install -Dt $out/share/fonts/opentype OTF/*.otf + install -Dt $out/share/fonts/woff2 WOFF2/*.woff2 + + install -Dt $doc/share/doc/${pname}-${version} docs/*.pdf runHook postInstall ''; diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 8b341298f311..6d77faac76a9 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -65,10 +65,12 @@ in cp -r lib-satysfi/dist/ $out/share/satysfi/ cp -r \ ${ipaexfont}/share/fonts/opentype/* \ - ${junicode}/share/fonts/junicode-ttf/* \ ${lmodern}/share/fonts/opentype/public/lm/* \ ${lmmath}/share/fonts/opentype/latinmodern-math.otf \ - $out/share/satysfi/dist/fonts + ${junicode}/share/fonts/truetype/Junicode-{Bold,BoldItalic,Italic}.ttf \ + $out/share/satysfi/dist/fonts/ + cp ${junicode}/share/fonts/truetype/Junicode-Regular.ttf \ + $out/share/satysfi/dist/fonts/Junicode.ttf ''; meta = with lib; { From 8ed7ffbd79bdd6441f982adc6a8b00df1f7043ba Mon Sep 17 00:00:00 2001 From: Ivan Timokhin Date: Sun, 27 Aug 2023 17:56:51 +0300 Subject: [PATCH 34/73] junicode: 2.001 -> 2.002 Release announcement: https://github.com/psb1558/Junicode-font/releases/tag/v2.002 From it: Version 2.002 adds U+0243 B with stroke (with small cap and petite cap variants) and variants of U+014A Eng (with small cap and petite cap variants). It also adds many anchors and refines and corrects many outlines (especially in roman). --- pkgs/data/fonts/junicode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 622f9d841611..63af7e05ebf4 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "junicode"; - version = "2.001"; + version = "2.002"; src = fetchzip { url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip"; - hash = "sha256-AEbRU0KiB9gLdxcXn8Mn/XLjBEm0qa4cV6+xE1HKU5s="; + hash = "sha256-AHy4uT0LEof69+ECoFlKmALPTTPbvRNjmFD240koWAE="; }; outputs = [ "out" "doc" ]; From f6d4bbb4f82dc0c68d11223138a07b9178603bcb Mon Sep 17 00:00:00 2001 From: Ivan Timokhin Date: Sat, 2 Sep 2023 12:58:16 +0300 Subject: [PATCH 35/73] junicode: 2.002 -> 2.003 Release announcement: https://github.com/psb1558/Junicode-font/releases/tag/v2.003 From it: This is mostly a bug-fix version. It (1) fixes several non-functioning tag sequences; (2) fixes an incompatibility with InDesign that caused OpenType features to misbehave in that program; (3) improved several outlines and adjusted badly positioned anchors. --- pkgs/data/fonts/junicode/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 63af7e05ebf4..6a1c9e896e7c 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "junicode"; - version = "2.002"; + version = "2.003"; src = fetchzip { url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip"; - hash = "sha256-AHy4uT0LEof69+ECoFlKmALPTTPbvRNjmFD240koWAE="; + hash = "sha256-PD4rAZKTLVVblrQZgWKuuSF693nv2Od/uj1IOav+8/0="; }; outputs = [ "out" "doc" ]; @@ -14,11 +14,11 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dt $out/share/fonts/truetype TTF/*.ttf VAR/*.ttf - install -Dt $out/share/fonts/opentype OTF/*.otf - install -Dt $out/share/fonts/woff2 WOFF2/*.woff2 + install -Dm 444 -t $out/share/fonts/truetype TTF/*.ttf VAR/*.ttf + install -Dm 444 -t $out/share/fonts/opentype OTF/*.otf + install -Dm 444 -t $out/share/fonts/woff2 WOFF2/*.woff2 - install -Dt $doc/share/doc/${pname}-${version} docs/*.pdf + install -Dm 444 -t $doc/share/doc/${pname}-${version} docs/*.pdf runHook postInstall ''; From 082549907b3f9ef028c6b7e4cfbba128be66cd9b Mon Sep 17 00:00:00 2001 From: Ivan Timokhin Date: Sat, 16 Sep 2023 13:46:46 +0300 Subject: [PATCH 36/73] junicode: 2.003 -> 2.004 Release announcement: https://github.com/psb1558/Junicode-font/releases/tag/v2.004 From it: This release includes (mainly in the italic face) revisions of metrics and kerning of numbers and of kerning around parentheses and brackets. It also fixes some spacing problems (in the roman face) with capitals in parentheses (U+1F110-U+1F129) and a few problems with disordered or wrong components. --- pkgs/data/fonts/junicode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 6a1c9e896e7c..9a9925554720 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "junicode"; - version = "2.003"; + version = "2.004"; src = fetchzip { url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip"; - hash = "sha256-PD4rAZKTLVVblrQZgWKuuSF693nv2Od/uj1IOav+8/0="; + hash = "sha256-bdtyfdNjCATlk74T6aADUmcf5nhyGSM/7kIpRl324Go="; }; outputs = [ "out" "doc" ]; From 7eb1f016f9519d518ad5783b7eee4295208b3f22 Mon Sep 17 00:00:00 2001 From: Ivan Timokhin Date: Sat, 21 Oct 2023 11:34:00 +0300 Subject: [PATCH 37/73] junicode: 2.004 -> 2.100 Release announcement: https://github.com/psb1558/Junicode-font/releases/tag/v2.100 From it: Version 2.100 features a thorough reworking of the font's number system. The default numbers are now oldstyle (or "lowercase") proportional, and the metrics, kerning, and often the outlines of the number glyphs have been refined, along with those of glyphs typically associated with numbers (e.g. currency symbols). An alternate, more modern style of some oldstyle numbers has been supplied and made available via Stylistic Set 9 (ss09). --- pkgs/data/fonts/junicode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 9a9925554720..e4bc954dec34 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "junicode"; - version = "2.004"; + version = "2.100"; src = fetchzip { url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip"; - hash = "sha256-bdtyfdNjCATlk74T6aADUmcf5nhyGSM/7kIpRl324Go="; + hash = "sha256-Sd3WhG846m2CXz+NKDAod5bfF91MOR1Vq0wpuOE+cDQ="; }; outputs = [ "out" "doc" ]; From 49c7d93c55d54a1eb1c7fca8490abc469344ad95 Mon Sep 17 00:00:00 2001 From: Ivan Timokhin Date: Sun, 22 Oct 2023 09:20:59 +0300 Subject: [PATCH 38/73] junicode: 2.100 -> 2.200 Release announcement: https://github.com/psb1558/Junicode-font/releases/tag/v2.200 From it: Junicode 2.200 features miscellaneous fixes and additions, and it also inaugurates a long-term program of adding glyphs for the benefit of the Ansund HTR (Handwritten Text Recognition) project, which is developing tools for the automated reading of medieval manuscripts. Of the additions made so far, the ones likely to be of greatest interest to users are two series of medieval capitals, available via features ss11[1] and ss11[2]. The first series consists of rustic capitals, often used for text in late ancient and early medieval times and for rubrics (headings) in the central Middle Ages. The second consists of Lombardic capitals, used in the central and later Middle Ages for what are now called drop caps. These capitals are designed to harmonize with Junicode to the greatest degree possible while remaining faithful to the medieval sources. --- pkgs/data/fonts/junicode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index e4bc954dec34..88ef4e588c77 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "junicode"; - version = "2.100"; + version = "2.200"; src = fetchzip { url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip"; - hash = "sha256-Sd3WhG846m2CXz+NKDAod5bfF91MOR1Vq0wpuOE+cDQ="; + hash = "sha256-2K+zPq6Bjg+hZQhQrWWm1bxHVfwwRdsV7EseRGBnpUw="; }; outputs = [ "out" "doc" ]; From 725fae7dd1850fb17a75bb68c5287413006e1184 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Thu, 26 Oct 2023 22:58:42 +0200 Subject: [PATCH 39/73] python3Packages.sqids: 0.3.0 -> 0.4.0 Also do minor cleanup e.g. "doCheck" is implicitly set by default for Python packages. --- pkgs/development/python-modules/sqids/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sqids/default.nix b/pkgs/development/python-modules/sqids/default.nix index a53be04df711..dc6befc17991 100644 --- a/pkgs/development/python-modules/sqids/default.nix +++ b/pkgs/development/python-modules/sqids/default.nix @@ -8,22 +8,20 @@ buildPythonPackage rec { pname = "sqids"; - version = "0.3.0"; - format = "pyproject"; + version = "0.4.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-qAY41kOp0m+mua/4bvVwuDW5p0EpwY675Ux3W1JsqbE="; + hash = "sha256-U9nVpRc9PIM1ZO+bcL3RGIfAdlUMf+uFw/SpPTAjdnA="; }; nativeBuildInputs = [ setuptools-scm ]; - doCheck = true; - nativeCheckInputs = [ pytestCheckHook ]; From 47fcbd9a4f4067a84c44805c4c8302599fb15291 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 26 Oct 2023 23:19:06 +0200 Subject: [PATCH 40/73] php82: 8.2.11 -> 8.2.12 --- pkgs/development/interpreters/php/8.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index a38b0d395712..072012657588 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.11"; - hash = "sha256-OBktrv+r9K9sQnvxesH4JWXZx1IuDb0yIVFilEQ0sos="; + version = "8.2.12"; + hash = "sha256-cEMl9WsbTBf5+VHh/+9cZOFIiWBT804mJhUsuqLwWJM="; }); in From e4624bd7789b57bdff892898eb859159bb4bb483 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 26 Oct 2023 23:19:23 +0200 Subject: [PATCH 41/73] php83: 8.3.0RC4 -> 8.3.0RC5 --- pkgs/development/interpreters/php/8.3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 8031ab1c6a28..63e7ec8e31b6 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -2,12 +2,12 @@ let base = (callPackage ./generic.nix (_args // { - version = "8.3.0RC4"; + version = "8.3.0RC5"; hash = null; })).overrideAttrs (oldAttrs: { src = fetchurl { - url = "https://downloads.php.net/~eric/php-8.3.0RC4.tar.xz"; - hash = "sha256-i02aivxsRIRo5ZFrzKCGAOXffvbhPiWnMFEGqQMr5h0="; + url = "https://downloads.php.net/~jakub/php-8.3.0RC5.tar.xz"; + hash = "sha256-I42ded2tZO5ZQ+iU5DeNKjT+mNNoowew8gNOYDeB5aY="; }; }); in From 5967b71d8db742a439da6e945c706b949374a514 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 26 Oct 2023 23:22:04 +0200 Subject: [PATCH 42/73] php81: 8.1.24 -> 8.1.25 --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index ed6f3d27157f..51651c5d405b 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.24"; - hash = "sha256-sK5YBKmtU6fijQoyYpSV+Bb5NbEIMMcfTsFYJxhac8k="; + version = "8.1.25"; + hash = "sha256-qGqIwYQMG8gyvP0vvsO4oZQsgxTaXf9T8J+cmNDBLoo="; }); in From 445af7337ddf03526b49c99a28d43e956621ea2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Oct 2023 21:31:40 +0000 Subject: [PATCH 43/73] espup: 0.6.1 -> 0.7.0 --- pkgs/development/tools/espup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix index 97efd1939eeb..c5089bc2d7f3 100644 --- a/pkgs/development/tools/espup/default.nix +++ b/pkgs/development/tools/espup/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "espup"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espup"; rev = "v${version}"; - hash = "sha256-2LSlnGte65eemlDw67mPhmf+RuLwnbavNyMYMLgrx/E="; + hash = "sha256-D5ck96nR8agiYf1t6ViOaEWws9AQ0EBZ48YKp68jfRA="; }; - cargoHash = "sha256-4Gm8nQIsZzaPYtqf7eAyX0iX0rUFBnEiavJR1qcc8/g="; + cargoHash = "sha256-mKpAGS6Rxoq2v/VW0AncVx/9BjvG7wM8ePTR+661e5U="; nativeBuildInputs = [ pkg-config From 14e6e441ad8100993c9b3351c469f06d47e20cfe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Oct 2023 22:43:24 +0000 Subject: [PATCH 44/73] exportarr: 1.5.5 -> 1.6.0 --- pkgs/servers/monitoring/prometheus/exportarr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/pkgs/servers/monitoring/prometheus/exportarr/default.nix index a7649ba17bb8..27e5da34efcf 100644 --- a/pkgs/servers/monitoring/prometheus/exportarr/default.nix +++ b/pkgs/servers/monitoring/prometheus/exportarr/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "exportarr"; - version = "1.5.5"; + version = "1.6.0"; src = fetchFromGitHub { owner = "onedr0p"; repo = "exportarr"; rev = "v${version}"; - hash = "sha256-qe3i/sukAkE3DNiSc5BsY9OFWoAVuLsuYStlPfpVZQQ="; + hash = "sha256-jmvVhNaE0cVLHTLH6qKIi4ETr7Q8CTEhXPwzjWyfx5k="; }; - vendorHash = "sha256-M+XDd2ubF4HLpFNPlhn++YXWwPwL6+5TMU+BDdkP+k0="; + vendorHash = "sha256-AYuyOAU7T9YluX77zPu4o377L4wCQzVUrQunt0UIZlU="; subPackages = [ "cmd/exportarr" ]; From 6d509627e2fe984a1de01dec931100a14f815e8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Oct 2023 23:13:36 +0000 Subject: [PATCH 45/73] faas-cli: 0.16.16 -> 0.16.17 --- pkgs/development/tools/faas-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 09069eb883f7..383ca0929449 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.16.16"; + version = "0.16.17"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-QYwUXZdix5GeOYF3F9XR4lIE9cKZGGgEOtROzirLw3o="; + sha256 = "sha256-AiYqMXLc8YaPILx5TnL8E3xrYCDqBUfI+zzFQIknNJE="; }; vendorHash = null; From 0ec908a1b0842ef8de85e5fef8da5847c2c9f49e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Oct 2023 01:15:24 +0200 Subject: [PATCH 46/73] python311Packages.pydbus: patch python311 compat The package has not been updated since 2018 and has been running into removals on python311. Fortunately getfullargspec is a drop-in replacement for getargspec, so a simple substitution restore life support for now. --- .../python-modules/pydbus/default.nix | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pydbus/default.nix b/pkgs/development/python-modules/pydbus/default.nix index e804b2c85998..64dafa97db7c 100644 --- a/pkgs/development/python-modules/pydbus/default.nix +++ b/pkgs/development/python-modules/pydbus/default.nix @@ -1,21 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, pygobject3, pythonAtLeast }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pygobject3 +}: buildPythonPackage rec { pname = "pydbus"; version = "0.6.0"; + pyproejct = true; - # Python 3.11 changed the API of the `inspect` module and pydbus was never - # updated to adapt; last commit was in 2018. - disabled = pythonAtLeast "3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "0b0gipvz7vcfa9ddmwq2jrx16d4apb0hdnl5q4i3h8jlzwp1c1s2"; + src = fetchFromGitHub { + owner = "LEW21"; + repo = "pydbus"; + rev = "refs/tags/v${version}"; + hash = "sha256-F1KKXG+7dWlEbToqtF3G7wU0Sco7zH5NqzlL58jyDGw="; }; - propagatedBuildInputs = [ pygobject3 ]; + postPatch = '' + substituteInPlace pydbus/_inspect3.py \ + --replace "getargspec" "getfullargspec" + ''; - pythonImportsCheck = [ "pydbus" ]; + propagatedBuildInputs = [ + pygobject3 + ]; + + pythonImportsCheck = [ + "pydbus" + "pydbus.generic" + ]; + + doCheck = false; # requires a working dbus setup meta = { homepage = "https://github.com/LEW21/pydbus"; From 243ffde8672190703d596b4f608a1025cae8c6b4 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 27 Oct 2023 02:19:51 +0200 Subject: [PATCH 47/73] tautulli: 2.13.1 -> 2.13.2 --- pkgs/servers/tautulli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 3872b7783529..2bab6f742316 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.13.1"; + version = "2.13.2"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+uVBvtwMJRqPWJKQ0Tn9wLiuR02Btsbxd9+rl9tAlgg="; + sha256 = "sha256-G1YNOJ2snddhFOWDkRQikQ1qC3G1BHg+qb2j5ffIR8k="; }; installPhase = '' From 9484fedba1add60168a8cea299848a431ee96e9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Oct 2023 02:55:33 +0000 Subject: [PATCH 48/73] circt: 1.56.1 -> 1.58.0 --- pkgs/development/compilers/circt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index f8eaae9a0401..129388005b5a 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.56.1"; + version = "1.58.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-MOwjfSUd5Dvlvek763AMZWK29dUoc2fblb5qtByTqLA="; + sha256 = "sha256-WX3eZl9/N8K4VzBOLHZrxwEI7V+AxOnSA0XYKFHlqcE="; fetchSubmodules = true; }; From 4106d42ac16f18153a6efc9c6e502f7bf429125a Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Wed, 25 Oct 2023 23:30:18 -0400 Subject: [PATCH 49/73] sbcl: CLISP bootstrap host for default systems --- pkgs/development/compilers/sbcl/2.x.nix | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/sbcl/2.x.nix b/pkgs/development/compilers/sbcl/2.x.nix index bd52b41dc809..8156c48256b0 100644 --- a/pkgs/development/compilers/sbcl/2.x.nix +++ b/pkgs/development/compilers/sbcl/2.x.nix @@ -30,31 +30,17 @@ let # non-binary-distributed Lisp) can run on any of these systems, that entry # should be removed from this list. bootstrapBinaries = rec { - aarch64-darwin = { - version = "2.1.2"; - system = "arm64-darwin"; - sha256 = "sha256-H0ALigXcWIypdA+fTf7jERscwbb7QIAfcoxCtGDh0RU="; - }; + # This build segfaults using CLISP. x86_64-darwin = { version = "2.2.9"; system = "x86-64-darwin"; sha256 = "sha256-b1BLkoLIOELAYBYA9eBmMgm1OxMxJewzNP96C9ADfKY="; }; - x86_64-linux = { - version = "1.3.16"; - system = "x86-64-linux"; - sha256 = "0sq2dylwwyqfwkbdvcgqwz3vay9v895zpb0fyzsiwy31d1x9pr2s"; - }; i686-linux = { version = "1.2.7"; system = "x86-linux"; sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j"; }; - aarch64-linux = { - version = "1.3.16"; - system = "arm64-linux"; - sha256 = "0q1brz9c49xgdljzfx8rpxxnlwhadxkcy5kg0mcd9wnxygind1cl"; - }; armv7l-linux = { version = "1.2.14"; system = "armhf-linux"; @@ -200,6 +186,12 @@ stdenv.mkDerivation rec { homepage = "https://sbcl.org"; license = licenses.publicDomain; # and FreeBSD maintainers = lib.teams.lisp.members; - platforms = attrNames bootstrapBinaries; + platforms = attrNames bootstrapBinaries ++ [ + # These aren’t bootstrapped using the binary distribution but compiled + # using a separate (lisp) host + "x86_64-linux" + "aarch64-darwin" + "aarch64-linux" + ]; }; } From 80bff7539d2578c852ff48de675c2f9231912809 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Oct 2023 04:00:07 +0000 Subject: [PATCH 50/73] drawterm: unstable-2023-08-22 -> unstable-2023-09-03 --- pkgs/tools/admin/drawterm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index b5b6a1fb32f3..632da8db0a2b 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "drawterm"; - version = "unstable-2023-08-22"; + version = "unstable-2023-09-03"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "c91c6fac9d725716ca6ecc3002053f941137f24f"; - hash = "sha256-oGcKRx1tP2jeshHhaCHPRKmwKQ3WPYK1tHGGt1/3oDU="; + rev = "c4ea4d299aa1bbbcc972c04adf06c18245ce7674"; + hash = "sha256-Tp3yZb1nteOlz/KhydFdjBrj3OrY20s/Ltfk/EBrIyk="; }; enableParallelBuilding = true; From 077d56eca0e2010db2da2cd02be0360031698acc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Oct 2023 04:34:55 +0000 Subject: [PATCH 51/73] fend: 1.2.2 -> 1.3.1 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 7caff9523724..fe1d957437d0 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.2.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9O+2vCi3CagpIU5pZPA8tLVhyC7KHn93trYdNhsT4n4="; + sha256 = "sha256-iF1E9wBX9UVv/zuCgznXqKLBF+Xk0LqVdJfxFNpmzRI="; }; - cargoHash = "sha256-mRIwmZwO/uqfUJ12ZYKZFPoefvo055Tp+DrfKsoP9q4="; + cargoHash = "sha256-xf4Q6nk2sYuAV+B7dsRF+feiLRKLXDSHnlYmw+o5bNc="; nativeBuildInputs = [ pandoc installShellFiles copyDesktopItems ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; From 12bd3440ac077313f2d1e1fe5c706d5e1db78f26 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 27 Oct 2023 07:17:31 +0200 Subject: [PATCH 52/73] =?UTF-8?q?ocamlPackages.ocaml=5Fexpat:=201.1.0=20?= =?UTF-8?q?=E2=86=92=201.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/expat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index 5f491a1bb6d3..2449308567e4 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -5,13 +5,13 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02") stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-expat"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "whitequark"; repo = "ocaml-expat"; rev = "v${version}"; - sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q"; + hash = "sha256-eDA6MUcztaI+fpunWBdanNnPo9Y5gvbj/ViVcxYYEBg="; }; prePatch = '' From 43c8075099578aea5aa31d2c7a0f8c3068f4c56f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Oct 2023 05:33:47 +0000 Subject: [PATCH 53/73] flow: 0.218.0 -> 0.219.5 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index b647eb851e12..ba5e608bd354 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.218.0"; + version = "0.219.5"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-QmC1K2msiIN7bBwlrsQ8in3YGUoVqf2w21HbiLULWhM="; + sha256 = "sha256-cg0tqwvYQ43Nvu6fQHGEX002sjmDBcz2AGke+K5Gk7g="; }; postPatch = '' From 30fa94edbcac1b7d6240ff38de03cdfabaf2f5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 25 Oct 2023 23:18:13 +0200 Subject: [PATCH 54/73] ddclient: 3.11.0 -> 3.11.1 Changelog: https://github.com/ddclient/ddclient/blob/66af014aadb32b4894e3708dc48635f6951c44a4/ChangeLog.md#2023-10-25-v3111 --- pkgs/tools/networking/ddclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index eafba0d4f527..6f935de113ae 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -5,7 +5,7 @@ let in perlPackages.buildPerlPackage rec { pname = "ddclient"; - version = "3.11.0"; + version = "3.11.1"; outputs = [ "out" ]; @@ -13,7 +13,7 @@ perlPackages.buildPerlPackage rec { owner = "ddclient"; repo = "ddclient"; rev = "v${version}"; - sha256 = "sha256-s/gdTvEY4QIVidqNnN7GYrpCsp4nZ0GEH8Jv+LkSr48="; + sha256 = "sha256-OM+JW3HP0llzyJNqmP5PLZ30TOvC2nA1bWwOspTbZZM="; }; postPatch = '' From 095c80fbfcfe65f80aca37ebd34854476e4a1008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 26 Oct 2023 20:34:45 +0200 Subject: [PATCH 55/73] ddclient: remove unused iproute2 --- pkgs/tools/networking/ddclient/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 6f935de113ae..53401cf4acf3 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, perlPackages, autoreconfHook, iproute2, perl, curl }: +{ lib, fetchFromGitHub, perlPackages, autoreconfHook, perl, curl }: let myPerl = perl.withPackages (ps: [ ps.JSONPP ]); From 7f6947092bd15e2ed2247d2d2c4e6c3134d5f4f3 Mon Sep 17 00:00:00 2001 From: Siddhartha Date: Thu, 26 Oct 2023 22:07:28 -0400 Subject: [PATCH 56/73] xorg-server: 21.1.8 -> 21.1.9 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index eb9c1ced6711..870ea4ad0585 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -4159,11 +4159,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; - version = "21.1.8"; + version = "21.1.9"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.8.tar.xz"; - sha256 = "0lmimvaw9x0ymdhjfqsrbx689bcapy8c24ajw9705j2harrxpaiq"; + url = "mirror://xorg/individual/xserver/xorg-server-21.1.9.tar.xz"; + sha256 = "0fjk9ggcrn96blq0bm80739yj23s3gjjjsc0nxk4jk0v07i7nsgz"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index e7c93e10bacb..06a2b69d505a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.4.tar.xz mirror://xorg/individual/util/makedepend-1.0.8.tar.xz mirror://xorg/individual/util/util-macros-1.20.0.tar.xz mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz -mirror://xorg/individual/xserver/xorg-server-21.1.8.tar.xz +mirror://xorg/individual/xserver/xorg-server-21.1.9.tar.xz From 150228cb64675d3eaf9c2ba8e560529c5a812665 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 27 Oct 2023 14:47:20 +0800 Subject: [PATCH 57/73] cargo-spellcheck: fix build on Darwin --- pkgs/development/tools/rust/cargo-spellcheck/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index d608f6775b1a..6af361a12d2d 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , stdenv , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { @@ -20,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; preCheck = "HOME=$(mktemp -d)"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eacb266e2ff7..b4d33c9a4a98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17166,7 +17166,7 @@ with pkgs; cargo-sort = callPackage ../development/tools/rust/cargo-sort { }; cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; cargo-supply-chain = callPackage ../development/tools/rust/cargo-supply-chain { }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; From 8da071d624926e78e7dde16f818d700ced73698e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 27 Oct 2023 03:43:59 -0400 Subject: [PATCH 58/73] davfs2: fix aarch64 cross compilation by explicitly setting --with-neon (#263453) --- pkgs/tools/filesystems/davfs2/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 3d3c1b54db82..a64812e96b9c 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { autoreconfHook ]; - buildInputs = [ neon zlib ]; + buildInputs = [ + zlib + ]; patches = [ ./fix-sysconfdir.patch @@ -36,7 +38,10 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ "--sysconfdir=/etc" ]; + configureFlags = [ + "--sysconfdir=/etc" + "--with-neon=${lib.getLib neon}" + ]; meta = { homepage = "https://savannah.nongnu.org/projects/davfs2"; From f166e5a21462c847d11b0a422e5d1cc034b330fb Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Fri, 27 Oct 2023 10:32:06 +0200 Subject: [PATCH 59/73] python3Packages.pyscf: migrate tests from nose to pytest --- .../python-modules/pyscf/default.nix | 86 ++++++++----------- 1 file changed, 37 insertions(+), 49 deletions(-) diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index 5089e19c2264..784978b7ca47 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -10,8 +10,7 @@ , h5py , numpy , scipy -, nose -, nose-exclude +, pytestCheckHook }: buildPythonPackage rec { @@ -47,8 +46,7 @@ buildPythonPackage rec { scipy ]; - nativeCheckInputs = [ nose nose-exclude ]; - + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pyscf" ]; preCheck = '' # Set config used by tests to ensure reproducibility @@ -57,53 +55,43 @@ buildPythonPackage rec { ulimit -s 20000 export PYSCF_CONFIG_FILE=$(pwd)/pyscf/pyscf_config.py ''; - # As defined for the PySCF CI at https://github.com/pyscf/pyscf/blob/master/.github/workflows/run_tests.sh - # minus some additionally numerically instable tests, that are sensitive to BLAS, FFTW, etc. - checkPhase = '' - runHook preCheck - nosetests pyscf/ -v \ - --exclude-dir=examples --exclude-dir=pyscf/pbc/grad \ - --exclude-dir=pyscf/x2c \ - --exclude-dir=pyscf/adc \ - --exclude-dir=pyscf/pbc/tdscf \ - -e test_bz \ - -e h2o_vdz \ - -e test_mc2step_4o4e \ - -e test_ks_noimport \ - -e test_jk_hermi0 \ - -e test_j_kpts \ - -e test_k_kpts \ - -e test_lda \ - -e high_cost \ - -e skip \ - -e call_in_background \ - -e libxc_cam_beta_bug \ - -e test_finite_diff_rks_eph \ - -e test_finite_diff_uks_eph \ - -e test_finite_diff_roks_grad \ - -e test_finite_diff_df_roks_grad \ - -e test_frac_particles \ - -e test_nosymm_sa4_newton \ - -e test_pipek \ - -e test_n3_cis_ewald \ - -e test_veff \ - -I test_kuccsd_supercell_vs_kpts\.py \ - -I test_kccsd_ghf\.py \ - -I test_h_.*\.py \ - --exclude-test=pyscf/pbc/gw/test/test_kgw_slow_supercell.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/gw/test/test_kgw_slow_supercell.DiamondKSTestSupercell3 \ - --exclude-test=pyscf/pbc/gw/test/test_kgw_slow.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/gw/test/test_kgw_slow.DiamondKSTestSupercell3 \ - --exclude-test=pyscf/pbc/tdscf/test/test_krhf_slow_supercell.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_hf.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_ks.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_supercell_hf.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_supercell_ks.DiamondTestSupercell3 \ - -I .*_slow.*py -I .*_kproxy_.*py -I test_proxy.py tdscf/*_slow.py gw/*_slow.py + # Numerically slightly off tests + disabledTests = [ + "test_tdhf_singlet" + "test_ab_hf" + "test_ea" + "test_bz" + "h2o_vdz" + "test_mc2step_4o4e" + "test_ks_noimport" + "test_jk_hermi0" + "test_j_kpts" + "test_k_kpts" + "test_lda" + "high_cost" + "skip" + "call_in_background" + "libxc_cam_beta_bug" + "test_finite_diff_rks_eph" + "test_finite_diff_uks_eph" + "test_finite_diff_roks_grad" + "test_finite_diff_df_roks_grad" + "test_frac_particles" + "test_nosymm_sa4_newton" + "test_pipek" + "test_n3_cis_ewald" + "test_veff" + "test_collinear_kgks_gga" + ]; - runHook postCheck - ''; + pytestFlagsArray = [ + "--ignore=pyscf/pbc/tdscf" + "--ignore=pyscf/pbc/gw" + "--ignore-glob=*_slow.*py" + "--ignore-glob=*_kproxy_.*py" + "--ignore-glob=test_proxy.py" + ]; meta = with lib; { description = "Python-based simulations of chemistry framework"; From 046fd15dbe740f329acf7e5e92463724594b1edb Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 27 Oct 2023 10:51:00 +0200 Subject: [PATCH 60/73] weechat: 4.1.0 -> 4.1.1 --- pkgs/applications/networking/irc/weechat/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 23bfb324c1ae..952ca75bb6af 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.1.0"; + version = "4.1.1"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-AwSC5bjw9pxr/Upja2+m12tkqeweF58auqNbGrONHhA="; + hash = "sha256-d0I4YU2OY+TT1ac6bLZA7Hb+BsyYK4eoySNlFXkndnU="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 @@ -90,10 +90,10 @@ let meta = { homepage = "https://weechat.org/"; changelog = "https://weechat.org/files/doc/weechat/ChangeLog-${version}.html"; - description = "A fast, light and extensible chat client"; + description = "Fast, light and extensible chat client"; longDescription = '' You can find more documentation as to how to customize this package - (eg. adding python modules for scripts that would require them, etc.) + (e.g. adding python modules for scripts that would require them, etc.) on https://nixos.org/nixpkgs/manual/#sec-weechat . ''; license = lib.licenses.gpl3; From 0345d9eafb936fb239e0929a994bf4142b268a78 Mon Sep 17 00:00:00 2001 From: Hubble the Wolverine Date: Fri, 27 Oct 2023 02:08:49 -0700 Subject: [PATCH 61/73] python311Packages.fsspec: fix hash mismatch Introduced in #262753 Maybe the package updated in place. --- pkgs/development/python-modules/fsspec/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index bad3f4a4795c..a90fe66a48cc 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = "filesystem_spec"; rev = "refs/tags/${version}"; - hash = "sha256-GVBF2ppyIEvC4rR9IF4gwsdc4fJe1xHS1CyJEwFuVGw="; + hash = "sha256-cLkCQQbb/AakDSz1NTrVlHh8LdgoqtjX8OPT+Nb1NA4="; }; propagatedBuildInputs = [ From ca1b639b1d153843d42d8054d81548dbbb3afa5b Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 27 Oct 2023 11:37:38 +0200 Subject: [PATCH 62/73] gopls: 0.13.2 -> 0.14.0 (#263664) https://github.com/golang/tools/releases/tag/gopls%2Fv0.14.0 --- pkgs/development/tools/language-servers/gopls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix index 0c0213582722..6085ec71a08d 100644 --- a/pkgs/development/tools/language-servers/gopls/default.nix +++ b/pkgs/development/tools/language-servers/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - hash = "sha256-fRpVAYg4UwRe3bcjQPOnCGWSANfoTwD5Y9vs3QET1eM="; + hash = "sha256-zCiNd0HhGdN65wD7Z6lbGLhvGi8BFtq7X5QDpYl0/Fw="; }; modRoot = "gopls"; - vendorHash = "sha256-9d7vgCMc1M5Cab+O10lQmKGfL9gqO3sajd+3rF5cums="; + vendorHash = "sha256-BK2s44EtMjAEDXZeQHdiIb1tUMogujcDM7tRwO7LMRw="; doCheck = false; From 68df99a49656e10396a75464cee5a8057c5bd1a4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 25 Oct 2023 08:35:56 +0200 Subject: [PATCH 63/73] ruff: 0.0.292 -> 0.1.3 Changelog: https://github.com/astral-sh/ruff/releases/tag/v0.1.3 --- pkgs/development/tools/ruff/Cargo.lock | 3696 ----------------------- pkgs/development/tools/ruff/default.nix | 16 +- 2 files changed, 5 insertions(+), 3707 deletions(-) delete mode 100644 pkgs/development/tools/ruff/Cargo.lock diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock deleted file mode 100644 index c0c7795d90b2..000000000000 --- a/pkgs/development/tools/ruff/Cargo.lock +++ /dev/null @@ -1,3696 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" -dependencies = [ - "memchr", -] - -[[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 = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "annotate-snippets" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7021ce4924a3f25f802b2cccd1af585e39ea1a363a1aa2e72afe54b67a3a7a7" - -[[package]] -name = "annotate-snippets" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b9d411ecbaf79885c6df4d75fff75858d5995ff25385657a28af47e82f9c36" -dependencies = [ - "unicode-width", - "yansi-term", -] - -[[package]] -name = "anstream" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "argfile" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1287c4f82a41c5085e65ee337c7934d71ab43d5187740a81fb69129013f6a5f6" -dependencies = [ - "fs-err", - "os_str_bytes", -] - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -dependencies = [ - "term", -] - -[[package]] -name = "assert_cmd" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" -dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "bstr" -version = "1.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" -dependencies = [ - "memchr", - "regex-automata 0.3.8", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "cachedir" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e236bf5873ea57ec2877445297f4da008916bfae51567131acfc54a073d694f3" -dependencies = [ - "tempfile", -] - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chic" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b5db619f3556839cb2223ae86ff3f9a09da2c5013be42bc9af08c9589bf70c" -dependencies = [ - "annotate-snippets 0.6.1", -] - -[[package]] -name = "chrono" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "wasm-bindgen", - "windows-targets 0.48.5", -] - -[[package]] -name = "ciborium" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" - -[[package]] -name = "ciborium-ll" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "clap" -version = "4.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_complete" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_complete_command" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d" -dependencies = [ - "clap", - "clap_complete", - "clap_complete_fig", - "clap_complete_nushell", -] - -[[package]] -name = "clap_complete_fig" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9bae21b3f6eb417ad3054c8b1094aa0542116eba4979b1b271baefbfa6b965" -dependencies = [ - "clap", - "clap_complete", -] - -[[package]] -name = "clap_complete_nushell" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e" -dependencies = [ - "clap", - "clap_complete", -] - -[[package]] -name = "clap_derive" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "clap_lex" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" - -[[package]] -name = "clearscreen" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f3f22f1a586604e62efd23f78218f3ccdecf7a33c4500db2d37d85a24fe994" -dependencies = [ - "nix", - "terminfo", - "thiserror", - "which", - "winapi", -] - -[[package]] -name = "codspeed" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b3238416c10f19985b52a937c5b3efc3ed7efe8f7ae263d2aab29a09bca9f57" -dependencies = [ - "colored", - "libc", - "serde_json", -] - -[[package]] -name = "codspeed-criterion-compat" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fecc18f65b942d2b033545bb3bd8430a23eecbbe53fad3b1342fb0e5514bca7b" -dependencies = [ - "codspeed", - "colored", - "criterion", -] - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "colored" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" -dependencies = [ - "is-terminal", - "lazy_static", - "windows-sys 0.48.0", -] - -[[package]] -name = "configparser" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5458d9d1a587efaf5091602c59d299696a3877a439c8f6d461a2d3cce11df87a" - -[[package]] -name = "console" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.45.0", -] - -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - -[[package]] -name = "console_log" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f" -dependencies = [ - "log", - "web-sys", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "countme" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "criterion" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" -dependencies = [ - "anes", - "cast", - "ciborium", - "clap", - "criterion-plot", - "is-terminal", - "itertools 0.10.5", - "num-traits", - "once_cell", - "oorandom", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools 0.10.5", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "darling" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.37", -] - -[[package]] -name = "darling_macro" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys 0.3.7", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys 0.4.1", -] - -[[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" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[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 = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "drop_bomb" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" - -[[package]] -name = "dyn-clone" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "ena" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" -dependencies = [ - "log", -] - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "fern" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" -dependencies = [ - "log", -] - -[[package]] -name = "filetime" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flake8-to-ruff" -version = "0.0.292" -dependencies = [ - "anyhow", - "clap", - "colored", - "configparser", - "itertools 0.11.0", - "log", - "once_cell", - "pep440_rs", - "pretty_assertions", - "regex", - "ruff_linter", - "ruff_workspace", - "rustc-hash", - "serde", - "serde_json", - "strum", - "strum_macros", - "toml", -] - -[[package]] -name = "flate2" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs-err" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" - -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "iana-time-zone" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows", -] - -[[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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" -dependencies = [ - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[package]] -name = "imara-diff" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8" -dependencies = [ - "ahash", - "hashbrown 0.12.3", -] - -[[package]] -name = "imperative" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b70798296d538cdaa6d652941fcc795963f8b9878b9e300c9fab7a522bd2fc0" -dependencies = [ - "phf", - "rust-stemmers", -] - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown 0.14.0", - "serde", -] - -[[package]] -name = "indicatif" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", - "vt100", -] - -[[package]] -name = "indoc" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" - -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "insta" -version = "1.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686" -dependencies = [ - "console", - "globset", - "lazy_static", - "linked-hash-map", - "regex", - "serde", - "similar", - "walkdir", - "yaml-rust", -] - -[[package]] -name = "insta-cmd" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809d3023d1d6e8d5c2206f199251f75cb26180e41f18cb0f22dd119161cb5127" -dependencies = [ - "insta", - "serde", - "serde_json", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "is-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e" -dependencies = [ - "Inflector", - "pmutil 0.6.1", - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "js-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kqueue" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - -[[package]] -name = "lalrpop" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8" -dependencies = [ - "ascii-canvas", - "bit-set", - "diff", - "ena", - "is-terminal", - "itertools 0.10.5", - "lalrpop-util", - "petgraph", - "regex", - "regex-syntax 0.7.5", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid", -] - -[[package]] -name = "lalrpop-util" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lexical-parse-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "libcst" -version = "0.1.0" -source = "git+https://github.com/Instagram/LibCST.git?rev=03179b55ebe7e916f1722e18e8f0b87c01616d1f#03179b55ebe7e916f1722e18e8f0b87c01616d1f" -dependencies = [ - "chic", - "libcst_derive", - "memchr", - "paste", - "peg", - "regex", - "thiserror", -] - -[[package]] -name = "libcst_derive" -version = "0.1.0" -source = "git+https://github.com/Instagram/LibCST.git?rev=03179b55ebe7e916f1722e18e8f0b87c01616d1f#03179b55ebe7e916f1722e18e8f0b87c01616d1f" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "libmimalloc-sys" -version = "0.1.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" -dependencies = [ - "cc", - "libc", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[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 = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mimalloc" -version = "0.1.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" -dependencies = [ - "libmimalloc-sys", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "natord" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nextest-workspace-hack" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d906846a98739ed9d73d66e62c2641eef8321f1734b7a1156ab045a0248fb2b3" - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", -] - -[[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 = "notify" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" -dependencies = [ - "bitflags 2.4.0", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log", - "mio", - "walkdir", - "windows-sys 0.48.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-traits" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -dependencies = [ - "autocfg", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "os_str_bytes" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" -dependencies = [ - "memchr", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "path-absolutize" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5" -dependencies = [ - "path-dedot", -] - -[[package]] -name = "path-dedot" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397" -dependencies = [ - "once_cell", -] - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "peg" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07f2cafdc3babeebc087e499118343442b742cc7c31b4d054682cc598508554" -dependencies = [ - "peg-macros", - "peg-runtime", -] - -[[package]] -name = "peg-macros" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a90084dc05cf0428428e3d12399f39faad19b0909f64fb9170c9fdd6d9cd49b" -dependencies = [ - "peg-runtime", - "proc-macro2", - "quote", -] - -[[package]] -name = "peg-runtime" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739" - -[[package]] -name = "pep440_rs" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887f66cc62717ea72caac4f1eb4e6f392224da3ffff3f40ec13ab427802746d6" -dependencies = [ - "lazy_static", - "regex", - "serde", - "unicode-width", -] - -[[package]] -name = "pep508_rs" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0713d7bb861ca2b7d4c50a38e1f31a4b63a2e2df35ef1e5855cc29e108453e2" -dependencies = [ - "once_cell", - "pep440_rs", - "regex", - "serde", - "thiserror", - "tracing", - "unicode-width", - "url", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_codegen" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" -dependencies = [ - "phf_generator", - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared 0.11.2", - "rand", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pmutil" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pmutil" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "portable-atomic" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "predicates" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" -dependencies = [ - "anstyle", - "difflib", - "itertools 0.10.5", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "pyproject-toml" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "569e259cd132eb8cec5df8b672d187c5260f82ad352156b5da9549d4472e64b0" -dependencies = [ - "indexmap", - "pep440_rs", - "pep508_rs", - "serde", - "toml", -] - -[[package]] -name = "quick-junit" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf780b59d590c25f8c59b44c124166a2a93587868b619fb8f5b47fb15e9ed6d" -dependencies = [ - "chrono", - "indexmap", - "nextest-workspace-hack", - "quick-xml", - "thiserror", - "uuid", -] - -[[package]] -name = "quick-xml" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -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 = "rayon" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.3.8", - "regex-syntax 0.7.5", -] - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.7.5", -] - -[[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 = "result-like" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc7ce6435c33898517a30e85578cd204cbb696875efb93dec19a2d31294f810" -dependencies = [ - "result-like-derive", -] - -[[package]] -name = "result-like-derive" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fabf0a2e54f711c68c50d49f648a1a8a37adcb57353f518ac4df374f0788f42" -dependencies = [ - "pmutil 0.5.3", - "proc-macro2", - "quote", - "syn 1.0.109", - "syn-ext", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "ruff_benchmark" -version = "0.0.0" -dependencies = [ - "codspeed-criterion-compat", - "criterion", - "mimalloc", - "once_cell", - "ruff_linter", - "ruff_python_ast", - "ruff_python_formatter", - "ruff_python_index", - "ruff_python_parser", - "serde", - "serde_json", - "tikv-jemallocator", - "ureq", - "url", -] - -[[package]] -name = "ruff_cache" -version = "0.0.0" -dependencies = [ - "filetime", - "glob", - "globset", - "itertools 0.11.0", - "regex", - "ruff_macros", - "seahash", -] - -[[package]] -name = "ruff_cli" -version = "0.0.292" -dependencies = [ - "annotate-snippets 0.9.1", - "anyhow", - "argfile", - "assert_cmd", - "bincode", - "bitflags 2.4.0", - "cachedir", - "chrono", - "clap", - "clap_complete_command", - "clearscreen", - "colored", - "filetime", - "glob", - "ignore", - "insta", - "insta-cmd", - "is-macro", - "itertools 0.11.0", - "itoa", - "log", - "mimalloc", - "notify", - "path-absolutize", - "rayon", - "regex", - "ruff_cache", - "ruff_diagnostics", - "ruff_formatter", - "ruff_linter", - "ruff_macros", - "ruff_notebook", - "ruff_python_ast", - "ruff_python_formatter", - "ruff_python_stdlib", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "ruff_workspace", - "rustc-hash", - "serde", - "serde_json", - "shellexpand", - "similar", - "strum", - "tempfile", - "test-case", - "thiserror", - "tikv-jemallocator", - "tracing", - "ureq", - "walkdir", - "wild", -] - -[[package]] -name = "ruff_dev" -version = "0.0.0" -dependencies = [ - "anyhow", - "clap", - "ignore", - "imara-diff", - "indicatif", - "indoc", - "itertools 0.11.0", - "libcst", - "once_cell", - "pretty_assertions", - "rayon", - "regex", - "ruff_cli", - "ruff_diagnostics", - "ruff_formatter", - "ruff_linter", - "ruff_notebook", - "ruff_python_ast", - "ruff_python_codegen", - "ruff_python_formatter", - "ruff_python_literal", - "ruff_python_parser", - "ruff_python_stdlib", - "ruff_python_trivia", - "ruff_workspace", - "schemars", - "serde", - "serde_json", - "similar", - "strum", - "strum_macros", - "tempfile", - "toml", - "tracing", - "tracing-indicatif", - "tracing-subscriber", -] - -[[package]] -name = "ruff_diagnostics" -version = "0.0.0" -dependencies = [ - "anyhow", - "log", - "ruff_text_size", - "serde", -] - -[[package]] -name = "ruff_formatter" -version = "0.0.0" -dependencies = [ - "drop_bomb", - "insta", - "ruff_cache", - "ruff_macros", - "ruff_text_size", - "rustc-hash", - "schemars", - "serde", - "static_assertions", - "tracing", - "unicode-width", -] - -[[package]] -name = "ruff_index" -version = "0.0.0" -dependencies = [ - "ruff_macros", - "static_assertions", -] - -[[package]] -name = "ruff_linter" -version = "0.0.292" -dependencies = [ - "aho-corasick", - "annotate-snippets 0.9.1", - "anyhow", - "bitflags 2.4.0", - "chrono", - "clap", - "colored", - "fern", - "glob", - "globset", - "imperative", - "insta", - "is-macro", - "itertools 0.11.0", - "libcst", - "log", - "memchr", - "natord", - "once_cell", - "path-absolutize", - "pathdiff", - "pep440_rs", - "pretty_assertions", - "pyproject-toml", - "quick-junit", - "regex", - "result-like", - "ruff_cache", - "ruff_diagnostics", - "ruff_index", - "ruff_macros", - "ruff_notebook", - "ruff_python_ast", - "ruff_python_codegen", - "ruff_python_index", - "ruff_python_literal", - "ruff_python_parser", - "ruff_python_semantic", - "ruff_python_stdlib", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "schemars", - "semver", - "serde", - "serde_json", - "similar", - "smallvec", - "strum", - "strum_macros", - "tempfile", - "test-case", - "thiserror", - "toml", - "typed-arena", - "unicode-width", - "unicode_names2", - "wsl", -] - -[[package]] -name = "ruff_macros" -version = "0.0.0" -dependencies = [ - "itertools 0.11.0", - "proc-macro2", - "quote", - "ruff_python_trivia", - "syn 2.0.37", -] - -[[package]] -name = "ruff_notebook" -version = "0.0.0" -dependencies = [ - "anyhow", - "insta", - "itertools 0.11.0", - "once_cell", - "ruff_diagnostics", - "ruff_source_file", - "ruff_text_size", - "serde", - "serde_json", - "serde_with", - "test-case", - "thiserror", - "uuid", -] - -[[package]] -name = "ruff_python_ast" -version = "0.0.0" -dependencies = [ - "bitflags 2.4.0", - "insta", - "is-macro", - "itertools 0.11.0", - "memchr", - "once_cell", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "serde", - "smallvec", - "static_assertions", -] - -[[package]] -name = "ruff_python_codegen" -version = "0.0.0" -dependencies = [ - "once_cell", - "ruff_python_ast", - "ruff_python_literal", - "ruff_python_parser", - "ruff_source_file", -] - -[[package]] -name = "ruff_python_formatter" -version = "0.0.0" -dependencies = [ - "anyhow", - "bitflags 2.4.0", - "clap", - "countme", - "insta", - "itertools 0.11.0", - "memchr", - "once_cell", - "ruff_cache", - "ruff_formatter", - "ruff_macros", - "ruff_python_ast", - "ruff_python_index", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "schemars", - "serde", - "serde_json", - "similar", - "smallvec", - "static_assertions", - "thiserror", - "tracing", - "unicode-width", -] - -[[package]] -name = "ruff_python_index" -version = "0.0.0" -dependencies = [ - "itertools 0.11.0", - "ruff_python_ast", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", -] - -[[package]] -name = "ruff_python_literal" -version = "0.0.0" -dependencies = [ - "bitflags 2.4.0", - "hexf-parse", - "is-macro", - "itertools 0.11.0", - "lexical-parse-float", - "rand", - "unic-ucd-category", -] - -[[package]] -name = "ruff_python_parser" -version = "0.0.0" -dependencies = [ - "anyhow", - "bitflags 2.4.0", - "insta", - "is-macro", - "itertools 0.11.0", - "lalrpop", - "lalrpop-util", - "ruff_python_ast", - "ruff_text_size", - "rustc-hash", - "static_assertions", - "tiny-keccak", - "unicode-ident", - "unicode_names2", -] - -[[package]] -name = "ruff_python_resolver" -version = "0.0.0" -dependencies = [ - "env_logger", - "insta", - "log", - "tempfile", -] - -[[package]] -name = "ruff_python_semantic" -version = "0.0.0" -dependencies = [ - "bitflags 2.4.0", - "is-macro", - "ruff_index", - "ruff_python_ast", - "ruff_python_parser", - "ruff_python_stdlib", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "smallvec", -] - -[[package]] -name = "ruff_python_stdlib" -version = "0.0.0" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "ruff_python_trivia" -version = "0.0.0" -dependencies = [ - "insta", - "itertools 0.11.0", - "ruff_python_ast", - "ruff_python_parser", - "ruff_source_file", - "ruff_text_size", - "unicode-ident", -] - -[[package]] -name = "ruff_shrinking" -version = "0.1.0" -dependencies = [ - "anyhow", - "clap", - "fs-err", - "regex", - "ruff_python_ast", - "ruff_python_parser", - "ruff_text_size", - "shlex", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "ruff_source_file" -version = "0.0.0" -dependencies = [ - "insta", - "memchr", - "once_cell", - "ruff_text_size", - "serde", -] - -[[package]] -name = "ruff_text_size" -version = "0.0.0" -dependencies = [ - "schemars", - "serde", - "serde_test", - "static_assertions", -] - -[[package]] -name = "ruff_wasm" -version = "0.0.0" -dependencies = [ - "console_error_panic_hook", - "console_log", - "js-sys", - "log", - "ruff_diagnostics", - "ruff_formatter", - "ruff_linter", - "ruff_python_ast", - "ruff_python_codegen", - "ruff_python_formatter", - "ruff_python_index", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "ruff_workspace", - "serde", - "serde-wasm-bindgen", - "wasm-bindgen", - "wasm-bindgen-test", -] - -[[package]] -name = "ruff_workspace" -version = "0.0.0" -dependencies = [ - "anyhow", - "colored", - "dirs 5.0.1", - "glob", - "globset", - "ignore", - "itertools 0.11.0", - "log", - "once_cell", - "path-absolutize", - "pep440_rs", - "regex", - "ruff_cache", - "ruff_formatter", - "ruff_linter", - "ruff_macros", - "ruff_python_ast", - "ruff_python_formatter", - "ruff_source_file", - "rustc-hash", - "schemars", - "serde", - "shellexpand", - "strum", - "tempfile", - "toml", -] - -[[package]] -name = "rust-stemmers" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" -dependencies = [ - "serde", - "serde_derive", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.38.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[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 = "schemars" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" -dependencies = [ - "dyn-clone", - "schemars_derive", - "serde", - "serde_json", -] - -[[package]] -name = "schemars_derive" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 1.0.109", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "semver" -version = "1.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" - -[[package]] -name = "serde" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-wasm-bindgen" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c9933e5689bd420dc6c87b7a1835701810cbc10cd86a26e4da45b73e6b1d78" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "serde_derive" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "serde_derive_internals" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "serde_json" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_test" -version = "1.0.176" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a2f49ace1498612d14f7e0b8245519584db8299541dfe31a06374a828d620ab" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_with" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" -dependencies = [ - "serde", - "serde_with_macros", -] - -[[package]] -name = "serde_with_macros" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shellexpand" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" -dependencies = [ - "dirs 5.0.1", -] - -[[package]] -name = "shlex" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" - -[[package]] -name = "similar" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.37", -] - -[[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.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn-ext" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b86cb2b68c5b3c078cac02588bc23f3c04bb828c5d3aedd17980876ec6a7be6" -dependencies = [ - "syn 1.0.109", -] - -[[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.48.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 = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminfo" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" -dependencies = [ - "dirs 4.0.0", - "fnv", - "nom", - "phf", - "phf_codegen", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "test-case" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" -dependencies = [ - "test-case-macros", -] - -[[package]] -name = "test-case-core" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" -dependencies = [ - "cfg-if", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "test-case-macros" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.37", - "test-case-core", -] - -[[package]] -name = "thiserror" -version = "1.0.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tikv-jemalloc-sys" -version = "0.5.4+5.3.0-patched" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -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 = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-indicatif" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e05fe4a1c906d94b275d8aeb8ff8b9deaca502aeb59ae8ab500a92b8032ac8" -dependencies = [ - "indicatif", - "tracing", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-ucd-category" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8d4591f5fcfe1bd4453baaf803c40e1b1e69ff8455c47620440b46efef91c0" -dependencies = [ - "matches", - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[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.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unicode_names2" -version = "0.6.0" -source = "git+https://github.com/youknowone/unicode_names2.git?rev=4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde#4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" -dependencies = [ - "phf", -] - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "ureq" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" -dependencies = [ - "base64", - "flate2", - "log", - "once_cell", - "rustls", - "rustls-webpki", - "url", - "webpki-roots", -] - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" -dependencies = [ - "getrandom", - "rand", - "uuid-macro-internal", - "wasm-bindgen", -] - -[[package]] -name = "uuid-macro-internal" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e1ba1f333bd65ce3c9f27de592fcbc256dafe3af2717f56d7c87761fbaccf4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vt100" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84cd863bf0db7e392ba3bd04994be3473491b31e66340672af5d11943c6274de" -dependencies = [ - "itoa", - "log", - "unicode-width", - "vte", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - -[[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.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.37", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "wasm-bindgen-test" -version = "0.3.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6e302a7ea94f83a6d09e78e7dc7d9ca7b186bc2829c24a22d0753efd680671" -dependencies = [ - "console_error_panic_hook", - "js-sys", - "scoped-tls", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb993dd8c836930ed130e020e77d9b2e65dd0fbab1b67c790b0f5d80b11a575" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - -[[package]] -name = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[package]] -name = "wild" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67" -dependencies = [ - "glob", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[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" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[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-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[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_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[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_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[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_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[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_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[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_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "winnow" -version = "0.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" -dependencies = [ - "memchr", -] - -[[package]] -name = "wsl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dab7ac864710bdea6594becbea5b5050333cf34fefb0dc319567eb347950d4" - -[[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 = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "yansi-term" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" -dependencies = [ - "winapi", -] diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 8b42bfbe85c5..15998a7520ae 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -11,22 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.292"; + version = "0.1.3"; src = fetchFromGitHub { owner = "astral-sh"; - repo = pname; - rev = "v${version}"; - hash = "sha256-4D7p5ZMdyemDBaWcCO62bhuPPcIypegqP0YZeX+GJRQ="; + repo = "ruff"; + rev = "refs/tags/v${version}"; + hash = "sha256-AHnEvDzuQd6W+n9wXhMt6TJwoH1rZEY5UXbhFGwl8+g="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "libcst-0.1.0" = "sha256-f4lR1vf0iL6WS7yXUzWUt/tax+xjU6rylG1EgeLex88="; - "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg="; - }; - }; + cargoHash = "sha256-E4alnDonG45JBAKdLI2eaI+fXW2xOo21HI2UtBEVTx0="; nativeBuildInputs = [ installShellFiles From 959de19ff62b197edcb28bc47aefa207c39459d5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 25 Oct 2023 16:00:46 +0200 Subject: [PATCH 64/73] python311Packages.pytest-examples: disable failing test --- pkgs/development/python-modules/pytest-examples/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pytest-examples/default.nix b/pkgs/development/python-modules/pytest-examples/default.nix index 212938df20b6..3ac626a3f997 100644 --- a/pkgs/development/python-modules/pytest-examples/default.nix +++ b/pkgs/development/python-modules/pytest-examples/default.nix @@ -56,6 +56,12 @@ buildPythonPackage rec { "pytest_examples" ]; + disabledTests = [ + # Test fails with latest ruff v0.1.2 + # See https://github.com/pydantic/pytest-examples/issues/26 + "test_ruff_error" + ]; + meta = with lib; { description = "Pytest plugin for testing examples in docstrings and markdown files"; homepage = "https://github.com/pydantic/pytest-examples"; From 44f7a8c2f2741e8ffa2f3f6ecce73ea6afaaf759 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 25 Oct 2023 23:13:47 +0200 Subject: [PATCH 65/73] nbqa: disable failing test --- pkgs/tools/misc/nbqa/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/nbqa/default.nix b/pkgs/tools/misc/nbqa/default.nix index 214ab79abd63..cc988a02bc06 100644 --- a/pkgs/tools/misc/nbqa/default.nix +++ b/pkgs/tools/misc/nbqa/default.nix @@ -76,6 +76,9 @@ python3.pkgs.buildPythonApplication rec { "test_running_in_different_dir_works" "test_unable_to_reconstruct_message_pythonpath" "test_with_subcommand" + # Broken since ruff was updated to 0.1.2 + # A PR was opened upstream: https://github.com/nbQA-dev/nbQA/issues/834 + "test_ruff_works" ]; disabledTestPaths = [ From 0e2319717862227077531980639f2b45e685b3e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Oct 2023 12:09:07 +0200 Subject: [PATCH 66/73] python311Packages.py3status: fix build --- pkgs/development/python-modules/py3status/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index f0f5484aeb56..d635a6a4a88c 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -6,6 +6,7 @@ , dbus-python , fetchPypi , file +, hatchling , i3 , i3ipc , libnotify @@ -24,12 +25,17 @@ buildPythonPackage rec { pname = "py3status"; version = "3.53"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-vZrzHERjAg9J004A2dAbq8hKmAUslCTaRdwEAe9JRqU="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ pytz requests From 690ae1f887dc5a4abb99a233560e0f46d0d45e7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 27 Oct 2023 11:32:53 +0100 Subject: [PATCH 67/73] arandr: remove domenkozar as maintainer --- pkgs/tools/X11/arandr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index fd47e357375f..1421b2a028da 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -35,6 +35,6 @@ buildPythonApplication rec { homepage = "https://christian.amsuess.com/tools/arandr/"; description = "A simple visual front end for XRandR"; license = licenses.gpl3; - maintainers = with maintainers; [ domenkozar gepbird ]; + maintainers = with maintainers; [ gepbird ]; }; } From afda4f87d376affd34d693d4fb1c138c6168fc86 Mon Sep 17 00:00:00 2001 From: Jennifer Graul Date: Fri, 27 Oct 2023 10:08:54 +0200 Subject: [PATCH 68/73] python3Packages.py-radix-sr: change maintainers to wdz team --- pkgs/development/python-modules/py-radix-sr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/py-radix-sr/default.nix b/pkgs/development/python-modules/py-radix-sr/default.nix index f76f12708f83..da14d8a95799 100644 --- a/pkgs/development/python-modules/py-radix-sr/default.nix +++ b/pkgs/development/python-modules/py-radix-sr/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Python radix tree for IPv4 and IPv6 prefix matching"; homepage = "https://github.com/SEKOIA-IO/py-radix"; license = with licenses; [ isc bsdOriginal ]; - maintainers = with maintainers; [ netali ]; + maintainers = teams.wdz.members; }; } From f40016ee083e0b504614c705fe2925e273cf4941 Mon Sep 17 00:00:00 2001 From: Jennifer Graul Date: Fri, 27 Oct 2023 10:10:11 +0200 Subject: [PATCH 69/73] python3Packages.coredis: change maintainers to wdz team --- pkgs/development/python-modules/coredis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/coredis/default.nix b/pkgs/development/python-modules/coredis/default.nix index 9185fe48bb9d..79faced6c3c5 100644 --- a/pkgs/development/python-modules/coredis/default.nix +++ b/pkgs/development/python-modules/coredis/default.nix @@ -60,6 +60,6 @@ buildPythonPackage rec { homepage = "https://github.com/alisaifee/coredis"; changelog = "https://github.com/alisaifee/coredis/blob/${src.rev}/HISTORY.rst"; license = licenses.mit; - maintainers = with maintainers; [ netali ]; + maintainers = teams.wdz.members; }; } From 1327d996fb639b232d3097cf232e6aeadb2af033 Mon Sep 17 00:00:00 2001 From: Jennifer Graul Date: Fri, 27 Oct 2023 10:29:27 +0200 Subject: [PATCH 70/73] oxidized: replace netali with wdz team as maintainer --- pkgs/tools/admin/oxidized/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix index 0969acab5e44..6e09092874cc 100644 --- a/pkgs/tools/admin/oxidized/default.nix +++ b/pkgs/tools/admin/oxidized/default.nix @@ -14,7 +14,7 @@ bundlerApp { description = "A network device configuration backup tool. It's a RANCID replacement!"; homepage = "https://github.com/ytti/oxidized"; license = licenses.asl20; - maintainers = with maintainers; [ nicknovitski netali ]; + maintainers = with maintainers; [ nicknovitski ] ++ teams.wdz.members; platforms = platforms.linux; }; } From 37991566423cfd1c57e755427484e9464c2095db Mon Sep 17 00:00:00 2001 From: Jennifer Graul Date: Fri, 27 Oct 2023 10:32:27 +0200 Subject: [PATCH 71/73] wdz maintainer team: remove netali --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index f8dbd637d77f..79b7ce448cd6 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -931,7 +931,6 @@ with lib.maintainers; { wdz = { members = [ n0emis - netali vidister johannwagner yuka From 640f50fdd8c4901985e40f914632212609c61c63 Mon Sep 17 00:00:00 2001 From: Jennifer Graul Date: Fri, 27 Oct 2023 10:34:41 +0200 Subject: [PATCH 72/73] iperf3d: add wdz team as maintainers --- pkgs/tools/networking/iperf3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/iperf3d/default.nix b/pkgs/tools/networking/iperf3d/default.nix index f92299adf2e0..1edcaf86ed2e 100644 --- a/pkgs/tools/networking/iperf3d/default.nix +++ b/pkgs/tools/networking/iperf3d/default.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec { description = "A iperf3 client and server wrapper for dynamic server ports"; homepage = "https://github.com/wobcom/iperf3d"; license = licenses.mit; - maintainers = [ maintainers.netali ]; + maintainers = with maintainers; [ netali ] ++ teams.wdz.members; }; } From 836f2f7233567667516645c5261635b241133c0d Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Fri, 27 Oct 2023 12:01:05 +1100 Subject: [PATCH 73/73] morgen: bump electron --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f93c81cd65f5..4999b9f046e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10948,7 +10948,7 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; morgen = callPackage ../applications/office/morgen { - electron = electron_22; + electron = electron_25; # blank screen with electron_26 }; mosh = callPackage ../tools/networking/mosh { };