From 788911b90ca7c1f2de7676ed356ec1e0733965b4 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Wed, 19 Feb 2025 17:08:11 +0100 Subject: [PATCH 001/160] zoraxy: 3.1.1 -> 3.1.8 --- pkgs/by-name/zo/zoraxy/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/zo/zoraxy/package.nix b/pkgs/by-name/zo/zoraxy/package.nix index 0b92a4188293..9247c252102f 100644 --- a/pkgs/by-name/zo/zoraxy/package.nix +++ b/pkgs/by-name/zo/zoraxy/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "zoraxy"; - version = "3.1.1"; + version = "3.1.8"; src = fetchFromGitHub { owner = "tobychui"; repo = "zoraxy"; - tag = version; - hash = "sha256-ZjsBGtY6M5jIXylzg4k8U4krwqx5d5VuMiVHAeUIbXY="; + tag = "v${version}"; + hash = "sha256-0BJuomRz/ZnvHQXPZBBrVv1nk2UFPGGdjsZ/FpUAtwk="; }; sourceRoot = "${src.name}/src"; - vendorHash = "sha256-p2nczUMT3FfYX32yvbR0H5FyHV2v9I18yvn0lwUwy+A="; + vendorHash = "sha256-gqDgM+xyvzrpQEQz0fju8GEtQhJOaL6FeuwYxgeSRmo="; checkFlags = let @@ -27,6 +27,8 @@ buildGoModule rec { "TestReplaceLocationHostRelative" "TestHandleTraceRoute" "TestHandlePing" + "TestListTable" + "TestWriteAndRead" ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; From 434e31369b68abf5b09f00b28cc897d8d61f1456 Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Thu, 20 Feb 2025 17:10:30 +0900 Subject: [PATCH 002/160] python3Packages.betterproto: fix build failure --- .../python-modules/betterproto/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index 6eb47812b1df..e77dffda264b 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -19,6 +19,21 @@ grpcio-tools, }: +let + # using a older version of pytest-asyncio only for tests + # https://github.com/pytest-dev/pytest-asyncio/issues/928 + pytest-asyncio_23_8 = ( + pytest-asyncio.overridePythonAttrs (old: rec { + version = "0.23.8"; + src = fetchFromGitHub { + inherit (old.src) owner repo; + tag = "v${version}"; + hash = "sha256-kMv0crYuYHi1LF+VlXizZkG87kSL7xzsKq9tP9LgFVY="; + }; + }) + ); +in + buildPythonPackage rec { pname = "betterproto"; version = "2.0.0b6"; @@ -55,7 +70,7 @@ buildPythonPackage rec { nativeCheckInputs = [ grpcio-tools pydantic - pytest-asyncio + pytest-asyncio_23_8 pytest-mock pytest7CheckHook tomlkit From 434c4f720809cc3654cfb0214f48187c719efebc Mon Sep 17 00:00:00 2001 From: iosmanthus Date: Tue, 25 Feb 2025 15:31:44 +0800 Subject: [PATCH 003/160] follow: 0.2.0-beta.2 -> 0.3.7 Signed-off-by: iosmanthus --- pkgs/by-name/fo/follow/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/follow/package.nix index fed49a03069b..c942a2e62d71 100644 --- a/pkgs/by-name/fo/follow/package.nix +++ b/pkgs/by-name/fo/follow/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "follow"; - version = "0.2.0-beta.2"; + version = "0.3.7"; src = fetchFromGitHub { owner = "RSSNext"; repo = "Follow"; rev = "v${version}"; - hash = "sha256-7KSPZj9QG6zksji/eY8jczBDHr/9tStlw26LKVqXTAw="; + hash = "sha256-TPzrQo6214fXQmF45p5agQ1zqLYzpmMpYb89ASPsWio="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-FzMjN0rIjYxexf6tix4qi3mnuPkadjKihhN0Pj5y2nU="; + hash = "sha256-xNGLYzEz1G5sZSqmji+ItJ9D1vvZcwkkygnDeuypcIM="; }; env = { @@ -38,11 +38,10 @@ stdenv.mkDerivation rec { # This environment variables inject the production Vite config at build time. # Copy from: - # 1. https://github.com/RSSNext/Follow/blob/v0.2.0-beta.2/.github/workflows/build.yml#L18 + # 1. https://github.com/RSSNext/Follow/blob/v0.3.7/.github/workflows/build.yml#L18 # 2. And logs in the corresponding GitHub Actions: https://github.com/RSSNext/Follow/actions/workflows/build.yml VITE_WEB_URL = "https://app.follow.is"; VITE_API_URL = "https://api.follow.is"; - VITE_IMGPROXY_URL = "https://thumbor.follow.is"; VITE_SENTRY_DSN = "https://e5bccf7428aa4e881ed5cb713fdff181@o4507542488023040.ingest.us.sentry.io/4507570439979008"; VITE_OPENPANEL_CLIENT_ID = "0e477ab4-d92d-4d6e-b889-b09d86ab908e"; VITE_OPENPANEL_API_URL = "https://openpanel.follow.is/api"; @@ -57,6 +56,8 @@ stdenv.mkDerivation rec { }; }; + dontCheckForBrokenSymlinks = true; + desktopItem = makeDesktopItem { name = "follow"; desktopName = "Follow"; From 90914f256c592d4512ecf8706d21d097a26dbd96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Mar 2025 20:16:36 +0000 Subject: [PATCH 004/160] python312Packages.types-lxml: 2024.12.13 -> 2025.02.24 --- pkgs/development/python-modules/types-lxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-lxml/default.nix b/pkgs/development/python-modules/types-lxml/default.nix index df4ed0262b68..63d684e2d4a5 100644 --- a/pkgs/development/python-modules/types-lxml/default.nix +++ b/pkgs/development/python-modules/types-lxml/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "types-lxml"; - version = "2024.12.13"; + version = "2025.02.24"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "abelcheung"; repo = "types-lxml"; tag = version; - hash = "sha256-iqIOwQIg6EB/m8FIoUzkvh1W0w4bKmS9zi4Z+5qlC+0="; + hash = "sha256-LkE4APp1r8mTofaTfOvrc8qRHQYRs3VQhRrdXKdBW/Q="; }; build-system = [ pdm-backend ]; From 7d71d994cac2414ebbaa2af78306ad3955568546 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 3 Mar 2025 22:09:28 +0100 Subject: [PATCH 005/160] rke2_1_29: 1.29.13+rke2r1 -> 1.29.14+rke2r1 https://github.com/rancher/rke2/releases/tag/v1.29.14%2Brke2r1 --- .../networking/cluster/rke2/1_29/versions.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/cluster/rke2/1_29/versions.nix b/pkgs/applications/networking/cluster/rke2/1_29/versions.nix index 64f32eaeee5c..778b8e11ef97 100644 --- a/pkgs/applications/networking/cluster/rke2/1_29/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_29/versions.nix @@ -1,11 +1,11 @@ { - rke2Version = "1.29.13+rke2r1"; - rke2Commit = "00803ef95072be9d13b6e52a56fa9b6d9e7b0a51"; - rke2TarballHash = "sha256-1OphaTrEU2MvV0kdEyxomRGgbl/YSVikcYtLuL3QnBI="; - rke2VendorHash = "sha256-6XczvyQMqYqHHu+cSsmXsi7zMG128ZwiAHr482qQqpI="; - k8sImageTag = "v1.29.13-rke2r1-build20250117"; - etcdVersion = "v3.5.16-k3s1-build20241106"; + rke2Version = "1.29.14+rke2r1"; + rke2Commit = "700728b7c1efe5db28004c747819b635254e9a91"; + rke2TarballHash = "sha256-K1Yn85NBl4t0OwaETfqgeZVIgAzbLevY0lyOHs5YwfM="; + rke2VendorHash = "sha256-WG++RPbIhDNnd9BRbEop4qtDcaKJTUz+YzeygZfDxLI="; + k8sImageTag = "v1.29.14-rke2r1-build20250213"; + etcdVersion = "v3.5.18-k3s1-build20250210"; pauseVersion = "3.6"; ccmVersion = "v1.29.10-0.20241016053521-9510ac25fefb-build20241016"; - dockerizedVersion = "v1.29.13-rke2r1"; + dockerizedVersion = "v1.29.14-rke2r1"; } From 2c18aaf1d2d0a11fc3ea73b707a61aebd4ba05f6 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 3 Mar 2025 22:13:38 +0100 Subject: [PATCH 006/160] rke2_1_30: 1.30.9+rke2r1 -> 1.30.10+rke2r1 https://github.com/rancher/rke2/releases/tag/v1.30.10%2Brke2r1 --- .../networking/cluster/rke2/1_30/versions.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/cluster/rke2/1_30/versions.nix b/pkgs/applications/networking/cluster/rke2/1_30/versions.nix index 8ff0e4f20431..6565e4b3550d 100644 --- a/pkgs/applications/networking/cluster/rke2/1_30/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_30/versions.nix @@ -1,11 +1,11 @@ { - rke2Version = "1.30.9+rke2r1"; - rke2Commit = "bfd23524f32a4d9fa6f19ab58a2d47572e56f813"; - rke2TarballHash = "sha256-/WVKmK9ZackY9ULST0zFi/RRwA4ZR3u1DXULWTc6G3o="; - rke2VendorHash = "sha256-kghiYswm3s7bILGp8t452jx84MY73EF9OTaWdncFr34="; - k8sImageTag = "v1.30.9-rke2r1-build20250116"; - etcdVersion = "v3.5.16-k3s1-build20241106"; + rke2Version = "1.30.10+rke2r1"; + rke2Commit = "b83bb8e150236c43aa3d52d31523feb879d09911"; + rke2TarballHash = "sha256-YpF2SBIH3GwWOtSIbIZb88Nd1GNUvOmbgeyNDKAo+qU="; + rke2VendorHash = "sha256-aExBaQuqW2ZNCniHjur5OcvBogC4zofn5UNQS8gHSrA="; + k8sImageTag = "v1.30.10-rke2r1-build20250213"; + etcdVersion = "v3.5.18-k3s1-build20250210"; pauseVersion = "3.6"; ccmVersion = "v1.30.6-0.20241016053533-5ec454f50e7a-build20241016"; - dockerizedVersion = "v1.30.9-rke2r1"; + dockerizedVersion = "v1.30.10-rke2r1"; } From 722b74c480e978f1ba5c363306a0b86f4df5a1d1 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 3 Mar 2025 22:20:57 +0100 Subject: [PATCH 007/160] rke2_1_32: 1.32.1+rke2r1 -> 1.32.2+rke2r1 https://github.com/rancher/rke2/releases/tag/v1.32.2%2Brke2r1 --- .../networking/cluster/rke2/1_32/versions.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/cluster/rke2/1_32/versions.nix b/pkgs/applications/networking/cluster/rke2/1_32/versions.nix index a0ffa83fe29b..b7ac710b54a6 100644 --- a/pkgs/applications/networking/cluster/rke2/1_32/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_32/versions.nix @@ -1,11 +1,11 @@ { - rke2Version = "1.32.1+rke2r1"; - rke2Commit = "c0f7be4407cf2c437cacfe735e5c943e827f2ff8"; - rke2TarballHash = "sha256-clZpTnMnj2PRDDYz7+r11RlyX2ExwsE1Tmdt3/kUmtE="; - rke2VendorHash = "sha256-aIB2fRkccx5fXMnFxZ+tirXp5gg8o/h/a6Lgc+EG4L4="; - k8sImageTag = "v1.32.1-rke2r1-build20250115"; - etcdVersion = "v3.5.16-k3s1-build20241106"; + rke2Version = "1.32.2+rke2r1"; + rke2Commit = "8a5c3a23c25cc9b423a303be5f4f1c0e8b885726"; + rke2TarballHash = "sha256-9sNlOkzPCTqHSqaphuSUsfRpS39QYcTDHgjMuYdircc="; + rke2VendorHash = "sha256-fECmrfLayXRhACH7YkuIAUVFqSyPpy/JZb2ZPvITfqQ="; + k8sImageTag = "v1.32.2-rke2r1-build20250213"; + etcdVersion = "v3.5.18-k3s1-build20250210"; pauseVersion = "3.6"; ccmVersion = "v1.32.0-rc3.0.20241220224140-68fbd1a6b543-build20250101"; - dockerizedVersion = "v1.32.1-rke2r1"; + dockerizedVersion = "v1.32.2-rke2r1"; } From f76f5270a3e7d3f831eb4de22ab7984fd961c7c7 Mon Sep 17 00:00:00 2001 From: patka Date: Fri, 7 Mar 2025 23:47:31 +0100 Subject: [PATCH 008/160] rainfrog: 0.2.14 -> 0.2.15 release notes: https://github.com/achristmascarl/rainfrog/releases/tag/v0.2.15 --- pkgs/by-name/ra/rainfrog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index cf11f8f03bbd..a8260c273a5b 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -9,7 +9,7 @@ rainfrog, }: let - version = "0.2.14"; + version = "0.2.15"; in rustPlatform.buildRustPackage { inherit version; @@ -19,11 +19,11 @@ rustPlatform.buildRustPackage { owner = "achristmascarl"; repo = "rainfrog"; tag = "v${version}"; - hash = "sha256-mN7xZs95bi+/wjmOZnOC6LRF7frF0xGJvTMseK2Uorc="; + hash = "sha256-r+tual/ko8SjToMR9ek/Gf5GJieu2wPsMMkjKXw+cLk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-a5uMHiuxVyfRNdGBf7LW00qfQNqAyRnxMq/rMYz3dBg="; + cargoHash = "sha256-JkH771cXGz8YcRy+zO/mB4hkFrA6l0Yg86cLCgsjbrE="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; From 58c71c58d7ffcbe76db60789d8afa9bcd163a977 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sat, 8 Mar 2025 18:16:03 +1300 Subject: [PATCH 009/160] dmd: 2.109.1 -> 2.110.0 --- pkgs/by-name/dm/dmd/generic.nix | 2 +- pkgs/by-name/dm/dmd/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix index b88373a23fc9..3c181f50deb4 100644 --- a/pkgs/by-name/dm/dmd/generic.nix +++ b/pkgs/by-name/dm/dmd/generic.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-N21mAPfaTo+zGCip4njejasraV5IsWVqlGR5eOdFZZE="; }) ] - ++ lib.optionals (lib.versionOlder version "2.110.0") [ + ++ [ (fetchpatch { url = "https://github.com/dlang/dmd/commit/fdd25893e0ac04893d6eba8652903d499b7b0dfc.patch"; stripLen = 1; diff --git a/pkgs/by-name/dm/dmd/package.nix b/pkgs/by-name/dm/dmd/package.nix index b5268b7db8e6..69a9f75c3fc5 100644 --- a/pkgs/by-name/dm/dmd/package.nix +++ b/pkgs/by-name/dm/dmd/package.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "2.109.1"; - dmdHash = "sha256-3nCDPZnb4eQZmhYYxcH6qOmsP8or0KYuzAa5g/C9xdU="; - phobosHash = "sha256-73I0k7tCBwe5tl4K6uMs3/nT2JTZ2SppFYzmokS4W5Y="; + version = "2.110.0"; + dmdHash = "sha256-icXp9xWF2AI2gp7z/lQFAChmXfQePe9b5pbpQ9Mn19Y="; + phobosHash = "sha256-CmJpcHM+sIsaYBlpALCFoQFG+93s8gUyWmM0tYqjXkk="; } From 5b8dfab0f2e026518f294b2661bb17c67aa917e1 Mon Sep 17 00:00:00 2001 From: Tim Brooks Date: Sun, 9 Mar 2025 23:27:15 +0000 Subject: [PATCH 010/160] iozone: 3.506 -> 3.507 --- pkgs/by-name/io/iozone/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/io/iozone/package.nix b/pkgs/by-name/io/iozone/package.nix index 9820881d4c46..c0f95bfed150 100644 --- a/pkgs/by-name/io/iozone/package.nix +++ b/pkgs/by-name/io/iozone/package.nix @@ -21,11 +21,11 @@ in stdenv.mkDerivation rec { pname = "iozone"; - version = "3.506"; + version = "3.507"; src = fetchurl { url = "http://www.iozone.org/src/current/iozone${lib.replaceStrings [ "." ] [ "_" ] version}.tar"; - hash = "sha256-EUzlwHGHO5ose6bnPQXV735mVkOSrL/NwLMmHbEPy+c="; + hash = "sha256-HoCHraBW9dgBjuC8dmhtQW/CJR7QMDgFXb0K940eXOM="; }; license = fetchurl { @@ -38,7 +38,10 @@ stdenv.mkDerivation rec { buildFlags = target; - enableParallelBuilding = true; + # The makefile doesn't define a rule for e.g. libbif.o + # Make will try to evaluate implicit built-in rules for these outputs if building in parallel + # Build in serial so that the main rule builds everything before the implicit ones are attempted + enableParallelBuilding = false; installPhase = '' mkdir -p $out/{bin,share/doc,libexec,share/man/man1} From ef5143fb2a3417f6184c8035efb4b790c104e613 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 10 Mar 2025 11:52:42 -0500 Subject: [PATCH 011/160] taskjuggler: 3.7.2 -> 3.8.1 --- pkgs/by-name/ta/taskjuggler/Gemfile | 2 + pkgs/by-name/ta/taskjuggler/Gemfile.lock | 30 ++++++---- pkgs/by-name/ta/taskjuggler/gemset.nix | 75 +++++++++++++++++------- 3 files changed, 74 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/ta/taskjuggler/Gemfile b/pkgs/by-name/ta/taskjuggler/Gemfile index f6dec6ebf490..80e39dfa2962 100644 --- a/pkgs/by-name/ta/taskjuggler/Gemfile +++ b/pkgs/by-name/ta/taskjuggler/Gemfile @@ -1,3 +1,5 @@ source 'https://rubygems.org' gem 'taskjuggler' gem 'webrick' +gem 'base64' +gem 'drb' diff --git a/pkgs/by-name/ta/taskjuggler/Gemfile.lock b/pkgs/by-name/ta/taskjuggler/Gemfile.lock index d0578a49c759..64f624c9f3e8 100644 --- a/pkgs/by-name/ta/taskjuggler/Gemfile.lock +++ b/pkgs/by-name/ta/taskjuggler/Gemfile.lock @@ -1,39 +1,45 @@ GEM remote: https://rubygems.org/ specs: - date (3.3.3) + base64 (0.2.0) + bigdecimal (3.1.9) + date (3.4.1) + drb (2.2.1) mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop net-smtp - mini_mime (1.1.2) - net-imap (0.3.4) + mini_mime (1.1.5) + net-imap (0.5.6) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.5.1) net-protocol sync (0.5.0) - taskjuggler (3.7.2) + taskjuggler (3.8.1) mail (~> 2.7, >= 2.7.1) term-ansicolor (~> 1.7, >= 1.7.1) - term-ansicolor (1.7.1) + term-ansicolor (1.11.2) tins (~> 1.0) - timeout (0.3.2) - tins (1.32.1) + timeout (0.4.3) + tins (1.38.0) + bigdecimal sync - webrick (1.8.1) + webrick (1.9.1) PLATFORMS - x86_64-linux + ruby DEPENDENCIES + base64 + drb taskjuggler webrick BUNDLED WITH - 2.4.12 + 2.5.22 diff --git a/pkgs/by-name/ta/taskjuggler/gemset.nix b/pkgs/by-name/ta/taskjuggler/gemset.nix index aa9de0e564e1..4a37a8e0eb27 100644 --- a/pkgs/by-name/ta/taskjuggler/gemset.nix +++ b/pkgs/by-name/ta/taskjuggler/gemset.nix @@ -1,13 +1,43 @@ { + base64 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + bigdecimal = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; + type = "gem"; + }; + version = "3.1.9"; + }; date = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; type = "gem"; }; - version = "3.3.3"; + version = "3.4.1"; + }; + drb = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + type = "gem"; + }; + version = "2.2.1"; }; mail = { dependencies = [ @@ -30,10 +60,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.5"; }; net-imap = { dependencies = [ @@ -44,10 +74,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + sha256 = "1rgva7p9gvns2ndnqpw503mbd36i2skkggv0c0h192k8xr481phy"; type = "gem"; }; - version = "0.3.4"; + version = "0.5.6"; }; net-pop = { dependencies = [ "net-protocol" ]; @@ -66,10 +96,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa"; type = "gem"; }; - version = "0.2.1"; + version = "0.2.2"; }; net-smtp = { dependencies = [ "net-protocol" ]; @@ -77,10 +107,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + sha256 = "0dh7nzjp0fiaqq1jz90nv4nxhc2w359d7c199gmzq965cfps15pd"; type = "gem"; }; - version = "0.3.3"; + version = "0.5.1"; }; sync = { groups = [ "default" ]; @@ -101,10 +131,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07fagka8nl29xwwzfhxx89gp34m5hih5vnq4sha1z814004md53j"; + sha256 = "16d5vgz54all8vl3haqy6j69plny3np4kc3wq7wy3xa3i0h7v60z"; type = "gem"; }; - version = "3.7.2"; + version = "3.8.1"; }; term-ansicolor = { dependencies = [ "tins" ]; @@ -112,40 +142,43 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj"; + sha256 = "10shkrl9sl1qhrzbmch2cn67w1yy63d0f2948m80b5nl44zwc02b"; type = "gem"; }; - version = "1.7.1"; + version = "1.11.2"; }; timeout = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; + sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm"; type = "gem"; }; - version = "0.3.2"; + version = "0.4.3"; }; tins = { - dependencies = [ "sync" ]; + dependencies = [ + "bigdecimal" + "sync" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0373zn7zkllcn2q4ylbjgjx9mvm8m73ll3jwjav48dx8myplsp5p"; + sha256 = "0vc80cw3qbbdfiydv7bj7zvch189mh3ifbz7v0ninnrxnwwd3b4r"; type = "gem"; }; - version = "1.32.1"; + version = "1.38.0"; }; webrick = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; + sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.1"; }; } From 293bd74d36ea88346e0d83c3411265e5bf8ea1a5 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Tue, 11 Mar 2025 00:23:52 +0100 Subject: [PATCH 012/160] milu: unbreak on GCC 14 --- pkgs/by-name/mi/milu/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/mi/milu/package.nix b/pkgs/by-name/mi/milu/package.nix index bed794be48bc..0bbf71a24223 100644 --- a/pkgs/by-name/mi/milu/package.nix +++ b/pkgs/by-name/mi/milu/package.nix @@ -39,6 +39,12 @@ stdenv.mkDerivation { llvmPackages.libclang ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-incompatible-pointer-types" + "-Wno-implicit-function-declaration" + "-Wno-error=int-conversion" + ]; + meta = { description = "Higher Order Mutation Testing Tool for C and C++ programs"; homepage = "https://github.com/yuejia/Milu"; From 98e6e17ea69a75bb6eabd0e7c8bf1b1a0c658be2 Mon Sep 17 00:00:00 2001 From: guylamar2006 Date: Tue, 11 Mar 2025 10:28:18 -0500 Subject: [PATCH 013/160] nestopia-ue: 1.5.2 -> 1.6.0 Update package.nix --- pkgs/by-name/ne/nestopia-ue/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nestopia-ue/package.nix b/pkgs/by-name/ne/nestopia-ue/package.nix index 75798e3d18c4..ede0fc010cc6 100644 --- a/pkgs/by-name/ne/nestopia-ue/package.nix +++ b/pkgs/by-name/ne/nestopia-ue/package.nix @@ -13,6 +13,7 @@ libepoxy, makeWrapper, pkg-config, + libsamplerate, stdenv, unzip, wrapGAppsHook3, @@ -21,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nestopia"; - version = "1.52.1"; + version = "1.53.0"; src = fetchFromGitHub { owner = "0ldsk00l"; repo = "nestopia"; rev = finalAttrs.version; - hash = "sha256-r8Z0Ejf5vWcdvxkUkUKJtipQIRoiwoRj0Bx06Gnxd08="; + hash = "sha256-C2uiC8zlleXQlThrRETJa9vu++mJy1ySJKAkgu5zuxc="; }; buildInputs = [ @@ -41,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { libarchive libao xdg-utils + libsamplerate ]; nativeBuildInputs = [ From 70fb359aa194281032d13e9c2050948ca5c4ef76 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 11 Mar 2025 22:18:38 +0100 Subject: [PATCH 014/160] veryl: 0.13.5 -> 0.14.1 Diff: https://github.com/veryl-lang/veryl/compare/v0.13.5...v0.14.1 https://github.com/veryl-lang/veryl/releases/tag/v0.14.0 https://github.com/veryl-lang/veryl/releases/tag/v0.14.1 --- pkgs/by-name/ve/veryl/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix index 864eeccab417..21e3e3ab6641 100644 --- a/pkgs/by-name/ve/veryl/package.nix +++ b/pkgs/by-name/ve/veryl/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage rec { pname = "veryl"; - version = "0.13.5"; + version = "0.14.1"; src = fetchFromGitHub { owner = "veryl-lang"; repo = "veryl"; rev = "v${version}"; - hash = "sha256-rZ2Psbs3s5NfY1Mktr3RLGwQYciMh5FCs4d0I1zBaA8="; + hash = "sha256-J1FYgVrpiczTTaMvE7IBdd4aqNI4XXXqvgR7SWaVen0="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-syvW5Lm2ed/AXksDmIAEAbrw+mW1aA0FugJirBZLtLw="; + cargoHash = "sha256-2AWVmdVQAA0+h9xegcWSAjnpa68A+2zazHwKzNKqaTo="; nativeBuildInputs = [ pkg-config @@ -73,7 +73,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Modern Hardware Description Language"; homepage = "https://veryl-lang.org/"; - changelog = "https://github.com/veryl-lang/veryl/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/veryl-lang/veryl/releases/tag/v${version}"; license = with lib.licenses; [ mit asl20 From b3229208ee54833f2417cc9f675c23bb16baba53 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 4 Mar 2025 10:32:09 +0100 Subject: [PATCH 015/160] ninjavis: init at 0.2.1 https://github.com/chagui/ninjavis/tree/main --- pkgs/by-name/ni/ninjavis/package.nix | 44 ++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/ni/ninjavis/package.nix diff --git a/pkgs/by-name/ni/ninjavis/package.nix b/pkgs/by-name/ni/ninjavis/package.nix new file mode 100644 index 000000000000..9d24ea24eaca --- /dev/null +++ b/pkgs/by-name/ni/ninjavis/package.nix @@ -0,0 +1,44 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication rec { + pname = "ninjavis"; + version = "0.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "chagui"; + repo = "ninjavis"; + tag = "v${version}"; + hash = "sha256-4MXU43noG0mKwiXWrLu1tW9YGkU1YjP/UoUKZzVer14="; + }; + + build-system = [ + python3Packages.poetry-core + ]; + + pythonImportsCheck = [ + "ninjavis" + ]; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + env --ignore-environment $out/bin/ninjavis --help + + runHook postInstallCheck + ''; + + meta = { + description = "Generate visualization from Ninja build logs"; + homepage = "https://github.com/chagui/ninjavis"; + changelog = "https://github.com/chagui/ninjavis/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pbsds ]; + mainProgram = "ninjavis"; + }; +} From 365e35ea25352f6d0ed9b3448398ea0a3b94935a Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 13 Mar 2025 04:49:15 +0800 Subject: [PATCH 016/160] wmutils-libwm: 1.0 -> 1.3 --- pkgs/by-name/wm/wmutils-libwm/package.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/wm/wmutils-libwm/package.nix b/pkgs/by-name/wm/wmutils-libwm/package.nix index 723e78772e88..39ed3f337435 100644 --- a/pkgs/by-name/wm/wmutils-libwm/package.nix +++ b/pkgs/by-name/wm/wmutils-libwm/package.nix @@ -3,28 +3,32 @@ stdenv, fetchFromGitHub, libxcb, + xcb-util-cursor, }: stdenv.mkDerivation rec { pname = "wmutils-libwm"; - version = "1.0"; + version = "1.3"; src = fetchFromGitHub { owner = "wmutils"; repo = "libwm"; - rev = "v${version}"; - sha256 = "1lpbqrilhffpzc0b7vnp08jr1wr96lndwc7y0ck8hlbzlvm662l0"; + tag = "v${version}"; + hash = "sha256-ROWRgTn33c5gH4ZdkwZ05rRg/Z9e2NppAQSNExSGZ4s="; }; - buildInputs = [ libxcb ]; + buildInputs = [ + libxcb + xcb-util-cursor + ]; installFlags = [ "PREFIX=$(out)" ]; - meta = with lib; { + meta = { description = "Small library for X window manipulation"; homepage = "https://github.com/wmutils/libwm"; - license = licenses.isc; - maintainers = with maintainers; [ bhougland ]; - platforms = platforms.unix; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ bhougland ]; + platforms = lib.platforms.unix; }; } From ea878d73f1e1f0f9866601af6a74288c2b66f57d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 12 Mar 2025 21:15:41 +0000 Subject: [PATCH 017/160] mdbook: 0.4.45 -> 0.4.47 Changes: - https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-0447 - https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-0446 --- pkgs/by-name/md/mdbook/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix index 1a54785575a3..cd6c6ebe79b9 100644 --- a/pkgs/by-name/md/mdbook/package.nix +++ b/pkgs/by-name/md/mdbook/package.nix @@ -9,7 +9,7 @@ installShellFiles, }: let - version = "0.4.45"; + version = "0.4.47"; in rustPlatform.buildRustPackage rec { inherit version; @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = "mdBook"; tag = "v${version}"; - hash = "sha256-LgjJUz1apE1MejVjl4/5O6ISpnGkBXY33g6xfoukZxA="; + hash = "sha256-XTvC2pGRVat0kOybNb9TziG32wDVexnFx2ahmpUFmaA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; allowGitDependencies = false; - hash = "sha256-+7fC6cq6NQIUPtmNc5S5y4lRIS47v0tg1ru/AAYA6TM="; + hash = "sha256-ASPRBAB+elJuyXpPQBm3WI97wD3mjoO1hw0fNHc+KAw="; }; nativeBuildInputs = [ installShellFiles ]; From bd4128c317acdd6f68b94f675ee4d408a3dbd13f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 26 Apr 2022 21:23:31 +0300 Subject: [PATCH 018/160] zfs: reduce closure size --- pkgs/os-specific/linux/zfs/generic.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 31742d4f7cb9..3360b2cc7319 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -20,7 +20,6 @@ let openssl, libtirpc, nfs-utils, - samba, gawk, gnugrep, gnused, @@ -112,7 +111,7 @@ let enablePython = old.enablePython or true && enablePython; }) }/bin/exportfs" - substituteInPlace ./lib/libshare/smb.h --replace-fail "/usr/bin/net" "${samba}/bin/net" + substituteInPlace ./lib/libshare/smb.h --replace-fail "/usr/bin/net" "/run/current-system/sw/bin/net" # Disable dynamic loading of libcurl substituteInPlace ./config/user-libfetch.m4 --replace-fail "curl-config --built-shared" "true" substituteInPlace ./config/user-systemd.m4 --replace-fail "/usr/lib/modules-load.d" "$out/etc/modules-load.d" From 85951e2457267f10c3c47be1d49ed6cc3867ba03 Mon Sep 17 00:00:00 2001 From: isabel Date: Thu, 13 Mar 2025 12:10:08 +0000 Subject: [PATCH 019/160] python312Packages.typecode: fix build against file 5.46 --- pkgs/development/python-modules/typecode/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index 751f5b715a04..148fb1566f01 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -61,6 +61,11 @@ buildPythonPackage rec { # fails due to change in file (libmagic) 5.45 "test_doc_postscript_eps" "test_package_debian" + + # fails due to change in file (libmagic) 5.46 + "test_media_image_img" + "test_compiled_elf_so" + "test_compiled_elf_so_2" ]; pythonImportsCheck = [ "typecode" ]; From c7968cf14075c62330b09bfa61e9d8a93da3b984 Mon Sep 17 00:00:00 2001 From: isabel Date: Thu, 13 Mar 2025 15:30:32 +0000 Subject: [PATCH 020/160] nixos/wakapi: harden systemd service when using `systemd-analyze security wakapi.service` we went from a 5.9 to a 3. --- nixos/modules/services/web-apps/wakapi.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/wakapi.nix b/nixos/modules/services/web-apps/wakapi.nix index 6067fd35b790..f833c0c0e45f 100644 --- a/nixos/modules/services/web-apps/wakapi.nix +++ b/nixos/modules/services/web-apps/wakapi.nix @@ -159,18 +159,25 @@ in Group = config.users.users.wakapi.group; DynamicUser = true; + PrivateTmp = true; + PrivateUsers = true; + PrivateDevices = true; ProtectHome = true; ProtectHostname = true; + ProtectClock = true; ProtectKernelLogs = true; ProtectKernelModules = true; ProtectKernelTunables = true; + ProtectControlGroups = true; + NoNewPrivileges = true; ProtectProc = "invisible"; - ProtectSystem = "strict"; + ProtectSystem = "full"; RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; + CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; From 80c31359820698530646a3bcd59db6be957164b7 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Thu, 13 Mar 2025 18:28:53 +0000 Subject: [PATCH 021/160] magic-wormhole: 0.17.0 -> 0.18.0 https://github.com/magic-wormhole/magic-wormhole/blob/refs/tags/0.18.0/NEWS.md https://github.com/magic-wormhole/magic-wormhole/compare/refs/tags/0.17.0...refs/tags/0.18.0 --- .../python-modules/magic-wormhole/default.nix | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index ee326cc004ab..71be18913927 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -3,23 +3,24 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system setuptools, + versioneer, # dependencies - spake2, - pynacl, - six, attrs, - twisted, autobahn, automat, - tqdm, click, + cryptography, humanize, iterable-io, + pynacl, + qrcode, + spake2, + tqdm, + twisted, txtorcon, zipstream-ng, @@ -36,25 +37,16 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "magic-wormhole"; repo = "magic-wormhole"; tag = version; - hash = "sha256-BxPF4iQ91wLBagdvQ/Y89VIZBkMxFiEHnK+BU55Bwr4="; + hash = "sha256-FQ7m6hkJcFZaE+ptDALq/gijn/RcAM1Zvzi2+xpoXBU="; }; - patches = [ - # TODO: drop patch for magic-wormhole > 0.17.0 - # fix test for twisted 24.10.0 (https://github.com/magic-wormhole/magic-wormhole/pull/554) - (fetchpatch { - name = "fix-twisted-24.10.0.patch"; - url = "https://github.com/magic-wormhole/magic-wormhole/commit/d7353cad6fe9d43620a0de33a634f395757d2e5c.patch"; - hash = "sha256-mvgVFW3Fa2I8/39ron0bYYsJNm2r97jnLFCfhtHSIP0="; - }) - ]; postPatch = # enable tests by fixing the location of the wormhole binary '' @@ -67,7 +59,10 @@ buildPythonPackage rec { sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py ''; - build-system = [ setuptools ]; + build-system = [ + setuptools + versioneer + ]; dependencies = [ @@ -75,10 +70,11 @@ buildPythonPackage rec { autobahn automat click + cryptography humanize iterable-io pynacl - six + qrcode spake2 tqdm twisted From 391f273564c090d23d54b227b9311bbf6999e5c2 Mon Sep 17 00:00:00 2001 From: Melody Renata Date: Thu, 13 Mar 2025 23:38:20 -0400 Subject: [PATCH 022/160] lug-helper: Update `XDG_DATA_DIRS` to include the package path --- pkgs/by-name/lu/lug-helper/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix index ab724cd1ef42..5e0e8dc152b4 100644 --- a/pkgs/by-name/lu/lug-helper/package.nix +++ b/pkgs/by-name/lu/lug-helper/package.nix @@ -62,7 +62,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { unzip libnotify ] - } + } \ + --prefix XDG_DATA_DIRS : "$out" ''; passthru.updateScript = nix-update-script { }; From fc0fa4f1edcd0d907d7c10346115940662e89d80 Mon Sep 17 00:00:00 2001 From: RockWolf Date: Fri, 14 Mar 2025 15:01:36 +0100 Subject: [PATCH 023/160] stackit-cli: 0.24.0 -> 0.26.0 --- pkgs/by-name/st/stackit-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 190338cdce61..69a8b759f915 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.24.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-n1F/DjGvNzU5aF05y3K6/vDuFa/ed2XZLfpafi5+NWg="; + hash = "sha256-7XI5YkfLY/Jo1lVEQ2waN7/g8xN8LUTXIva8OzRdRSo="; }; - vendorHash = "sha256-EaHRYdP7w1PQFYNxAWiTYcCpfipuqvbtbBUYNXNM6nc="; + vendorHash = "sha256-ZVDe28D2vw/p5i6MoBZ1KS9pjncOzul3/bLB4cGoY80="; subPackages = [ "." ]; From 05958f27e2b9a99a058ef5db5f2be1d73c4afd96 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sun, 19 Jan 2025 16:07:39 +0100 Subject: [PATCH 024/160] lib/types: types.{unique,uniq} deprecate functor.wrapped in favor of functor.payload.elemType --- doc/release-notes/rl-2505.section.md | 1 + lib/tests/modules.sh | 10 ++++++++-- lib/tests/modules/deprecated-wrapped.nix | 11 +++++++++++ lib/types.nix | 4 +++- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 58bb1371f1bc..2a44045fecb3 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -75,6 +75,7 @@ - `functor.wrapped` is now deprecated for some types and using it will give a warning with migration instructions. It is deprecated for these types: - `lib.types.attrsWith` - `lib.types.listOf` + - `lib.types.unique` and `lib.types.uniq` - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6. diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 1505782547f5..dbbb92d4400d 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -413,8 +413,14 @@ NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribu NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.functor.wrapped ./deprecated-wrapped.nix NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +# unique / uniq +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.functor.wrapped ./deprecated-wrapped.nix + +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix # Even with multiple assignments, a type error should be thrown if any of them aren't valid checkConfigError 'A definition for option .* is not of type .*' \ diff --git a/lib/tests/modules/deprecated-wrapped.nix b/lib/tests/modules/deprecated-wrapped.nix index 8d363a2ad344..dc9771ec38c1 100644 --- a/lib/tests/modules/deprecated-wrapped.nix +++ b/lib/tests/modules/deprecated-wrapped.nix @@ -6,6 +6,7 @@ let # attrsOf uses attrsWith internally attrsOf listOf + unique ; in { @@ -26,6 +27,13 @@ in options.mergedListOf = mkOption { type = listOf (listOf types.str); }; + # unique + options.unique = mkOption { + type = unique { message = ""; } (listOf types.str); + }; + options.mergedUnique = mkOption { + type = unique { message = ""; } (listOf types.str); + }; } ) # Module B @@ -38,6 +46,9 @@ in options.mergedListOf = mkOption { type = listOf (listOf types.str); }; + options.mergedUnique = mkOption { + type = unique { message = ""; } (listOf types.str); + }; } ) ]; diff --git a/lib/types.nix b/lib/types.nix index cdba500ae07f..62aa337c167a 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -844,7 +844,9 @@ rec { getSubOptions = type.getSubOptions; getSubModules = type.getSubModules; substSubModules = m: uniq (type.substSubModules m); - functor = (defaultFunctor name) // { wrapped = type; }; + functor = elemTypeFunctor name { elemType = type; } // { + type = payload: types.unique { inherit message; } payload.elemType; + }; nestedTypes.elemType = type; }; From 4fe25460e13eeb6b78d41dabd5c95da024698d0b Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sun, 19 Jan 2025 16:21:33 +0100 Subject: [PATCH 025/160] lib/types: types.nullOr deprecate functor.wrapped in favor of functor.payload.elemType --- doc/release-notes/rl-2505.section.md | 1 + lib/tests/modules.sh | 10 ++++++++-- lib/tests/modules/deprecated-wrapped.nix | 11 +++++++++++ lib/types.nix | 4 +++- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 2a44045fecb3..c71ac169d78b 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -76,6 +76,7 @@ - `lib.types.attrsWith` - `lib.types.listOf` - `lib.types.unique` and `lib.types.uniq` + - `lib.types.nullOr` - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6. diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index dbbb92d4400d..5bdc6e983501 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -413,14 +413,20 @@ NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribu NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.functor.wrapped ./deprecated-wrapped.nix NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix # unique / uniq NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.functor.wrapped ./deprecated-wrapped.nix NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.functor.wrapped ./deprecated-wrapped.nix NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +# nullOr +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.functor.wrapped ./deprecated-wrapped.nix + +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix # Even with multiple assignments, a type error should be thrown if any of them aren't valid checkConfigError 'A definition for option .* is not of type .*' \ diff --git a/lib/tests/modules/deprecated-wrapped.nix b/lib/tests/modules/deprecated-wrapped.nix index dc9771ec38c1..fcdfef7dea71 100644 --- a/lib/tests/modules/deprecated-wrapped.nix +++ b/lib/tests/modules/deprecated-wrapped.nix @@ -7,6 +7,7 @@ let attrsOf listOf unique + nullOr ; in { @@ -34,6 +35,13 @@ in options.mergedUnique = mkOption { type = unique { message = ""; } (listOf types.str); }; + # nullOr + options.nullOr = mkOption { + type = nullOr (listOf types.str); + }; + options.mergedNullOr = mkOption { + type = nullOr (listOf types.str); + }; } ) # Module B @@ -49,6 +57,9 @@ in options.mergedUnique = mkOption { type = unique { message = ""; } (listOf types.str); }; + options.mergedNullOr = mkOption { + type = nullOr (listOf types.str); + }; } ) ]; diff --git a/lib/types.nix b/lib/types.nix index 62aa337c167a..f38f96c33786 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -866,7 +866,9 @@ rec { getSubOptions = elemType.getSubOptions; getSubModules = elemType.getSubModules; substSubModules = m: nullOr (elemType.substSubModules m); - functor = (defaultFunctor name) // { wrapped = elemType; }; + functor = (elemTypeFunctor name { inherit elemType; }) // { + type = payload: types.nullOr payload.elemType; + }; nestedTypes.elemType = elemType; }; From f6214eb786bffd05a17941bfe68cdecb0c0438af Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sun, 19 Jan 2025 16:22:24 +0100 Subject: [PATCH 026/160] lib/types: types.functionTo deprecate functor.wrapped in favor of functor.payload.elemType --- doc/release-notes/rl-2505.section.md | 1 + lib/tests/modules.sh | 6 ++++++ lib/tests/modules/deprecated-wrapped.nix | 11 +++++++++++ lib/types.nix | 4 +++- 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index c71ac169d78b..240cda17b1eb 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -77,6 +77,7 @@ - `lib.types.listOf` - `lib.types.unique` and `lib.types.uniq` - `lib.types.nullOr` + - `lib.types.functionTo` - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6. diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 5bdc6e983501..ffdc1505f06d 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -427,6 +427,12 @@ NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribu NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +# functionTo +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.functor.wrapped ./deprecated-wrapped.nix + +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix # Even with multiple assignments, a type error should be thrown if any of them aren't valid checkConfigError 'A definition for option .* is not of type .*' \ diff --git a/lib/tests/modules/deprecated-wrapped.nix b/lib/tests/modules/deprecated-wrapped.nix index fcdfef7dea71..7db64edfcce3 100644 --- a/lib/tests/modules/deprecated-wrapped.nix +++ b/lib/tests/modules/deprecated-wrapped.nix @@ -8,6 +8,7 @@ let listOf unique nullOr + functionTo ; in { @@ -42,6 +43,13 @@ in options.mergedNullOr = mkOption { type = nullOr (listOf types.str); }; + # nullOr + options.functionTo = mkOption { + type = functionTo (listOf types.str); + }; + options.mergedFunctionTo = mkOption { + type = functionTo (listOf types.str); + }; } ) # Module B @@ -60,6 +68,9 @@ in options.mergedNullOr = mkOption { type = nullOr (listOf types.str); }; + options.mergedFunctionTo = mkOption { + type = functionTo (listOf types.str); + }; } ) ]; diff --git a/lib/types.nix b/lib/types.nix index f38f96c33786..24d5192225a3 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -887,7 +887,9 @@ rec { getSubOptions = prefix: elemType.getSubOptions (prefix ++ [ "" ]); getSubModules = elemType.getSubModules; substSubModules = m: functionTo (elemType.substSubModules m); - functor = (defaultFunctor "functionTo") // { wrapped = elemType; }; + functor = (elemTypeFunctor "functionTo" { inherit elemType; }) // { + type = payload: types.functionTo payload.elemType; + }; nestedTypes.elemType = elemType; }; From 4f123107b47e6cdb137e64b1b361a26f6eb5ae6d Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sun, 19 Jan 2025 16:24:43 +0100 Subject: [PATCH 027/160] lib/types: types.coercedTo deprecate functor.wrapped in favor of functor.payload.elemType --- doc/release-notes/rl-2505.section.md | 1 + lib/tests/modules.sh | 6 ++++++ lib/tests/modules/deprecated-wrapped.nix | 8 +++++++- lib/types.nix | 11 +++++++---- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 240cda17b1eb..2f9c4a00d6f4 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -78,6 +78,7 @@ - `lib.types.unique` and `lib.types.uniq` - `lib.types.nullOr` - `lib.types.functionTo` + - `lib.types.coercedTo` - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6. diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index ffdc1505f06d..2f21e466450d 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -434,6 +434,12 @@ NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribu NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix +# coercedTo +# Note: test 'nestedTypes.finalType' and 'nestedTypes.coercedType' +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.finalType.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.coercedType.functor.wrapped ./deprecated-wrapped.nix + # Even with multiple assignments, a type error should be thrown if any of them aren't valid checkConfigError 'A definition for option .* is not of type .*' \ config.value ./declare-int-unsigned-value.nix ./define-value-list.nix ./define-value-int-positive.nix diff --git a/lib/tests/modules/deprecated-wrapped.nix b/lib/tests/modules/deprecated-wrapped.nix index 7db64edfcce3..5559cd3e9332 100644 --- a/lib/tests/modules/deprecated-wrapped.nix +++ b/lib/tests/modules/deprecated-wrapped.nix @@ -9,6 +9,7 @@ let unique nullOr functionTo + coercedTo ; in { @@ -43,13 +44,18 @@ in options.mergedNullOr = mkOption { type = nullOr (listOf types.str); }; - # nullOr + # functionTo options.functionTo = mkOption { type = functionTo (listOf types.str); }; options.mergedFunctionTo = mkOption { type = functionTo (listOf types.str); }; + # coercedTo + # Note: coercedTo is a non-mergeable option-type + options.coercedTo = mkOption { + type = coercedTo (listOf types.str) lib.id (listOf types.str); + }; } ) # Module B diff --git a/lib/types.nix b/lib/types.nix index 24d5192225a3..dee93a62e398 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -75,6 +75,7 @@ let # Note that individual attributes can be overriden if needed. elemTypeFunctor = name: { elemType, ... }@payload: { inherit name payload; + wrappedDeprecationMessage = makeWrappedDeprecationMessage payload; type = outer_types.types.${name}; binOp = a: b: let @@ -85,10 +86,10 @@ let null else { elemType = merged; }; - wrappedDeprecationMessage = { loc }: lib.warn '' - The deprecated `${lib.optionalString (loc != null) "type."}functor.wrapped` attribute ${lib.optionalString (loc != null) "of the option `${showOption loc}` "}is accessed, use `${lib.optionalString (loc != null) "type."}nestedTypes.elemType` instead. - '' payload.elemType; }; + makeWrappedDeprecationMessage = payload: { loc }: lib.warn '' + The deprecated `${lib.optionalString (loc != null) "type."}functor.wrapped` attribute ${lib.optionalString (loc != null) "of the option `${showOption loc}` "}is accessed, use `${lib.optionalString (loc != null) "type."}nestedTypes.elemType` instead. + '' payload.elemType; outer_types = @@ -1163,7 +1164,9 @@ rec { getSubModules = finalType.getSubModules; substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m); typeMerge = t: null; - functor = (defaultFunctor name) // { wrapped = finalType; }; + functor = (defaultFunctor name) // { + wrappedDeprecationMessage = makeWrappedDeprecationMessage { elemType = finalType; }; + }; nestedTypes.coercedType = coercedType; nestedTypes.finalType = finalType; }; From 83a0000e79a66f5b801530572bb2437930be6e2e Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 14 Mar 2025 17:33:51 +0100 Subject: [PATCH 028/160] swayimg: 3.8 -> 3.9 --- pkgs/by-name/sw/swayimg/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index ecff75270285..1420a6374fe0 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -22,6 +22,7 @@ libexif, libavif, libsixel, + libraw, openexr_3, bash-completion, testers, @@ -30,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "artemsen"; repo = "swayimg"; tag = "v${finalAttrs.version}"; - hash = "sha256-nPmVUJy5hlWk6Q+s6rRBEzlJvpDKLStKTRjLwj7iA/c="; + hash = "sha256-QPTODuVVDQCP7Ix63F0J0tOzfg5Q9B4GXaxjuTerkI0="; }; strictDeps = true; @@ -74,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { libexif libavif libsixel + libraw openexr_3 ]; From 633b653f35b0abe40abbafe163d980271bfcfb3a Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Fri, 14 Mar 2025 22:04:38 -0300 Subject: [PATCH 029/160] hydralauncher: 3.2.3 -> 3.3.0 Diff: https://github.com/hydralauncher/hydra/compare/v3.2.3...v3.3.0 Changelog: https://github.com/hydralauncher/hydra/releases/tag/v3.3.0 --- pkgs/by-name/hy/hydralauncher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index a821386608bf..439512157995 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.2.3"; + version = "3.3.0"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-iQL/xEyVgNfAeiz41sos8nbrGRxzQWR618EikPLS/Ig="; + hash = "sha256-5F/RcsRKMAMfXaPOmEkqTrJ4Zgp0+sQ36kPj0p5VUa0="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; From 3f272425d13affade22110a53595aec5255bf092 Mon Sep 17 00:00:00 2001 From: Zev Isert Date: Fri, 14 Mar 2025 20:37:55 -0700 Subject: [PATCH 030/160] fluxcd: 2.5.0 -> 2.5.1 --- pkgs/by-name/fl/fluxcd/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix index 6b88e3dd929c..ee82e71dbcf9 100644 --- a/pkgs/by-name/fl/fluxcd/package.nix +++ b/pkgs/by-name/fl/fluxcd/package.nix @@ -8,10 +8,10 @@ }: let - version = "2.5.0"; - srcHash = "sha256-PhApozD/oWmT4PjzDRKBitE23V3KC40o17AwbmzzPdI="; - vendorHash = "sha256-J8tgcNRc2m+6wcBM/iRizyOTO7OvKinl4Ojc8InQoKk="; - manifestsHash = "sha256-mU0rnbb63ATjf2Q7TzbsQJcbRBUb2QCeC8WKaKmpxOo="; + version = "2.5.1"; + srcHash = "sha256-BuFylOWR30aK7d1eN+9getR5amtAtkkhHNAPfdfASHs="; + vendorHash = "sha256-2fThvz/5A1/EyS6VTUQQa5Unx1BzYfsVRE18xOHtLHE="; + manifestsHash = "sha256-bIIK8igtx0gUcn3hlBohE0MG9PMhyThz4a71pkonBpE="; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; From d1a912407abc6f3a092c3d19b4fe0387180a163b Mon Sep 17 00:00:00 2001 From: Serhii Khoma Date: Sat, 15 Mar 2025 18:40:10 +0700 Subject: [PATCH 031/160] hubstaff: 1.6.29-7f771670 -> 1.6.31-a6da06ad --- pkgs/by-name/hu/hubstaff/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix index 71a81a35ad07..c1f26ab948cf 100644 --- a/pkgs/by-name/hu/hubstaff/package.nix +++ b/pkgs/by-name/hu/hubstaff/package.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE -, libXext , freetype, libXrender, fontconfig, libXft, libXinerama +, libXext , freetype, libXrender, fontconfig, libXft, libXinerama, libXcursor, cairo , libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3 , curl, writeShellScript, common-updater-scripts, xmlstarlet }: let - url = "https://app.hubstaff.com/download/8792-standard-linux-1-6-29-release/sh"; - version = "1.6.29-7f771670"; - sha256 = "sha256:09vdpsmaj26bmnbsyxp76g3677lzi8p86gz66qbdvxly6a4x1hq9"; + url = "https://app.hubstaff.com/download/9353-standard-linux-1-6-31-release/sh"; + version = "1.6.31-a6da06ad"; + sha256 = "sha256:07x8di08ln15mv3x7vp01wgs8zcd1rrzvmzygrl9anhx9zhgsr3b"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft libXinerama stdenv.cc.cc libnotify glib gtk3 libappindicator-gtk3 - curl libXfixes libXScrnSaver ]; + curl libXfixes libXScrnSaver libXcursor cairo ]; in From dcc5ba8f48be7c22dedd073ee712e63d2bae514a Mon Sep 17 00:00:00 2001 From: phicyclist Date: Sat, 15 Mar 2025 12:29:04 -0400 Subject: [PATCH 032/160] zettlr: 3.2.0 -> 3.4.3 --- pkgs/applications/misc/zettlr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 7ac5133d11b9..e84b1a93af97 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -2,7 +2,7 @@ builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { zettlr = { - version = "3.2.0"; - hash = "sha256-gttDGWFJ/VmOyqgOSKnCqqPtNTKJd1fmDpa0ZAX3xc8="; + version = "3.4.3"; + hash = "sha256-Xb9zszbkHWAaIcu74EGQH0PVbuXIZXH/dja1F1Hkx1c="; }; } From e7bbbbb609df41ea90ea9b226990206a45493723 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 16 Mar 2025 01:29:11 +0800 Subject: [PATCH 033/160] gopeed: 1.6.10 -> 1.6.11 --- pkgs/by-name/go/gopeed/package.nix | 18 ++++++++++++------ pkgs/by-name/go/gopeed/pubspec.lock.json | 13 ++++++++++++- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix index ae355551d6c5..35feec1bf524 100644 --- a/pkgs/by-name/go/gopeed/package.nix +++ b/pkgs/by-name/go/gopeed/package.nix @@ -8,13 +8,13 @@ }: let - version = "1.6.10"; + version = "1.6.11"; src = fetchFromGitHub { owner = "GopeedLab"; repo = "gopeed"; tag = "v${version}"; - hash = "sha256-sTKPSgy1jDavEd/IM8F6dxojp8oOQTo3/w/YV21JR/Q="; + hash = "sha256-ayPqLRWYSa0rSHqGFS4xp3wUVAl4tfsSPs/SQcUQD60="; }; metaCommon = { @@ -45,14 +45,17 @@ let }; in flutter324.buildFlutterApplication { - inherit version src libgopeed; + inherit version src; pname = "gopeed"; sourceRoot = "${src.name}/ui/flutter"; pubspecLock = lib.importJSON ./pubspec.lock.json; - gitHashes.permission_handler_windows = "sha256-MRTmuH0MfhGaMEb9bRotimAPRlFyl3ovtJUJ2WK7+DA="; + gitHashes = { + install_plugin = "sha256-3FM08D2pbtWmitf8R4pAylVqum7IfbWh6pOIEhJdySk="; + permission_handler_windows = "sha256-MRTmuH0MfhGaMEb9bRotimAPRlFyl3ovtJUJ2WK7+DA="; + }; nativeBuildInputs = [ autoPatchelfHook ]; @@ -61,7 +64,7 @@ flutter324.buildFlutterApplication { preBuild = '' mkdir -p linux/bundle/lib cp ${libgopeed}/lib/libgopeed.so linux/bundle/lib/libgopeed.so - cp ${libgopeed}/bin/host assets/host/host + cp ${libgopeed}/bin/host assets/exec/host ''; postInstall = '' @@ -75,7 +78,10 @@ flutter324.buildFlutterApplication { --add-rpath $out/app/gopeed/lib $out/app/gopeed/gopeed ''; - passthru.updateScript = ./update.sh; + passthru = { + inherit libgopeed; + updateScript = ./update.sh; + }; meta = metaCommon // { mainProgram = "gopeed"; diff --git a/pkgs/by-name/go/gopeed/pubspec.lock.json b/pkgs/by-name/go/gopeed/pubspec.lock.json index 62e21f14af5c..1c46402df193 100644 --- a/pkgs/by-name/go/gopeed/pubspec.lock.json +++ b/pkgs/by-name/go/gopeed/pubspec.lock.json @@ -337,7 +337,7 @@ "version": "0.3.4+2" }, "crypto": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "crypto", "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", @@ -680,6 +680,17 @@ "source": "hosted", "version": "4.3.0" }, + "install_plugin": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "cf08af829f4a4145634f8a047108f505fdbe5eaa", + "resolved-ref": "cf08af829f4a4145634f8a047108f505fdbe5eaa", + "url": "https://github.com/hui-z/flutter_install_plugin.git" + }, + "source": "git", + "version": "2.1.0" + }, "intl": { "dependency": "transitive", "description": { From bf0e7421cd7b8831a49dac1e6eb5d5c075e03895 Mon Sep 17 00:00:00 2001 From: Reputable2722 <153411261+Reputable2772@users.noreply.github.com> Date: Sun, 16 Mar 2025 15:33:09 +0530 Subject: [PATCH 034/160] quicktemplate: 1.7.0 -> 1.8.0 Signed-off-by: Reputable2722 <153411261+Reputable2772@users.noreply.github.com> --- pkgs/by-name/qu/quicktemplate/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/qu/quicktemplate/package.nix b/pkgs/by-name/qu/quicktemplate/package.nix index 37e6b1e92ecf..6f6afe08d811 100644 --- a/pkgs/by-name/qu/quicktemplate/package.nix +++ b/pkgs/by-name/qu/quicktemplate/package.nix @@ -3,16 +3,15 @@ buildGoModule, fetchFromGitHub, }: - buildGoModule rec { pname = "quicktemplate"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "valyala"; repo = "quicktemplate"; rev = "v${version}"; - sha256 = "0xzsvhpllmzmyfg8sj1dpp02826j1plmyrdvqbwryzhf2ci33nqr"; + sha256 = "cra3LZ3Yq0KNQErQ2q0bVSy7rOLKdSkIryIgQsNRBHw="; }; vendorHash = null; From e00cb774cd3321c9bb5bbad32b32e2eff0097284 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 16 Mar 2025 22:56:31 +0800 Subject: [PATCH 035/160] pilipalax: 1.1.0-beta.5 -> 1.1.2-beta --- pkgs/by-name/pi/pilipalax/package.nix | 6 +++--- pkgs/by-name/pi/pilipalax/pubspec.lock.json | 24 ++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/pi/pilipalax/package.nix b/pkgs/by-name/pi/pilipalax/package.nix index 8d9dca783f05..5c2f29f68c59 100644 --- a/pkgs/by-name/pi/pilipalax/package.nix +++ b/pkgs/by-name/pi/pilipalax/package.nix @@ -11,13 +11,13 @@ flutter324.buildFlutterApplication rec { pname = "pilipalax"; - version = "1.1.0-beta.5"; + version = "1.1.2-beta"; src = fetchFromGitHub { owner = "orz12"; repo = "PiliPalaX"; - tag = "${version}+180"; - hash = "sha256-bKs0EZjJCJvtVOZYl3GqXPE2MxX7DRjMwtmFUcNgrOQ="; + tag = "${version}+187"; + hash = "sha256-8GQtPYgeYM7yTw3i5H9REWfM5j3G0aQz3oHxz8i9p2Y="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/pi/pilipalax/pubspec.lock.json b/pkgs/by-name/pi/pilipalax/pubspec.lock.json index 45aff6ad9528..935bd0e5dc4f 100644 --- a/pkgs/by-name/pi/pilipalax/pubspec.lock.json +++ b/pkgs/by-name/pi/pilipalax/pubspec.lock.json @@ -1718,61 +1718,61 @@ "dependency": "direct overridden", "description": { "name": "screen_brightness", - "sha256": "a9a98666045ad4ea0d82bca09fe5f007b8440e315075dc948c1507a9b72ee41f", + "sha256": "99b898dae860ebe55fc872d8e300c6eafff3ee4ccb09301b90adb3f241f29874", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "2.1.1" }, "screen_brightness_android": { "dependency": "transitive", "description": { "name": "screen_brightness_android", - "sha256": "74455f9901ab8a1a45c9097b83855dbbb7498110cc2bc249cb5a86570dd1cf7c", + "sha256": "ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.0" }, "screen_brightness_ios": { "dependency": "transitive", "description": { "name": "screen_brightness_ios", - "sha256": "caee02b34e0089b138a7aee35c461bd2d7c78446dd417f07613def192598ca08", + "sha256": "bfd9bfd0ac852e7aa170e7e356cc27195b2a75037b72c8c6336cf6fb2115cffb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.1" }, "screen_brightness_macos": { "dependency": "transitive", "description": { "name": "screen_brightness_macos", - "sha256": "84fc8ffcbcf19c03d76b7673b0f2c2a2663c09aa2bc37c76ea83ab049294a97a", + "sha256": "4edf330ad21078686d8bfaf89413325fbaf571dcebe1e89254d675a3f288b5b9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.1" }, "screen_brightness_platform_interface": { "dependency": "transitive", "description": { "name": "screen_brightness_platform_interface", - "sha256": "321e9455b0057e3647fd37700931e063739d94a8aa1b094f98133c01cb56c27b", + "sha256": "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.0" }, "screen_brightness_windows": { "dependency": "transitive", "description": { "name": "screen_brightness_windows", - "sha256": "5edbfb1dcaedf960f6858efac8ca45d6c18faae17df86e2c03137d3a563ea155", + "sha256": "d3518bf0f5d7a884cee2c14449ae0b36803802866de09f7ef74077874b6b2448", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "2.1.0" }, "scrollable_positioned_list": { "dependency": "direct main", From fc19e9f021f170fdb7f4f1884c11130b0b11263c Mon Sep 17 00:00:00 2001 From: Alex James Date: Sun, 16 Mar 2025 12:24:11 -0500 Subject: [PATCH 036/160] =?UTF-8?q?dash-mpd-cli:=200.2.24=20=E2=86=92=200.?= =?UTF-8?q?2.25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: https://github.com/emarsden/dash-mpd-cli/blob/main/CHANGELOG.md#0225---2025-03-16 --- pkgs/by-name/da/dash-mpd-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix index 3d936718a372..1980dc0afcb2 100644 --- a/pkgs/by-name/da/dash-mpd-cli/package.nix +++ b/pkgs/by-name/da/dash-mpd-cli/package.nix @@ -24,13 +24,13 @@ let in rustPlatform.buildRustPackage rec { pname = "dash-mpd-cli"; - version = "0.2.24"; + version = "0.2.25"; src = fetchFromGitHub { owner = "emarsden"; repo = "dash-mpd-cli"; tag = "v${version}"; - hash = "sha256-Q4zzKdp8GROL8vHi8XETErqufSqgZH/zf/mqEH2lIzE="; + hash = "sha256-xC/U48QyVn9K8Do1909XS7j9aY+ia0gd5cMdfipIds4="; }; patches = [ @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-yXLA/JVD/4jbeVWOhs74Rdlc/drFFjQ52x5IMwUg4jY="; + cargoHash = "sha256-QHfon0795XNtG3jCVv56EIA1pPToWUiopKWI3cA7Vg0="; nativeBuildInputs = [ makeWrapper From 7bbb2146b0cd171993b83aa923a5ae5cbf1c0dc9 Mon Sep 17 00:00:00 2001 From: Alex James Date: Sun, 16 Mar 2025 12:50:03 -0500 Subject: [PATCH 037/160] dash-mpd-cli: replace `rec` with `finalAttrs` pattern --- pkgs/by-name/da/dash-mpd-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix index 1980dc0afcb2..1efd2ff7249c 100644 --- a/pkgs/by-name/da/dash-mpd-cli/package.nix +++ b/pkgs/by-name/da/dash-mpd-cli/package.nix @@ -22,14 +22,14 @@ let ''; }; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "dash-mpd-cli"; version = "0.2.25"; src = fetchFromGitHub { owner = "emarsden"; repo = "dash-mpd-cli"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xC/U48QyVn9K8Do1909XS7j9aY+ia0gd5cMdfipIds4="; }; @@ -73,4 +73,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ al3xtjames ]; mainProgram = "dash-mpd-cli"; }; -} +}) From 2fdfdbf8d8facc5e7bb47ce69839ddae1bbf8a96 Mon Sep 17 00:00:00 2001 From: Alex James Date: Sun, 16 Mar 2025 12:58:39 -0500 Subject: [PATCH 038/160] dash-mpd-cli: use `lib.getBin` --- pkgs/by-name/da/dash-mpd-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix index 1efd2ff7249c..6a4dfd8729ba 100644 --- a/pkgs/by-name/da/dash-mpd-cli/package.nix +++ b/pkgs/by-name/da/dash-mpd-cli/package.nix @@ -52,8 +52,8 @@ rustPlatform.buildRustPackage (finalAttrs: { wrapProgram $out/bin/dash-mpd-cli \ --prefix PATH : ${ lib.makeBinPath [ - ffmpeg.bin - libxslt.bin + (lib.getBin ffmpeg) + (lib.getBin libxslt) shaka-packager-wrapped ] } From 078fea9c5c3dd100aa7aa7c6dbfdb5d45c826459 Mon Sep 17 00:00:00 2001 From: rafaelrc7 Date: Sun, 16 Mar 2025 23:13:56 -0300 Subject: [PATCH 039/160] irpf: 2024-1.6 -> 2025-1.0 --- pkgs/by-name/ir/irpf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix index e2e44e50a13b..f69230e40899 100644 --- a/pkgs/by-name/ir/irpf/package.nix +++ b/pkgs/by-name/ir/irpf/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "irpf"; - version = "2024-1.6"; + version = "2025-1.0"; # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf # Para outros sistemas operacionais -> Multi @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { in fetchzip { url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip"; - hash = "sha256-wYSfU6tkYuSns+RnSy2c3yRR05t/8iXLhRMqPQR+oO0="; + hash = "sha256-gDGDOthUbRmj68CHmHhaYlGs4tiQTNVlEmuyLZ5e0zY="; }; passthru.updateScript = writeScript "update-irpf" '' From 1cd73eee4a263e6fe2961eaf5093a565e8f43647 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 15 Mar 2025 19:56:52 +0100 Subject: [PATCH 040/160] dolphin-emu: format --- .../emulators/dolphin-emu/default.nix | 266 +++++++++--------- 1 file changed, 138 insertions(+), 128 deletions(-) diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index 26d84ff1da98..30fcee0993ae 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -1,56 +1,57 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook -, alsa-lib -, bluez -, bzip2 -, cubeb -, curl -, enet -, ffmpeg -, fmt_10 -, gtest -, hidapi -, libevdev -, libGL -, libiconv -, libpulseaudio -, libspng -, libusb1 -, libXdmcp -, libXext -, libXrandr -, lz4 -, lzo -, mbedtls_2 -, miniupnpc -, minizip-ng -, openal -, pugixml -, qtbase -, qtsvg -, SDL2 -, sfml -, udev -, vulkan-loader -, xxHash -, xz +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + alsa-lib, + bluez, + bzip2, + cubeb, + curl, + enet, + ffmpeg, + fmt_10, + gtest, + hidapi, + libevdev, + libGL, + libiconv, + libpulseaudio, + libspng, + libusb1, + libXdmcp, + libXext, + libXrandr, + lz4, + lzo, + mbedtls_2, + miniupnpc, + minizip-ng, + openal, + pugixml, + qtbase, + qtsvg, + SDL2, + sfml, + udev, + vulkan-loader, + xxHash, + xz, # Used in passthru -, testers + testers, # Darwin-only dependencies -, CoreBluetooth -, ForceFeedback -, IOBluetooth -, IOKit -, moltenvk -, OpenGL -, VideoToolbox -, xcbuild + CoreBluetooth, + ForceFeedback, + IOBluetooth, + IOKit, + moltenvk, + OpenGL, + VideoToolbox, + xcbuild, }: stdenv.mkDerivation (finalAttrs: { @@ -67,79 +68,86 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - xcbuild # for plutil - ]; + nativeBuildInputs = + [ + cmake + pkg-config + wrapQtAppsHook + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + xcbuild # for plutil + ]; - buildInputs = [ - bzip2 - cubeb - curl - enet - ffmpeg - fmt_10 - gtest - hidapi - libiconv - libpulseaudio - libspng - libusb1 - libXdmcp - lz4 - lzo - mbedtls_2 - miniupnpc - minizip-ng - openal - pugixml - qtbase - qtsvg - SDL2 - sfml - xxHash - xz - # Causes linker errors with minizip-ng, prefer vendored. Possible reason why: https://github.com/dolphin-emu/dolphin/pull/12070#issuecomment-1677311838 - #zlib-ng - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - bluez - libevdev - libGL - libXext - libXrandr - # FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version - #mgba # Derivation doesn't support Darwin - udev - vulkan-loader - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreBluetooth - ForceFeedback - IOBluetooth - IOKit - moltenvk - OpenGL - VideoToolbox - ]; + buildInputs = + [ + bzip2 + cubeb + curl + enet + ffmpeg + fmt_10 + gtest + hidapi + libiconv + libpulseaudio + libspng + libusb1 + libXdmcp + lz4 + lzo + mbedtls_2 + miniupnpc + minizip-ng + openal + pugixml + qtbase + qtsvg + SDL2 + sfml + xxHash + xz + # Causes linker errors with minizip-ng, prefer vendored. Possible reason why: https://github.com/dolphin-emu/dolphin/pull/12070#issuecomment-1677311838 + #zlib-ng + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + bluez + libevdev + libGL + libXext + libXrandr + # FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version + #mgba # Derivation doesn't support Darwin + udev + vulkan-loader + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + CoreBluetooth + ForceFeedback + IOBluetooth + IOKit + moltenvk + OpenGL + VideoToolbox + ]; - cmakeFlags = [ - "-DDISTRIBUTOR=NixOS" - "-DDOLPHIN_WC_REVISION=${finalAttrs.src.rev}" - "-DDOLPHIN_WC_DESCRIBE=${finalAttrs.version}" - "-DDOLPHIN_WC_BRANCH=master" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DOSX_USE_DEFAULT_SEARCH_PATH=True" - "-DUSE_BUNDLED_MOLTENVK=OFF" - "-DMACOS_CODE_SIGNING=OFF" - # Bundles the application folder into a standalone executable, so we cannot devendor libraries - "-DSKIP_POSTPROCESS_BUNDLE=ON" - # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways. - # Note: The updater isn't available on linux, so we don't need to disable it there. - "-DENABLE_AUTOUPDATE=OFF" - ]; + cmakeFlags = + [ + "-DDISTRIBUTOR=NixOS" + "-DDOLPHIN_WC_REVISION=${finalAttrs.src.rev}" + "-DDOLPHIN_WC_DESCRIBE=${finalAttrs.version}" + "-DDOLPHIN_WC_BRANCH=master" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-DOSX_USE_DEFAULT_SEARCH_PATH=True" + "-DUSE_BUNDLED_MOLTENVK=OFF" + "-DMACOS_CODE_SIGNING=OFF" + # Bundles the application folder into a standalone executable, so we cannot devendor libraries + "-DSKIP_POSTPROCESS_BUNDLE=ON" + # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways. + # Note: The updater isn't available on linux, so we don't need to disable it there. + "-DENABLE_AUTOUPDATE=OFF" + ]; qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" @@ -148,14 +156,16 @@ stdenv.mkDerivation (finalAttrs: { "--set QT_QPA_PLATFORM xcb" ]; - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Only gets installed automatically if the standalone executable is used - mkdir -p $out/Applications - cp -r ./Binaries/Dolphin.app $out/Applications - ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin - ''; + postInstall = + lib.optionalString stdenv.hostPlatform.isLinux '' + install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Only gets installed automatically if the standalone executable is used + mkdir -p $out/Applications + cp -r ./Binaries/Dolphin.app $out/Applications + ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin + ''; passthru = { tests.version = testers.testVersion { From 6b444b590fa7e553839bf7942ea66b3370f975a5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 15 Mar 2025 19:58:47 +0100 Subject: [PATCH 041/160] dolphin-emu: move to by-name --- .../do/dolphin-emu/package.nix} | 22 ++++--------------- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 4 insertions(+), 23 deletions(-) rename pkgs/{applications/emulators/dolphin-emu/default.nix => by-name/do/dolphin-emu/package.nix} (93%) diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/by-name/do/dolphin-emu/package.nix similarity index 93% rename from pkgs/applications/emulators/dolphin-emu/default.nix rename to pkgs/by-name/do/dolphin-emu/package.nix index 30fcee0993ae..b9f393823c4f 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/by-name/do/dolphin-emu/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, pkg-config, - wrapQtAppsHook, alsa-lib, bluez, bzip2, @@ -31,8 +30,7 @@ minizip-ng, openal, pugixml, - qtbase, - qtsvg, + qt6, SDL2, sfml, udev, @@ -44,13 +42,7 @@ testers, # Darwin-only dependencies - CoreBluetooth, - ForceFeedback, - IOBluetooth, - IOKit, moltenvk, - OpenGL, - VideoToolbox, xcbuild, }: @@ -72,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { [ cmake pkg-config - wrapQtAppsHook + qt6.wrapQtAppsHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild # for plutil @@ -100,8 +92,8 @@ stdenv.mkDerivation (finalAttrs: { minizip-ng openal pugixml - qtbase - qtsvg + qt6.qtbase + qt6.qtsvg SDL2 sfml xxHash @@ -122,13 +114,7 @@ stdenv.mkDerivation (finalAttrs: { vulkan-loader ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreBluetooth - ForceFeedback - IOBluetooth - IOKit moltenvk - OpenGL - VideoToolbox ]; cmakeFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16fd58b44885..2d0d0322a884 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1437,11 +1437,6 @@ with pkgs; ### APPLICATIONS/EMULATORS/DOLPHIN-EMU - dolphin-emu = qt6Packages.callPackage ../applications/emulators/dolphin-emu { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOBluetooth IOKit OpenGL VideoToolbox; - }; - dolphin-emu-primehack = qt6.callPackage ../applications/emulators/dolphin-emu/primehack.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; From 0a54ee3b26137fdf20962ac4a27b42b0ddf3e410 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Mon, 17 Mar 2025 07:43:00 -0600 Subject: [PATCH 042/160] mautrix-slack: 0.1.4 -> 0.2.0 https://github.com/mautrix/slack/releases/tag/v0.2.0 Signed-off-by: Sumner Evans --- pkgs/by-name/ma/mautrix-slack/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-slack/package.nix b/pkgs/by-name/ma/mautrix-slack/package.nix index 4dc71fdd9cd0..c81c36bf00c0 100644 --- a/pkgs/by-name/ma/mautrix-slack/package.nix +++ b/pkgs/by-name/ma/mautrix-slack/package.nix @@ -13,7 +13,7 @@ withGoolm ? false, }: let - version = "0.1.4"; + version = "0.2.0"; in buildGoModule { pname = "mautrix-slack"; @@ -23,10 +23,10 @@ buildGoModule { owner = "mautrix"; repo = "slack"; tag = "v${version}"; - hash = "sha256-MDbWvbEY8+CrUL1SnjdJ4SqyOH/5gPsEQkLnTHyJdOo="; + hash = "sha256-y6DsojQQAQkAB4puhk3DLheVvjn0puoYvzoX1H7gBEM="; }; - vendorHash = "sha256-8U6ifMLRF7PJyG3hWKgBtj/noO/eCXXD60aeB4p2W54="; + vendorHash = "sha256-1aYg6wDG2hzUshtHs9KiJDAFb4OM1oupUJAh3LR4KxY="; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; From 5e8c03318172dbf4a21df850da160d6b4f7f37c5 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Mon, 17 Mar 2025 07:57:15 -0600 Subject: [PATCH 043/160] mautrix-gmessages: 0.6.0 -> 0.6.1 https://github.com/mautrix/gmessages/releases/tag/v0.6.1 Signed-off-by: Sumner Evans --- pkgs/by-name/ma/mautrix-gmessages/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-gmessages/package.nix b/pkgs/by-name/ma/mautrix-gmessages/package.nix index c6b6982c555c..d96347f9ec1f 100644 --- a/pkgs/by-name/ma/mautrix-gmessages/package.nix +++ b/pkgs/by-name/ma/mautrix-gmessages/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "mautrix-gmessages"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "gmessages"; tag = "v${version}"; - hash = "sha256-FNjFGO/4j3kLo79oU5fsYA2/yhc9cAsAGIAQ5OJ2VPE="; + hash = "sha256-qpqFWQ4ZhgzG7SG6phW6LnS52Ve1S+Ky6YtjzfBkBmE="; }; - vendorHash = "sha256-QZ16R5i0I7uvQCDpa9/0Fh3jP6TEiheenRnRUXHvYIQ="; + vendorHash = "sha256-Ps9I8WtTtrc3gSMxt4XZ/IUipZL2+kbgNfbY2PYFoa8="; ldflags = [ "-s" From 17459128b44a63eee1ec373b2d14a43e7f37c215 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 17 Mar 2025 09:14:42 -0500 Subject: [PATCH 044/160] terraform-landscape: 0.2.1 -> 0.3.4 --- .../cluster/terraform-landscape/Gemfile | 1 + .../cluster/terraform-landscape/Gemfile.lock | 16 +++++---- .../cluster/terraform-landscape/gemset.nix | 34 +++++++++++++------ 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile index c4f9a5511de9..38ea0aec7f43 100644 --- a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile +++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile @@ -1,2 +1,3 @@ source 'https://rubygems.org' gem 'terraform_landscape' +gem 'abbrev' diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock index 7307d8a33f3c..90e90dcc3f66 100644 --- a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock +++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock @@ -1,25 +1,27 @@ GEM remote: https://rubygems.org/ specs: + abbrev (0.1.2) colorize (0.8.1) - commander (4.4.6) - highline (~> 1.7.2) - diffy (3.2.1) - highline (1.7.10) + commander (4.6.0) + highline (~> 2.0.0) + diffy (3.4.3) + highline (2.0.3) polyglot (0.3.5) - terraform_landscape (0.2.1) + terraform_landscape (0.3.4) colorize (~> 0.7) commander (~> 4.4) diffy (~> 3.0) treetop (~> 1.6) - treetop (1.6.10) + treetop (1.6.14) polyglot (~> 0.3) PLATFORMS ruby DEPENDENCIES + abbrev terraform_landscape BUNDLED WITH - 2.1.4 + 2.6.2 diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix index 9b3dafac6340..2f67a79e60a1 100644 --- a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix +++ b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix @@ -1,5 +1,7 @@ { colorize = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b"; @@ -9,30 +11,38 @@ }; commander = { dependencies = [ "highline" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11sd2sb0id2dbxkv4pvymdiia1xxhms45kh4nr8mryqybad0fwwf"; + sha256 = "1n8k547hqq9hvbyqbx2qi08g0bky20bbjca1df8cqq5frhzxq7bx"; type = "gem"; }; - version = "4.4.6"; + version = "4.6.0"; }; diffy = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "119imrkn01agwhx5raxhknsi331y5i4yda7r0ws0an6905ximzjg"; + sha256 = "19xaz5qmw0kg1rdsjh13vk7674bpcmjy6cnddx1cvl80vgkvjr22"; type = "gem"; }; - version = "3.2.1"; + version = "3.4.3"; }; highline = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; + sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; type = "gem"; }; - version = "1.7.10"; + version = "2.0.3"; }; polyglot = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; @@ -47,20 +57,24 @@ "diffy" "treetop" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1i93pih7r6zcqpjhsmvkpfkgbh0l66c60i6fkiymq7vy2xd6wnns"; + sha256 = "1lcsqasn8k2i6kxy9sv76mvf8s60qkdg3a3sb5shj6lvh2dk8n8s"; type = "gem"; }; - version = "0.2.1"; + version = "0.3.4"; }; treetop = { dependencies = [ "polyglot" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7"; + sha256 = "1m5fqy7vq6y7bgxmw7jmk7y6pla83m16p7lb41lbqgg53j8x2cds"; type = "gem"; }; - version = "1.6.10"; + version = "1.6.14"; }; } From 669dc234ba4d0b962cfd992f974214661d1adb67 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Mon, 17 Mar 2025 08:14:46 -0600 Subject: [PATCH 045/160] meowlnir: 0.2.0 -> 0.3.0 https://github.com/maunium/meowlnir/releases/tag/v0.3.0 Signed-off-by: Sumner Evans --- pkgs/by-name/me/meowlnir/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/meowlnir/package.nix b/pkgs/by-name/me/meowlnir/package.nix index 505f65621dfe..13e23aa57f11 100644 --- a/pkgs/by-name/me/meowlnir/package.nix +++ b/pkgs/by-name/me/meowlnir/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "meowlnir"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "maunium"; repo = "meowlnir"; tag = "v${version}"; - hash = "sha256-Fzi9KI6bPrmKMku176rAnLpfVcAjYlKUQ8MiSQB9hpU="; + hash = "sha256-ig803e4onU3E4Nj5aJo2+QfwZt12iKIJ7fS/BjXsojc="; }; buildInputs = [ olm ]; - vendorHash = "sha256-G1+KDssamPRFlGs/moBk0qJDT/IctiKgnM+mVfCDMwg="; + vendorHash = "sha256-+P7tlpGTo9N+uSn22uAlzyB36hu3re+KfOe3a/uzLZE="; doCheck = true; doInstallCheck = true; From e91fc91387fe9dca1a5687db0397e14809e5a186 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 17 Mar 2025 11:40:57 -0500 Subject: [PATCH 046/160] bundler-audit: 0.9.1 -> 0.9.2 --- pkgs/tools/security/bundler-audit/Gemfile.lock | 6 +++--- pkgs/tools/security/bundler-audit/gemset.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/bundler-audit/Gemfile.lock b/pkgs/tools/security/bundler-audit/Gemfile.lock index 5d51735440d6..65b5974ba283 100644 --- a/pkgs/tools/security/bundler-audit/Gemfile.lock +++ b/pkgs/tools/security/bundler-audit/Gemfile.lock @@ -1,10 +1,10 @@ GEM remote: https://rubygems.org/ specs: - bundler-audit (0.9.1) + bundler-audit (0.9.2) bundler (>= 1.2.0, < 3) thor (~> 1.0) - thor (1.2.1) + thor (1.3.2) PLATFORMS ruby @@ -13,4 +13,4 @@ DEPENDENCIES bundler-audit BUNDLED WITH - 2.3.9 + 2.6.2 diff --git a/pkgs/tools/security/bundler-audit/gemset.nix b/pkgs/tools/security/bundler-audit/gemset.nix index 2dc2c5141f34..9901d5bbb413 100644 --- a/pkgs/tools/security/bundler-audit/gemset.nix +++ b/pkgs/tools/security/bundler-audit/gemset.nix @@ -5,19 +5,19 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gdx0019vj04n1512shhdx7hwphzqmdpw4vva2k551nd47y1dixx"; + sha256 = "0j0h5cgnzk0ms17ssjkzfzwz65ggrs3lsp53a1j46p4616m1s1bk"; type = "gem"; }; - version = "0.9.1"; + version = "0.9.2"; }; thor = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.2"; }; } From 8c8113b3d653b4c7f0688e16f17060f8c8aee57c Mon Sep 17 00:00:00 2001 From: TheColorman Date: Tue, 4 Mar 2025 21:30:43 +0100 Subject: [PATCH 047/160] yafc-ce: 2.8.0 -> 2.10.0 --- pkgs/by-name/ya/yafc-ce/deps.json | 30 ----------------------------- pkgs/by-name/ya/yafc-ce/package.nix | 4 ++-- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/ya/yafc-ce/deps.json b/pkgs/by-name/ya/yafc-ce/deps.json index fa4b0d10fd9a..e3e3d046b6da 100644 --- a/pkgs/by-name/ya/yafc-ce/deps.json +++ b/pkgs/by-name/ya/yafc-ce/deps.json @@ -34,16 +34,6 @@ "version": "3.26.1", "hash": "sha256-1tHxDuJwwvJWZ3H9ooPFAKuaJIthSdTDlmjHlxH/euc=" }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", - "version": "8.0.10", - "hash": "sha256-GL7OjLalZPKLsoheVJAmVStJFpJ7zTDJtikCP7fB3jU=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", - "version": "8.0.10", - "hash": "sha256-u6/4q54irXtyKSSi1bH6HYrvcod7yfs5YdYD0NXeYbs=" - }, { "pname": "Microsoft.CodeCoverage", "version": "17.11.1", @@ -54,26 +44,6 @@ "version": "17.11.1", "hash": "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI=" }, - { - "pname": "Microsoft.NETCore.App.Host.osx-arm64", - "version": "8.0.10", - "hash": "sha256-IZ59kjeU/mGHBVXtOO5AFK0ocxwFAkFqwtn99N+l0zw=" - }, - { - "pname": "Microsoft.NETCore.App.Host.osx-x64", - "version": "8.0.10", - "hash": "sha256-B4aqUvMpyewAwquTRVh+bs2RG875ZsveYQU89+4VFxw=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", - "version": "8.0.10", - "hash": "sha256-0fH2KlzVL5ydblrVtBtAoHa5kNYY92Wzv8FCVqav3Mw=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.osx-x64", - "version": "8.0.10", - "hash": "sha256-XKUQ0DDWWbZNtgGPKhdI7ufpd9Ki1EcOcK9ojiaWEVM=" - }, { "pname": "Microsoft.TestPlatform.ObjectModel", "version": "17.11.1", diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix index 50397163d9b0..164cd559b1e4 100644 --- a/pkgs/by-name/ya/yafc-ce/package.nix +++ b/pkgs/by-name/ya/yafc-ce/package.nix @@ -12,13 +12,13 @@ let in buildDotnetModule (finalAttrs: { pname = "yafc-ce"; - version = "2.8.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "shpaass"; repo = "yafc-ce"; rev = finalAttrs.version; - hash = "sha256-d0LLwol68ywwFsUx7gC4S1MF+3HUTt7+F6rcL1j0Oj8="; + hash = "sha256-AFFu4yqnBq0OD3XY1V97zxAIfZuXswT9KOJzU8GqQuU"; }; projectFile = [ "Yafc/Yafc.csproj" ]; From 7267d749c478918484a00482397e68b1ea88840a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 17 Mar 2025 15:14:22 -0500 Subject: [PATCH 048/160] rufo: 0.17.0 -> 0.18.1 --- pkgs/development/tools/rufo/Gemfile.lock | 4 ++-- pkgs/development/tools/rufo/gemset.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rufo/Gemfile.lock b/pkgs/development/tools/rufo/Gemfile.lock index 57951b5236e8..cac8a74d828c 100644 --- a/pkgs/development/tools/rufo/Gemfile.lock +++ b/pkgs/development/tools/rufo/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - rufo (0.17.0) + rufo (0.18.1) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES rufo BUNDLED WITH - 2.5.3 + 2.6.2 diff --git a/pkgs/development/tools/rufo/gemset.nix b/pkgs/development/tools/rufo/gemset.nix index 18b3414d4be9..ec79e581f6c7 100644 --- a/pkgs/development/tools/rufo/gemset.nix +++ b/pkgs/development/tools/rufo/gemset.nix @@ -4,9 +4,9 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rqq6mf7fvwvc9m3d5w5ysch3h7z4ml1vvdvy26064fb6lrnn5ai"; + sha256 = "0jcdkl9kpk96kby9qw46klgdy0nxswsbicxdq0dbdhhg7v00cc3r"; type = "gem"; }; - version = "0.17.0"; + version = "0.18.1"; }; } From 296764507846eac7e009194162a7c088d6213867 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 17 Mar 2025 17:18:53 -0500 Subject: [PATCH 049/160] xcpretty: 0.3.0 -> 0.4.0 --- pkgs/development/tools/xcpretty/Gemfile.lock | 8 ++++---- pkgs/development/tools/xcpretty/gemset.nix | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/xcpretty/Gemfile.lock b/pkgs/development/tools/xcpretty/Gemfile.lock index c0b9676d27bd..d56a9587d70d 100644 --- a/pkgs/development/tools/xcpretty/Gemfile.lock +++ b/pkgs/development/tools/xcpretty/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - rouge (2.0.7) - xcpretty (0.3.0) - rouge (~> 2.0.7) + rouge (3.28.0) + xcpretty (0.4.0) + rouge (~> 3.28.0) PLATFORMS ruby @@ -12,4 +12,4 @@ DEPENDENCIES xcpretty BUNDLED WITH - 2.1.4 + 2.6.2 diff --git a/pkgs/development/tools/xcpretty/gemset.nix b/pkgs/development/tools/xcpretty/gemset.nix index 97dffa3040fd..b9dd45abfbbb 100644 --- a/pkgs/development/tools/xcpretty/gemset.nix +++ b/pkgs/development/tools/xcpretty/gemset.nix @@ -1,19 +1,23 @@ { rouge = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d"; type = "gem"; }; - version = "2.0.7"; + version = "3.28.0"; }; xcpretty = { dependencies = [ "rouge" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm"; + sha256 = "1lbwk77g28jjhin3qjrh7ldfsgf7aszi9j60mp8yz10i3wyqgvqj"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; } From 34034b75f1a96f5bf902df0a5f224044e35ec161 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 15 Mar 2025 20:11:19 +0100 Subject: [PATCH 050/160] dolphin-emu: cleanup, modernize --- pkgs/by-name/do/dolphin-emu/package.nix | 88 ++++++++++++++----------- 1 file changed, 50 insertions(+), 38 deletions(-) diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix index b9f393823c4f..22e4d03fcd5d 100644 --- a/pkgs/by-name/do/dolphin-emu/package.nix +++ b/pkgs/by-name/do/dolphin-emu/package.nix @@ -2,10 +2,15 @@ lib, stdenv, fetchFromGitHub, + + # nativeBuildInputs cmake, pkg-config, - alsa-lib, - bluez, + qt6, + # darwin-only + xcbuild, + + # buildInputs bzip2, cubeb, curl, @@ -14,15 +19,10 @@ fmt_10, gtest, hidapi, - libevdev, - libGL, - libiconv, + libXdmcp, libpulseaudio, libspng, libusb1, - libXdmcp, - libXext, - libXrandr, lz4, lzo, mbedtls_2, @@ -30,20 +30,25 @@ minizip-ng, openal, pugixml, - qt6, SDL2, sfml, - udev, - vulkan-loader, xxHash, xz, - - # Used in passthru - testers, - - # Darwin-only dependencies + # linux-only + alsa-lib, + bluez, + libGL, + libXext, + libXrandr, + libevdev, + udev, + vulkan-loader, + # darwin-only moltenvk, - xcbuild, + + # passthru + testers, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -54,8 +59,8 @@ stdenv.mkDerivation (finalAttrs: { owner = "dolphin-emu"; repo = "dolphin"; tag = finalAttrs.version; - hash = "sha256-oqJKXFcsFgoYjUqdk3Z/CIFhOa8w0drcF4JwtHRI1Hs="; fetchSubmodules = true; + hash = "sha256-oqJKXFcsFgoYjUqdk3Z/CIFhOa8w0drcF4JwtHRI1Hs="; }; strictDeps = true; @@ -80,11 +85,10 @@ stdenv.mkDerivation (finalAttrs: { fmt_10 gtest hidapi - libiconv + libXdmcp libpulseaudio libspng libusb1 - libXdmcp lz4 lzo mbedtls_2 @@ -104,10 +108,10 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib bluez - libevdev libGL libXext libXrandr + libevdev # FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version #mgba # Derivation doesn't support Darwin udev @@ -119,20 +123,20 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ - "-DDISTRIBUTOR=NixOS" - "-DDOLPHIN_WC_REVISION=${finalAttrs.src.rev}" - "-DDOLPHIN_WC_DESCRIBE=${finalAttrs.version}" - "-DDOLPHIN_WC_BRANCH=master" + (lib.cmakeFeature "DISTRIBUTOR" "NixOS") + (lib.cmakeFeature "DOLPHIN_WC_REVISION" finalAttrs.src.rev) + (lib.cmakeFeature "DOLPHIN_WC_DESCRIBE" finalAttrs.version) + (lib.cmakeFeature "DOLPHIN_WC_BRANCH" "master") ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DOSX_USE_DEFAULT_SEARCH_PATH=True" - "-DUSE_BUNDLED_MOLTENVK=OFF" - "-DMACOS_CODE_SIGNING=OFF" + (lib.cmakeBool "OSX_USE_DEFAULT_SEARCH_PATH" true) + (lib.cmakeBool "USE_BUNDLED_MOLTENVK" false) + (lib.cmakeBool "MACOS_CODE_SIGNING" false) # Bundles the application folder into a standalone executable, so we cannot devendor libraries - "-DSKIP_POSTPROCESS_BUNDLE=ON" + (lib.cmakeBool "SKIP_POSTPROCESS_BUNDLE" true) # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways. # Note: The updater isn't available on linux, so we don't need to disable it there. - "-DENABLE_AUTOUPDATE=OFF" + (lib.cmakeBool "ENABLE_AUTOUPDATE" false) ]; qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ @@ -154,20 +158,28 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "dolphin-emu-nogui --version"; - inherit (finalAttrs) version; + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "dolphin-emu-nogui --version"; + inherit (finalAttrs) version; + }; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "([0-9]+)" + ]; }; }; - meta = with lib; { + meta = { homepage = "https://dolphin-emu.org"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu"; branch = "master"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ pbsds ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ pbsds ]; }; }) From cf0b43ee7a417f2b27cf618f973ac3df149ab09e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 15 Mar 2025 20:30:40 +0100 Subject: [PATCH 051/160] dolphin-emu-primehack: move to by-name --- .../do/dolphin-emu-primehack/package.nix} | 20 ++++--------------- pkgs/top-level/all-packages.nix | 8 -------- 2 files changed, 4 insertions(+), 24 deletions(-) rename pkgs/{applications/emulators/dolphin-emu/primehack.nix => by-name/do/dolphin-emu-primehack/package.nix} (91%) diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix similarity index 91% rename from pkgs/applications/emulators/dolphin-emu/primehack.nix rename to pkgs/by-name/do/dolphin-emu-primehack/package.nix index 66200efda720..54735ae7dbbe 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix @@ -4,9 +4,7 @@ fetchFromGitHub, pkg-config, cmake, - wrapQtAppsHook, - qtbase, - qtsvg, + qt6, bluez, ffmpeg, libao, @@ -40,10 +38,6 @@ libpulseaudio, # - Inputs used for Darwin - CoreBluetooth, - ForceFeedback, - IOKit, - OpenGL, libpng, hidapi, }: @@ -63,7 +57,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake - ] ++ lib.optional stdenv.hostPlatform.isLinux wrapQtAppsHook; + ] ++ lib.optional stdenv.hostPlatform.isLinux qt6.wrapQtAppsHook; buildInputs = [ @@ -95,8 +89,8 @@ stdenv.mkDerivation rec { sfml fmt xz - qtbase - qtsvg + qt6.qtbase + qt6.qtsvg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez @@ -104,12 +98,6 @@ stdenv.mkDerivation rec { libevdev alsa-lib vulkan-loader - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreBluetooth - OpenGL - ForceFeedback - IOKit ]; cmakeFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d0d0322a884..be3503ff7b60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1433,14 +1433,6 @@ with pkgs; zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { }; - ### APPLICATIONS/EMULATORS/BSNES - - ### APPLICATIONS/EMULATORS/DOLPHIN-EMU - - dolphin-emu-primehack = qt6.callPackage ../applications/emulators/dolphin-emu/primehack.nix { - inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; - }; - ### APPLICATIONS/EMULATORS/RETROARCH libretro = recurseIntoAttrs (callPackage ../applications/emulators/libretro { }); From 6c2d300bb95c9428e0aae669cef00a98052e1333 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 17 Mar 2025 17:34:47 -0500 Subject: [PATCH 052/160] fastlane: 2.220.0 -> 2.227.0 Add abbrev to Gemfile --- pkgs/tools/admin/fastlane/Gemfile | 2 + pkgs/tools/admin/fastlane/Gemfile.lock | 99 ++++++++------- pkgs/tools/admin/fastlane/gemset.nix | 166 +++++++++++++++---------- 3 files changed, 155 insertions(+), 112 deletions(-) diff --git a/pkgs/tools/admin/fastlane/Gemfile b/pkgs/tools/admin/fastlane/Gemfile index 1fa8dbca63b1..ed9098c1e9d4 100644 --- a/pkgs/tools/admin/fastlane/Gemfile +++ b/pkgs/tools/admin/fastlane/Gemfile @@ -1,2 +1,4 @@ source 'https://rubygems.org' gem 'fastlane' + +gem "abbrev", "~> 0.1.2" diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index d9ca6d0777e2..50f4212ec318 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -5,25 +5,26 @@ GEM base64 nkf rexml - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.3.0) - aws-partitions (1.909.0) - aws-sdk-core (3.191.6) + aws-eventstream (1.3.2) + aws-partitions (1.1068.0) + aws-sdk-core (3.220.1) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.78.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.146.1) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-kms (1.99.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.182.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.8) - aws-sigv4 (1.8.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) @@ -33,13 +34,13 @@ GEM commander (4.6.0) highline (~> 2.0.0) declarative (0.0.20) - digest-crc (0.6.5) + digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.110.0) - faraday (1.10.3) + excon (0.112.0) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -58,17 +59,17 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - faraday_middleware (1.2.0) + faraday_middleware (1.2.1) faraday (~> 1.0) - fastimage (2.3.1) - fastlane (2.220.0) + fastimage (2.4.0) + fastlane (2.227.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -84,6 +85,7 @@ GEM faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) @@ -107,8 +109,10 @@ GEM tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) + xcpretty (~> 0.4.0) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) gh_inspector (1.1.3) google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) @@ -126,12 +130,12 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-storage_v1 (0.31.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.7.0) + google-cloud-core (1.8.0) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.4.0) + google-cloud-errors (1.5.0) google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) @@ -147,34 +151,36 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.5) + http-cookie (1.0.8) domain_name (~> 0.5) - httpclient (2.8.3) + httpclient (2.9.0) + mutex_m jmespath (1.6.2) - json (2.7.2) - jwt (2.8.1) + json (2.10.2) + jwt (2.10.1) base64 - mini_magick (4.12.0) + mini_magick (4.13.2) mini_mime (1.1.5) multi_json (1.15.0) - multipart-post (2.4.0) - nanaimo (0.3.0) + multipart-post (2.4.1) + mutex_m (0.3.0) + nanaimo (0.4.0) naturally (2.2.1) nkf (0.2.0) - optparse (0.4.0) + optparse (0.6.0) os (1.1.4) - plist (3.7.1) - public_suffix (5.0.5) + plist (3.7.2) + public_suffix (6.0.1) rake (13.2.1) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.6) - rouge (2.0.7) + rexml (3.4.1) + rouge (3.28.0) ruby2_keywords (0.0.5) - rubyzip (2.3.2) + rubyzip (2.4.1) security (0.1.5) signet (0.19.0) addressable (~> 2.8) @@ -184,6 +190,7 @@ GEM simctl (1.6.10) CFPropertyList naturally + sysrandom (1.0.5) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -193,17 +200,17 @@ GEM tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) word_wrap (1.0.0) - xcodeproj (1.24.0) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (~> 3.2.4) - xcpretty (0.3.0) - rouge (~> 2.0.7) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.4.0) + rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) @@ -214,4 +221,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.5.6 + 2.6.2 diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index eb46a8fe55c5..7565ccee0a62 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -5,10 +5,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; artifactory = { groups = [ "default" ]; @@ -35,36 +35,37 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; + sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.2"; }; aws-partitions = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00iknq94smbskgmxqmlxlcgpq5famd968l12nvv8bxi7gk1hagsk"; + sha256 = "0lmnx4sa9wm9ffqsjbybxzlgz6h4clf96s694sdn2lz1qcx0fq2i"; type = "gem"; }; - version = "1.909.0"; + version = "1.1068.0"; }; aws-sdk-core = { dependencies = [ "aws-eventstream" "aws-partitions" "aws-sigv4" + "base64" "jmespath" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08h9apxdn2aflkg751j4i56ks4750znfbj56w4zlxf4jk7jxkbyk"; + sha256 = "0cjdqmy5hjbgzc0iac1i143va76qgp7jc7hg1aviy1n8cgywq44y"; type = "gem"; }; - version = "3.191.6"; + version = "3.220.1"; }; aws-sdk-kms = { dependencies = [ @@ -75,10 +76,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fbp2vw5qnyiya63hlmwiqkbh30lipyqplancmhm84ad7i98ambb"; + sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads"; type = "gem"; }; - version = "1.78.0"; + version = "1.99.0"; }; aws-sdk-s3 = { dependencies = [ @@ -90,10 +91,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1al80phz4x9wwfnr07q1l8h5f0qxgfrrycbg8jvznhxm3zhrakrq"; + sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h"; type = "gem"; }; - version = "1.146.1"; + version = "1.182.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -101,10 +102,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; + sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h"; type = "gem"; }; - version = "1.8.0"; + version = "1.11.0"; }; babosa = { groups = [ "default" ]; @@ -198,10 +199,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09114ndpnnyamc2q07bmpzw7kp3rbbfv7plmxcbzzi9d6prmd92w"; + sha256 = "01wcsyhaadss4zzvqh12kvbq3hmkl5y4fck7pr608hd24qxc5bb4"; type = "gem"; }; - version = "0.6.5"; + version = "0.7.0"; }; domain_name = { groups = [ "default" ]; @@ -238,10 +239,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1m3gzvp1wqki0yh4b7761qhdy4pyr4phy429b7s9w25nrkhp4lsz"; + sha256 = "1w7098hnyby5sn2315qy26as6kxlxivxlcrs714amj9g9hxaryfs"; type = "gem"; }; - version = "0.110.0"; + version = "0.112.0"; }; faraday = { dependencies = [ @@ -261,10 +262,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90"; + sha256 = "069gmdh5j90v06rbwlqvlhzhq45lxhx74mahz25xd276rm0wb153"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; faraday-cookie_jar = { dependencies = [ @@ -326,20 +327,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; + sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5"; type = "gem"; }; - version = "1.0.4"; + version = "1.1.0"; }; faraday-net_http = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; faraday-net_http_persistent = { groups = [ "default" ]; @@ -387,20 +388,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy"; + sha256 = "1s990pnapb3vci9c00bklqc7jjix4i2zhxn2zf1lfk46xv47hnyl"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.1"; }; fastimage = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sfc7svf7h1ja6zmsq9f3ps6pg0q4hymphh6rk7ipmp7ygqjkii3"; + sha256 = "1s67b9n7ki3iaycypq8sh02377gjkaxadg4dq53bpgfk4xg3gkjz"; type = "gem"; }; - version = "2.3.1"; + version = "2.4.0"; }; fastlane = { dependencies = [ @@ -418,6 +419,7 @@ "faraday-cookie_jar" "faraday_middleware" "fastimage" + "fastlane-sirp" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" @@ -448,10 +450,21 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14ywmlipmryzdxzn4235ah67hy06wh5hf32jbs3a9j7byc2x1kx3"; + sha256 = "12lqn70c3v5h2z2svn1gickyhkhny6rwnm2xfrs3gmjc6pvfrqhb"; type = "gem"; }; - version = "2.220.0"; + version = "2.227.0"; + }; + fastlane-sirp = { + dependencies = [ "sysrandom" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hg6ql3g25f96fsmwr9xlxpn8afa7wvjampnrh1fqffhphjqyiv6"; + type = "gem"; + }; + version = "1.0.0"; }; gh_inspector = { groups = [ "default" ]; @@ -535,10 +548,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dagdfx3rnk9xplnj19gqpqn41fd09xfn8lp2p75psihhnj2i03l"; + sha256 = "1kw10897ardky1chwwsb8milygzcdi8qlqlhcnqwmkw9y75yswp5"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.0"; }; google-cloud-env = { dependencies = [ "faraday" ]; @@ -556,10 +569,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "056yw9cg771c1xqvw15wpdfdw9lz3m13fh5b6a3p1c9xaq7jwkhb"; + sha256 = "0jvv9w8s4dqc4ncfa6c6qpdypz2wj8dmgpjd44jq2qhhij5y4sxm"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; google-cloud-storage = { dependencies = [ @@ -613,20 +626,21 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk"; + sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.8"; }; httpclient = { + dependencies = [ "mutex_m" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + sha256 = "1j4qwj1nv66v3n9s4xqf64x2galvjm630bwa5xngicllwic5jr2b"; type = "gem"; }; - version = "2.8.3"; + version = "2.9.0"; }; jmespath = { groups = [ "default" ]; @@ -643,10 +657,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; + sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; type = "gem"; }; - version = "2.7.2"; + version = "2.10.2"; }; jwt = { dependencies = [ "base64" ]; @@ -654,20 +668,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02m3vza49pb9dirwpn8vmzbcypi3fc6l3a9dh253jwm1121g7ajb"; + sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6"; type = "gem"; }; - version = "2.8.1"; + version = "2.10.1"; }; mini_magick = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37"; + sha256 = "1nfxjpmka12ihbwd87d5k2hh7d2pv3aq95x0l2lh8gca1s72bmki"; type = "gem"; }; - version = "4.12.0"; + version = "4.13.2"; }; mini_mime = { groups = [ "default" ]; @@ -694,20 +708,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1033p35166d9p97y4vajbbvr13pmkk9zwn7sylxpmk9jrpk8ri67"; + sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; + }; + mutex_m = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l875dw0lk7b2ywa54l0wjcggs94vb7gs8khfw9li75n2sn09jyg"; + type = "gem"; + }; + version = "0.3.0"; }; nanaimo = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma"; + sha256 = "08q73nchv8cpk28h1sdnf5z6a862fcf4mxy1d58z25xb3dankw7s"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; naturally = { groups = [ "default" ]; @@ -734,10 +758,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pmsn1g1q5fpkjrc4h1wlw6lxlqp165sdcd951xyl47n6k0az17m"; + sha256 = "1306kdvq0xr333xma4452zvvvw6mx7fw20fwi6508i6dq5lh9s95"; type = "gem"; }; - version = "0.4.0"; + version = "0.6.0"; }; os = { groups = [ "default" ]; @@ -754,20 +778,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0b643i5b7b7galvlb2fc414ifmb78b5lsq47gnvhzl8m27dl559z"; + sha256 = "0hlaf4b3d8grxm9fqbnam5gwd55wvghl0jyzjd1hc5hirhklaynk"; type = "gem"; }; - version = "3.7.1"; + version = "3.7.2"; }; public_suffix = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14y4vzjwf5gp0mqgs880kis0k7n2biq8i6ci6q2n315kichl1hvj"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "5.0.5"; + version = "6.0.1"; }; rake = { groups = [ "default" ]; @@ -809,20 +833,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; type = "gem"; }; - version = "3.2.6"; + version = "3.4.1"; }; rouge = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d"; type = "gem"; }; - version = "2.0.7"; + version = "3.28.0"; }; ruby2_keywords = { groups = [ "default" ]; @@ -839,10 +863,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; type = "gem"; }; - version = "2.3.2"; + version = "2.4.1"; }; security = { groups = [ "default" ]; @@ -884,6 +908,16 @@ }; version = "1.6.10"; }; + sysrandom = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0x8yryf6migjnkfwr8dxgx1qyzhvajgha60hr5mgfkn65qyarhas"; + type = "gem"; + }; + version = "1.0.5"; + }; terminal-notifier = { groups = [ "default" ]; platforms = [ ]; @@ -961,10 +995,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; word_wrap = { groups = [ "default" ]; @@ -989,10 +1023,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1wpg4n7b8571j2h8h7v2kk8pr141rgf6m8mhk221k990fissrq56"; + sha256 = "1lslz1kfb8jnd1ilgg02qx0p0y6yiq8wwk84mgg2ghh58lxsgiwc"; type = "gem"; }; - version = "1.24.0"; + version = "1.27.0"; }; xcpretty = { dependencies = [ "rouge" ]; @@ -1000,10 +1034,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm"; + sha256 = "1lbwk77g28jjhin3qjrh7ldfsgf7aszi9j60mp8yz10i3wyqgvqj"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; xcpretty-travis-formatter = { dependencies = [ "xcpretty" ]; From 0b5844d46d194568d1d808ebdd387c7236ae5434 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 17 Mar 2025 17:55:18 -0500 Subject: [PATCH 053/160] xcode-install: 2.6.8 -> 2.8.1 --- pkgs/development/tools/xcode-install/Gemfile | 2 + .../tools/xcode-install/Gemfile.lock | 267 ++++----- .../tools/xcode-install/default.nix | 3 + .../tools/xcode-install/gemset.nix | 514 +++++++++++------- 4 files changed, 474 insertions(+), 312 deletions(-) diff --git a/pkgs/development/tools/xcode-install/Gemfile b/pkgs/development/tools/xcode-install/Gemfile index b9d313ce14fc..791e2b76172c 100644 --- a/pkgs/development/tools/xcode-install/Gemfile +++ b/pkgs/development/tools/xcode-install/Gemfile @@ -1,2 +1,4 @@ source 'https://rubygems.org' gem 'xcode-install' + +gem "abbrev", "~> 0.1.2" diff --git a/pkgs/development/tools/xcode-install/Gemfile.lock b/pkgs/development/tools/xcode-install/Gemfile.lock index 589543fe47d6..d9bbc5cc8cb3 100644 --- a/pkgs/development/tools/xcode-install/Gemfile.lock +++ b/pkgs/development/tools/xcode-install/Gemfile.lock @@ -1,62 +1,84 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.3) - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) - artifactory (3.0.15) + CFPropertyList (3.0.7) + base64 + nkf + rexml + abbrev (0.1.2) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.1.0) - aws-partitions (1.419.0) - aws-sdk-core (3.111.2) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.41.0) - aws-sdk-core (~> 3, >= 3.109.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.87.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-eventstream (1.3.2) + aws-partitions (1.1068.0) + aws-sdk-core (3.220.1) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.99.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.182.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.2) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) - claide (1.0.3) + base64 (0.2.0) + claide (1.1.0) colored (1.2) colored2 (3.1.2) - commander-fastlane (4.4.6) - highline (~> 1.7.2) + commander (4.6.0) + highline (~> 2.0.0) declarative (0.0.20) - declarative-option (0.1.0) - digest-crc (0.6.3) + digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) - emoji_regex (3.2.1) - excon (0.78.1) - faraday (1.3.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.112.0) + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday-net_http (1.0.1) - faraday_middleware (1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.1) faraday (~> 1.0) - fastimage (2.2.1) - fastlane (2.172.0) + fastimage (2.4.0) + fastlane (2.227.0) CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.3, < 3.0.0) + addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) - colored - commander-fastlane (>= 4.4.6, < 5.0.0) + colored (~> 1.2) + commander (~> 4.6) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) excon (>= 0.71.0, < 1.0.0) @@ -64,133 +86,135 @@ GEM faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.37.0, < 0.39.0) - google-cloud-storage (>= 1.15.0, < 2.0.0) - highline (>= 1.7.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (~> 2.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.3) + security (= 0.1.5) simctl (~> 1.6.3) - slack-notifier (>= 2.0.0, < 3.0.0) terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (>= 1.4.5, < 2.0.0) + terminal-table (~> 3) tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) + xcpretty (~> 0.4.0) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) gh_inspector (1.1.3) - google-api-client (0.38.0) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.9) - httpclient (>= 2.8.1, < 3.0) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) mini_mime (~> 1.0) representable (~> 3.0) - retriable (>= 2.0, < 4.0) - signet (~> 0.12) - google-apis-core (0.2.1) - addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.14) - httpclient (>= 2.8.1, < 3.0) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.0) + retriable (>= 2.0, < 4.a) rexml - signet (~> 0.14) - webrick - google-apis-iamcredentials_v1 (0.1.0) - google-apis-core (~> 0.1) - google-apis-storage_v1 (0.1.0) - google-apis-core (~> 0.1) - google-cloud-core (1.5.0) - google-cloud-env (~> 1.0) + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.8.0) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (1.4.0) - faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.0.1) - google-cloud-storage (1.30.0) - addressable (~> 2.5) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.5.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.1) - google-cloud-core (~> 1.2) - googleauth (~> 0.9) + google-apis-storage_v1 (~> 0.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (0.15.0) - faraday (>= 0.17.3, < 2.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.14) - highline (1.7.10) - http-cookie (1.0.3) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.8) domain_name (~> 0.5) - httpclient (2.8.3) - jmespath (1.4.0) - json (2.5.1) - jwt (2.2.2) - memoist (0.16.2) - mini_magick (4.11.0) - mini_mime (1.0.2) + httpclient (2.9.0) + mutex_m + jmespath (1.6.2) + json (2.10.2) + jwt (2.10.1) + base64 + mini_magick (4.13.2) + mini_mime (1.1.5) multi_json (1.15.0) - multipart-post (2.0.0) - nanaimo (0.3.0) + multipart-post (2.4.1) + mutex_m (0.3.0) + nanaimo (0.4.0) naturally (2.2.1) - os (1.1.1) - plist (3.6.0) - public_suffix (4.0.6) - rake (13.0.3) - representable (3.0.4) + nkf (0.2.0) + optparse (0.6.0) + os (1.1.4) + plist (3.7.2) + public_suffix (6.0.1) + rake (13.2.1) + representable (3.2.0) declarative (< 0.1.0) - declarative-option (< 0.2.0) + trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.4) - rouge (2.0.7) - ruby2_keywords (0.0.4) - rubyzip (2.3.0) - security (0.1.3) - signet (0.14.0) - addressable (~> 2.3) - faraday (>= 0.17.3, < 2.0) + rexml (3.4.1) + rouge (3.28.0) + ruby2_keywords (0.0.5) + rubyzip (2.4.1) + security (0.1.5) + signet (0.19.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.8) + simctl (1.6.10) CFPropertyList naturally - slack-notifier (2.3.2) + sysrandom (1.0.5) terminal-notifier (2.0.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + trailblazer-option (0.1.2) tty-cursor (0.7.1) - tty-screen (0.8.1) + tty-screen (0.8.2) tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) - webrick (1.7.0) + unicode-display_width (2.6.0) word_wrap (1.0.0) - xcode-install (2.6.8) - claide (>= 0.9.1, < 1.1.0) + xcode-install (2.8.1) + claide (>= 0.9.1) fastlane (>= 2.1.0, < 3.0.0) - xcodeproj (1.19.0) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - xcpretty (0.3.0) - rouge (~> 2.0.7) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.4.0) + rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) @@ -198,7 +222,8 @@ PLATFORMS ruby DEPENDENCIES + abbrev (~> 0.1.2) xcode-install BUNDLED WITH - 1.17.2 + 2.6.2 diff --git a/pkgs/development/tools/xcode-install/default.nix b/pkgs/development/tools/xcode-install/default.nix index 4b753b74d9f8..a00ee5f3bf42 100644 --- a/pkgs/development/tools/xcode-install/default.nix +++ b/pkgs/development/tools/xcode-install/default.nix @@ -1,6 +1,7 @@ { lib, bundlerApp, + bundlerUpdateScript, }: bundlerApp { @@ -8,6 +9,8 @@ bundlerApp { gemdir = ./.; exes = [ "xcversion" ]; + passthru.updateScript = bundlerUpdateScript "xcode-install"; + meta = with lib; { description = "Install and update your Xcodes automatically"; homepage = "https://github.com/xcpretty/xcode-install"; diff --git a/pkgs/development/tools/xcode-install/gemset.nix b/pkgs/development/tools/xcode-install/gemset.nix index 351c162ca498..115647dd9c29 100644 --- a/pkgs/development/tools/xcode-install/gemset.nix +++ b/pkgs/development/tools/xcode-install/gemset.nix @@ -1,24 +1,34 @@ { + abbrev = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hj2qyx7rzpc7awhvqlm597x7qdxwi4kkml4aqnp5jylmsm4w6xd"; + type = "gem"; + }; + version = "0.1.2"; + }; addressable = { dependencies = [ "public_suffix" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.7"; }; artifactory = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0wify8rhjwr5bw5y6ary61vba290vk766cxw9a9mg05yswmaisls"; + sha256 = "0qzj389l2a3zig040h882mf6cxfa71pm2nk51l4p85n3ck4xa8rh"; type = "gem"; }; - version = "3.0.15"; + version = "3.0.17"; }; atomos = { groups = [ "default" ]; @@ -35,36 +45,37 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; + sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y"; type = "gem"; }; - version = "1.1.0"; + version = "1.3.2"; }; aws-partitions = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vz0djj8w3ns0sz5gvkla5jml8xzx6skbcfj255m81fyww1x6ws8"; + sha256 = "0lmnx4sa9wm9ffqsjbybxzlgz6h4clf96s694sdn2lz1qcx0fq2i"; type = "gem"; }; - version = "1.419.0"; + version = "1.1068.0"; }; aws-sdk-core = { dependencies = [ "aws-eventstream" "aws-partitions" "aws-sigv4" + "base64" "jmespath" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4"; + sha256 = "0cjdqmy5hjbgzc0iac1i143va76qgp7jc7hg1aviy1n8cgywq44y"; type = "gem"; }; - version = "3.111.2"; + version = "3.220.1"; }; aws-sdk-kms = { dependencies = [ @@ -75,10 +86,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm"; + sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads"; type = "gem"; }; - version = "1.41.0"; + version = "1.99.0"; }; aws-sdk-s3 = { dependencies = [ @@ -90,10 +101,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7"; + sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h"; type = "gem"; }; - version = "1.87.0"; + version = "1.182.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -101,10 +112,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5"; + sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h"; type = "gem"; }; - version = "1.2.2"; + version = "1.11.0"; }; babosa = { groups = [ "default" ]; @@ -116,25 +127,40 @@ }; version = "1.0.4"; }; - CFPropertyList = { + base64 = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4"; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; type = "gem"; }; - version = "3.0.3"; + version = "0.2.0"; + }; + CFPropertyList = { + dependencies = [ + "base64" + "nkf" + "rexml" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0k1w5i4lb1z941m7ds858nly33f3iv12wvr1zav5x3fa99hj2my4"; + type = "gem"; + }; + version = "3.0.7"; }; claide = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; + sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; colored = { groups = [ "default" ]; @@ -156,16 +182,16 @@ }; version = "3.1.2"; }; - commander-fastlane = { + commander = { dependencies = [ "highline" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65"; + sha256 = "1n8k547hqq9hvbyqbx2qi08g0bky20bbjca1df8cqq5frhzxq7bx"; type = "gem"; }; - version = "4.4.6"; + version = "4.6.0"; }; declarative = { groups = [ "default" ]; @@ -177,82 +203,79 @@ }; version = "0.0.20"; }; - declarative-option = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p"; - type = "gem"; - }; - version = "0.1.0"; - }; digest-crc = { dependencies = [ "rake" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "118d5p02kdw6a5pi8af12dxma7q3b77zz5q5xjjf5kgp8qh1930a"; + sha256 = "01wcsyhaadss4zzvqh12kvbq3hmkl5y4fck7pr608hd24qxc5bb4"; type = "gem"; }; - version = "0.6.3"; + version = "0.7.0"; }; domain_name = { - dependencies = [ "unf" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + sha256 = "0cyr2xm576gqhqicsyqnhanni47408w2pgvrfi8pd13h2li3nsaz"; type = "gem"; }; - version = "0.5.20190701"; + version = "0.6.20240107"; }; dotenv = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; + sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565"; type = "gem"; }; - version = "2.7.6"; + version = "2.8.1"; }; emoji_regex = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qbzlracxw4xwyvrgr0qcl1alk4ijk6pv53ni6f43csi649y3n3s"; + sha256 = "0jsnrkfy345v66jlm2xrz8znivfnamg3mfzkddn414bndf2vxn7c"; type = "gem"; }; - version = "3.2.1"; + version = "3.2.3"; }; excon = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16ij8617v3js03yj1zd32mmrf7kpi9l96bid5mpqk30c4mzai55r"; + sha256 = "1w7098hnyby5sn2315qy26as6kxlxivxlcrs714amj9g9hxaryfs"; type = "gem"; }; - version = "0.78.1"; + version = "0.112.0"; }; faraday = { dependencies = [ + "faraday-em_http" + "faraday-em_synchrony" + "faraday-excon" + "faraday-httpclient" + "faraday-multipart" "faraday-net_http" - "multipart-post" + "faraday-net_http_persistent" + "faraday-patron" + "faraday-rack" + "faraday-retry" "ruby2_keywords" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; + sha256 = "069gmdh5j90v06rbwlqvlhzhq45lxhx74mahz25xd276rm0wb153"; type = "gem"; }; - version = "1.3.0"; + version = "1.10.4"; }; faraday-cookie_jar = { dependencies = [ @@ -268,15 +291,106 @@ }; version = "0.0.7"; }; + faraday-em_http = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-em_synchrony = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-excon = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; + }; + faraday-httpclient = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-multipart = { + dependencies = [ "multipart-post" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5"; + type = "gem"; + }; + version = "1.1.0"; + }; faraday-net_http = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; + }; + faraday-net_http_persistent = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; + type = "gem"; + }; + version = "1.2.0"; + }; + faraday-patron = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-rack = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-retry = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; + type = "gem"; + }; + version = "1.0.3"; }; faraday_middleware = { dependencies = [ "faraday" ]; @@ -284,20 +398,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r"; + sha256 = "1s990pnapb3vci9c00bklqc7jjix4i2zhxn2zf1lfk46xv47hnyl"; type = "gem"; }; - version = "1.0.0"; + version = "1.2.1"; }; fastimage = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vqp53s9vgd28f4l17q0vs7xv32y64af0ny3wb1fgg4i534rzg6j"; + sha256 = "1s67b9n7ki3iaycypq8sh02377gjkaxadg4dq53bpgfk4xg3gkjz"; type = "gem"; }; - version = "2.2.1"; + version = "2.4.0"; }; fastlane = { dependencies = [ @@ -307,7 +421,7 @@ "aws-sdk-s3" "babosa" "colored" - "commander-fastlane" + "commander" "dotenv" "emoji_regex" "excon" @@ -315,19 +429,24 @@ "faraday-cookie_jar" "faraday_middleware" "fastimage" + "fastlane-sirp" "gh_inspector" - "google-api-client" + "google-apis-androidpublisher_v3" + "google-apis-playcustomapp_v1" + "google-cloud-env" "google-cloud-storage" "highline" + "http-cookie" "json" "jwt" "mini_magick" "multipart-post" + "naturally" + "optparse" "plist" "rubyzip" "security" "simctl" - "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" @@ -341,10 +460,21 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0crr42qdgy9l409pffpfs7nq8ha18lp1nxngny2dc9hiq1xx4r5d"; + sha256 = "12lqn70c3v5h2z2svn1gickyhkhny6rwnm2xfrs3gmjc6pvfrqhb"; type = "gem"; }; - version = "2.172.0"; + version = "2.227.0"; + }; + fastlane-sirp = { + dependencies = [ "sysrandom" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hg6ql3g25f96fsmwr9xlxpn8afa7wvjampnrh1fqffhphjqyiv6"; + type = "gem"; + }; + version = "1.0.0"; }; gh_inspector = { groups = [ "default" ]; @@ -356,24 +486,16 @@ }; version = "1.1.3"; }; - google-api-client = { - dependencies = [ - "addressable" - "googleauth" - "httpclient" - "mini_mime" - "representable" - "retriable" - "signet" - ]; + google-apis-androidpublisher_v3 = { + dependencies = [ "google-apis-core" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jybks8i00rxrxx9mkx90dbdk6pczh2w757wchlavmrkrk0dp9s1"; + sha256 = "046j100lrh5dhb8p3gr38fyqrw8vcif97pqb55ysipy874lafw49"; type = "gem"; }; - version = "0.38.0"; + version = "0.54.0"; }; google-apis-core = { dependencies = [ @@ -384,17 +506,15 @@ "representable" "retriable" "rexml" - "signet" - "webrick" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "184pqw7z7s8mc1r5gj8f76xvp8z650xq50vdfj5gjwsbmzd99z2f"; + sha256 = "15ycm7al9dizabbqmri5xmiz8mbcci343ygb64ndbmr9n49p08a3"; type = "gem"; }; - version = "0.2.1"; + version = "0.11.3"; }; google-apis-iamcredentials_v1 = { dependencies = [ "google-apis-core" ]; @@ -402,10 +522,21 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xjlzq2fxpwvp9b6ajs8cpyjv8vs2d2npg9v23yj181hj2fnn82c"; + sha256 = "0ysil0bkh755kmf9xvw5szhk1yyh3gqzwfsrbwsrl77gsv7jarcs"; type = "gem"; }; - version = "0.1.0"; + version = "0.17.0"; + }; + google-apis-playcustomapp_v1 = { + dependencies = [ "google-apis-core" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1mlgwiid5lgg41y7qk8ca9lzhwx5njs25hz5fbf1mdal0kwm37lm"; + type = "gem"; + }; + version = "0.13.0"; }; google-apis-storage_v1 = { dependencies = [ "google-apis-core" ]; @@ -413,10 +544,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0axycds5q20fqm6vqxa5r922021p0f8jhwvlgw8r1vq600ljribi"; + sha256 = "13yvc9r8bhs16vq3fjc93qlffmq9p6zx97c9g1c3wh0jbrvwrs03"; type = "gem"; }; - version = "0.1.0"; + version = "0.31.0"; }; google-cloud-core = { dependencies = [ @@ -427,10 +558,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1qjn7vs8f85vxi1nkikbjfja6bv9snrj26vzscjii0cm8n4dy0i1"; + sha256 = "1kw10897ardky1chwwsb8milygzcdi8qlqlhcnqwmkw9y75yswp5"; type = "gem"; }; - version = "1.5.0"; + version = "1.8.0"; }; google-cloud-env = { dependencies = [ "faraday" ]; @@ -438,20 +569,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0bjgxyvagy6hjj8yg7fqq24rwdjxb6hx7fdd1bmn4mwd846lci2i"; + sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.0"; }; google-cloud-errors = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hvs1x39g77hbdqjxmzcl6gq8160pv3kskvzbbch0ww1np6qwm67"; + sha256 = "0jvv9w8s4dqc4ncfa6c6qpdypz2wj8dmgpjd44jq2qhhij5y4sxm"; type = "gem"; }; - version = "1.0.1"; + version = "1.5.0"; }; google-cloud-storage = { dependencies = [ @@ -467,16 +598,15 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "17axi5gmy0g04801v11lww5mvqzffqdc3w6k1j7f95v90hy4yn6m"; + sha256 = "0xpb3s7zr7g647xg66y2mavdargk5ixsfbfdmi4m2jc3khdd0hxm"; type = "gem"; }; - version = "1.30.0"; + version = "1.47.0"; }; googleauth = { dependencies = [ "faraday" "jwt" - "memoist" "multi_json" "os" "signet" @@ -485,20 +615,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pwm0mzb5zffhk6yw4v3n1yj8qr6jla6f78vsv4g0bxh9z0ikc2z"; + sha256 = "1ry9v23kndgx2pxq9v31l68k9lnnrcz1w4v75bkxq88jmbddljl1"; type = "gem"; }; - version = "0.15.0"; + version = "1.8.1"; }; highline = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; + sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; type = "gem"; }; - version = "1.7.10"; + version = "2.0.3"; }; http-cookie = { dependencies = [ "domain_name" ]; @@ -506,80 +636,72 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.8"; }; httpclient = { + dependencies = [ "mutex_m" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + sha256 = "1j4qwj1nv66v3n9s4xqf64x2galvjm630bwa5xngicllwic5jr2b"; type = "gem"; }; - version = "2.8.3"; + version = "2.9.0"; }; jmespath = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.2"; }; json = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; type = "gem"; }; - version = "2.5.1"; + version = "2.10.2"; }; jwt = { + dependencies = [ "base64" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n"; + sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6"; type = "gem"; }; - version = "2.2.2"; - }; - memoist = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; - type = "gem"; - }; - version = "0.16.2"; + version = "2.10.1"; }; mini_magick = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs"; + sha256 = "1nfxjpmka12ihbwd87d5k2hh7d2pv3aq95x0l2lh8gca1s72bmki"; type = "gem"; }; - version = "4.11.0"; + version = "4.13.2"; }; mini_mime = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.5"; }; multi_json = { groups = [ "default" ]; @@ -596,20 +718,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq"; type = "gem"; }; - version = "2.0.0"; + version = "2.4.1"; + }; + mutex_m = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l875dw0lk7b2ywa54l0wjcggs94vb7gs8khfw9li75n2sn09jyg"; + type = "gem"; + }; + version = "0.3.0"; }; nanaimo = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma"; + sha256 = "08q73nchv8cpk28h1sdnf5z6a862fcf4mxy1d58z25xb3dankw7s"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; naturally = { groups = [ "default" ]; @@ -621,60 +753,80 @@ }; version = "2.2.1"; }; + nkf = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09piyp2pd74klb9wcn0zw4mb5l0k9wzwppxggxi1yi95l2ym3hgv"; + type = "gem"; + }; + version = "0.2.0"; + }; + optparse = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1306kdvq0xr333xma4452zvvvw6mx7fw20fwi6508i6dq5lh9s95"; + type = "gem"; + }; + version = "0.6.0"; + }; os = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x"; + sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.4"; }; plist = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l"; + sha256 = "0hlaf4b3d8grxm9fqbnam5gwd55wvghl0jyzjd1hc5hirhklaynk"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.2"; }; public_suffix = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "4.0.6"; + version = "6.0.1"; }; rake = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.0.3"; + version = "13.2.1"; }; representable = { dependencies = [ "declarative" - "declarative-option" + "trailblazer-option" "uber" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07"; + sha256 = "1kms3r6w6pnryysnaqqa9fsn0v73zx1ilds9d1c565n3xdzbyafc"; type = "gem"; }; - version = "3.0.4"; + version = "3.2.0"; }; retriable = { groups = [ "default" ]; @@ -691,50 +843,50 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; type = "gem"; }; - version = "3.2.4"; + version = "3.4.1"; }; rouge = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d"; type = "gem"; }; - version = "2.0.7"; + version = "3.28.0"; }; ruby2_keywords = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "0.0.4"; + version = "0.0.5"; }; rubyzip = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; + sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.1"; }; security = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ryjxs0j66wrbky2c08yf0mllwalvpg12rpxzbdx2rdhj3cbrlxa"; + sha256 = "1drkm2wgjazwzj09db1szrllkag036bdvc3dr42fh1kpr877m5rs"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.5"; }; signet = { dependencies = [ @@ -747,10 +899,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10g2667fvxnc50hcd1aywgsbf8j7nrckg3n7zjvywmyz82pwmpqp"; + sha256 = "0cfxa11wy1nv9slmnzjczkdgld0gqizajsb03rliy53zylwkjzsk"; type = "gem"; }; - version = "0.14.0"; + version = "0.19.0"; }; simctl = { dependencies = [ @@ -761,20 +913,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1v9rsdmg5c5kkf8ps47xnrfbvjnq11sbaifr186jwkh4npawz00x"; + sha256 = "0sr3z4kmp6ym7synicyilj9vic7i9nxgaszqx6n1xn1ss7s7g45r"; type = "gem"; }; - version = "1.6.8"; + version = "1.6.10"; }; - slack-notifier = { + sysrandom = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv"; + sha256 = "0x8yryf6migjnkfwr8dxgx1qyzhvajgha60hr5mgfkn65qyarhas"; type = "gem"; }; - version = "2.3.2"; + version = "1.0.5"; }; terminal-notifier = { groups = [ "default" ]; @@ -792,10 +944,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr"; type = "gem"; }; - version = "1.8.0"; + version = "3.0.2"; + }; + trailblazer-option = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "18s48fndi2kfvrfzmq6rxvjfwad347548yby0341ixz1lhpg3r10"; + type = "gem"; + }; + version = "0.1.2"; }; tty-cursor = { groups = [ "default" ]; @@ -812,10 +974,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; + sha256 = "0l4vh6g333jxm9lakilkva2gn17j6gb052626r1pdbmy2lhnb460"; type = "gem"; }; - version = "0.8.1"; + version = "0.8.2"; }; tty-spinner = { dependencies = [ "tty-cursor" ]; @@ -838,46 +1000,15 @@ }; version = "0.1.0"; }; - unf = { - dependencies = [ "unf_ext" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; - type = "gem"; - }; - version = "0.1.4"; - }; - unf_ext = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; - type = "gem"; - }; - version = "0.0.7.7"; - }; unicode-display_width = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; type = "gem"; }; - version = "1.7.0"; - }; - webrick = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; - type = "gem"; - }; - version = "1.7.0"; + version = "2.6.0"; }; word_wrap = { groups = [ "default" ]; @@ -898,10 +1029,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1yhslanqw8r0mhls2hira05c8xjzzr7mnz1ab9p5qwg4z45ddjj8"; + sha256 = "11mkjyz5icxyskmchwh1vld9vdlhc794356nbla88dgjaqhjddvl"; type = "gem"; }; - version = "2.6.8"; + version = "2.8.1"; }; xcodeproj = { dependencies = [ @@ -910,15 +1041,16 @@ "claide" "colored2" "nanaimo" + "rexml" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; + sha256 = "1lslz1kfb8jnd1ilgg02qx0p0y6yiq8wwk84mgg2ghh58lxsgiwc"; type = "gem"; }; - version = "1.19.0"; + version = "1.27.0"; }; xcpretty = { dependencies = [ "rouge" ]; @@ -926,10 +1058,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm"; + sha256 = "1lbwk77g28jjhin3qjrh7ldfsgf7aszi9j60mp8yz10i3wyqgvqj"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; xcpretty-travis-formatter = { dependencies = [ "xcpretty" ]; From c8ad8cb7ae0e303878439eb9026f6331b7386f59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Mar 2025 23:41:46 +0000 Subject: [PATCH 054/160] protonplus: 0.4.25 -> 0.4.27 --- pkgs/by-name/pr/protonplus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix index 08abda07893b..50443df49692 100644 --- a/pkgs/by-name/pr/protonplus/package.nix +++ b/pkgs/by-name/pr/protonplus/package.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "protonplus"; - version = "0.4.25"; + version = "0.4.27"; src = fetchFromGitHub { owner = "Vysp3r"; repo = "protonplus"; rev = "v${finalAttrs.version}"; - hash = "sha256-IDEJ1/53fVq8FA58e3Fk/SPD8+xtXWLQr5IgNiim1jk="; + hash = "sha256-y6fqn02Ui5RbBy5oMeX5HPRHQDUYD2MphoubZxIwQI8="; }; nativeBuildInputs = [ From df84303e09503aac6fe14e99924deece08f055fb Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Tue, 18 Mar 2025 02:14:54 +0100 Subject: [PATCH 055/160] stalwart-cli: disable version check for now --- pkgs/by-name/st/stalwart-cli/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/st/stalwart-cli/package.nix b/pkgs/by-name/st/stalwart-cli/package.nix index 4ae1fa96e587..2c62a019283c 100644 --- a/pkgs/by-name/st/stalwart-cli/package.nix +++ b/pkgs/by-name/st/stalwart-cli/package.nix @@ -22,6 +22,9 @@ rustPlatform.buildRustPackage { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; + # Prerelease reports incorrect version + dontVersionCheck = true; + meta = { inherit (stalwart-mail.meta) license homepage changelog; description = "Stalwart Mail Server CLI"; From f38c9e3d39ffe8bb65cbd9cf4615b45eaf68fc19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 02:21:41 +0000 Subject: [PATCH 056/160] dosage-tracker: 1.9.3 -> 1.9.4 --- pkgs/by-name/do/dosage-tracker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix index 7650e3ed41f4..150b1574f17d 100644 --- a/pkgs/by-name/do/dosage-tracker/package.nix +++ b/pkgs/by-name/do/dosage-tracker/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosage"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Dosage"; tag = "v${finalAttrs.version}"; - hash = "sha256-euGyTaufL8Ifsy1RT4jcqlz8XZfCN7GfvFFvo85f/3c="; + hash = "sha256-EFcfkj0NOmQrWgLJpWHdIX7iitqfZwgTmkMvueJPS/c="; }; # https://github.com/NixOS/nixpkgs/issues/318830 From 9860873d3497f39587b4b99c7d9a4b1ea7cc9064 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 03:49:58 +0000 Subject: [PATCH 057/160] showtime: 47.0 -> 48.0 --- pkgs/by-name/sh/showtime/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sh/showtime/package.nix b/pkgs/by-name/sh/showtime/package.nix index 64613e6b3ac0..8e800045389c 100644 --- a/pkgs/by-name/sh/showtime/package.nix +++ b/pkgs/by-name/sh/showtime/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { pname = "showtime"; - version = "47.0"; + version = "48.0"; pyproject = false; src = fetchFromGitLab { @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { owner = "Incubator"; repo = "showtime"; rev = "refs/tags/${version}"; - hash = "sha256-Bnz+LFyvwSjkrbePmoVZZqy2pNLqiyJTsZsSuUyDy+E="; + hash = "sha256-w6ERJNBw+YgPHfm24KKYFS6T4EKEguHOeron0ofLxIg="; }; strictDeps = true; From 4dc483380789b60a8d8fee69ecce340a47091829 Mon Sep 17 00:00:00 2001 From: William Edwards Date: Mon, 17 Mar 2025 22:47:41 -0700 Subject: [PATCH 058/160] opengamepadui: 0.35.8 -> 0.37.0 --- pkgs/by-name/op/opengamepadui/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix index ca22d434ae0a..155f3342bed4 100644 --- a/pkgs/by-name/op/opengamepadui/package.nix +++ b/pkgs/by-name/op/opengamepadui/package.nix @@ -5,7 +5,7 @@ dbus, fetchFromGitHub, gamescope, - godot_4_3, + godot_4_4, hwdata, lib, libGL, @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "opengamepadui"; - version = "0.35.8"; + version = "0.37.0"; buildType = if withDebug then "debug" else "release"; @@ -32,21 +32,21 @@ stdenv.mkDerivation (finalAttrs: { owner = "ShadowBlip"; repo = "OpenGamepadUI"; tag = "v${finalAttrs.version}"; - hash = "sha256-vMb08Wqjt5j6IgMnXuZr6MGNk1CprVn2GTNDdOxnFG0="; + hash = "sha256-kzGFyzOu4Pkj+a7kExFwxFu35qfoLoWz3uqd8COUTNA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; sourceRoot = "source/${finalAttrs.cargoRoot}"; - hash = "sha256-sTzMewIfKHbmVhSPZgUIzFFz1ahK+PMoQ5oB4GEt8nY="; + hash = "sha256-T79G2bShJuFRfaCqG3IDHqW0s68yAdGyv58kdDYg6kg="; }; cargoRoot = "extensions"; nativeBuildInputs = [ autoPatchelfHook cargo - godot_4_3 - godot_4_3.export-templates-bin + godot_4_4 + godot_4_4.export-templates-bin pkg-config rustPlatform.cargoSetupHook ]; @@ -75,13 +75,13 @@ stdenv.mkDerivation (finalAttrs: { env = let - versionAndRelease = lib.splitString "-" godot_4_3.version; + versionAndRelease = lib.splitString "-" godot_4_4.version; in { - GODOT = lib.getExe godot_4_3; + GODOT = lib.getExe godot_4_4; GODOT_VERSION = lib.elemAt versionAndRelease 0; GODOT_RELEASE = lib.elemAt versionAndRelease 1; - EXPORT_TEMPLATE = "${godot_4_3.export-templates-bin}"; + EXPORT_TEMPLATE = "${godot_4_4.export-templates-bin}"; BUILD_TYPE = "${finalAttrs.buildType}"; }; @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { # Godot looks for export templates in HOME export HOME=$(mktemp -d) mkdir -p $HOME/.local/share/godot/export_templates - ln -s "${godot_4_3.export-templates-bin}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE" + ln -s "${godot_4_4.export-templates-bin}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE" ''; postInstall = '' From 5d899ccf1686316a1d6e7d22aa1f6d080c469003 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 15 Mar 2025 20:35:04 +0100 Subject: [PATCH 059/160] dolphin-emu-primehack: cleanup, modernize --- .../do/dolphin-emu-primehack/package.nix | 167 ++++++++++-------- 1 file changed, 97 insertions(+), 70 deletions(-) diff --git a/pkgs/by-name/do/dolphin-emu-primehack/package.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix index 54735ae7dbbe..fc70ffade761 100644 --- a/pkgs/by-name/do/dolphin-emu-primehack/package.nix +++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix @@ -2,111 +2,124 @@ lib, stdenv, fetchFromGitHub, + + # nativeBuildInputs pkg-config, cmake, qt6, - bluez, + + # buildInputs + curl, + enet, ffmpeg, - libao, - libGLU, - libGL, - pcre, + fmt, gettext, - libXrandr, - libusb1, - libpthreadstubs, - libXext, - libXxf86vm, - libXinerama, + libGL, + libGLU, libSM, libXdmcp, - readline, - openal, - udev, - libevdev, - portaudio, - curl, - alsa-lib, - miniupnpc, - enet, - mbedtls_2, - soundtouch, - sfml, - fmt, - xz, - vulkan-loader, + libXext, + libXinerama, + libXrandr, + libXxf86vm, + libao, + libpthreadstubs, libpulseaudio, + libusb1, + mbedtls_2, + miniupnpc, + openal, + pcre, + portaudio, + readline, + sfml, + soundtouch, + xz, + # linux-only + alsa-lib, + bluez, + libevdev, + udev, + vulkan-loader, # - Inputs used for Darwin libpng, hidapi, + + # passthru + testers, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dolphin-emu-primehack"; version = "1.0.7a"; src = fetchFromGitHub { owner = "shiiion"; repo = "dolphin"; - rev = version; - hash = "sha256-vuTSXQHnR4HxAGGiPg5tUzfiXROU3+E9kyjH+T6zVmc="; + tag = finalAttrs.version; fetchSubmodules = true; + hash = "sha256-vuTSXQHnR4HxAGGiPg5tUzfiXROU3+E9kyjH+T6zVmc="; }; - nativeBuildInputs = [ - pkg-config - cmake - ] ++ lib.optional stdenv.hostPlatform.isLinux qt6.wrapQtAppsHook; + nativeBuildInputs = + [ + pkg-config + cmake + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + qt6.wrapQtAppsHook + ]; buildInputs = [ curl + enet ffmpeg - libao - libGLU - libGL - pcre + fmt gettext + hidapi + libGL + libGLU + libSM + libXdmcp + libXext + libXinerama + libXrandr + libXxf86vm + libao + libpng libpthreadstubs libpulseaudio - libXrandr - libXext - libXxf86vm - libXinerama - libSM - readline - openal - libXdmcp - portaudio libusb1 - libpng - hidapi - miniupnpc - enet mbedtls_2 - soundtouch - sfml - fmt - xz + miniupnpc + openal + pcre + portaudio qt6.qtbase qt6.qtsvg + readline + sfml + soundtouch + xz ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - bluez - udev - libevdev alsa-lib + bluez + libevdev + udev vulkan-loader ]; cmakeFlags = [ - "-DUSE_SHARED_ENET=ON" - "-DENABLE_LTO=ON" + (lib.cmakeBool "USE_SHARED_ENET" true) + (lib.cmakeBool "ENABLE_LTO" true) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DOSX_USE_DEFAULT_SEARCH_PATH=True" + (lib.cmakeBool "OSX_USE_DEFAULT_SEARCH_PATH" true) ]; qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ @@ -119,11 +132,13 @@ stdenv.mkDerivation rec { # - Allow Dolphin to use nix-provided libraries instead of building them postPatch = '' - substituteInPlace CMakeLists.txt --replace 'DISTRIBUTOR "None"' 'DISTRIBUTOR "NixOS"' + substituteInPlace CMakeLists.txt \ + --replace-fail 'DISTRIBUTOR "None"' 'DISTRIBUTOR "NixOS"' '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace CMakeLists.txt --replace 'if(NOT APPLE)' 'if(true)' - substituteInPlace CMakeLists.txt --replace 'if(LIBUSB_FOUND AND NOT APPLE)' 'if(LIBUSB_FOUND)' + substituteInPlace CMakeLists.txt \ + --replace-fail 'if(NOT APPLE)' 'if(true)' \ + --replace-fail 'if(LIBUSB_FOUND AND NOT APPLE)' 'if(LIBUSB_FOUND)' ''; postInstall = @@ -132,19 +147,31 @@ stdenv.mkDerivation rec { mv $out/bin/dolphin-emu-nogui $out/bin/dolphin-emu-primehack-nogui mv $out/share/applications/dolphin-emu.desktop $out/share/applications/dolphin-emu-primehack.desktop mv $out/share/icons/hicolor/256x256/apps/dolphin-emu.png $out/share/icons/hicolor/256x256/apps/dolphin-emu-primehack.png - substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop --replace 'dolphin-emu' 'dolphin-emu-primehack' - substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop --replace 'Dolphin Emulator' 'PrimeHack' + substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop \ + --replace-fail 'dolphin-emu' 'dolphin-emu-primehack' \ + --replace-fail 'Dolphin Emulator' 'PrimeHack' '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules ''; - meta = with lib; { + passthru = { + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "dolphin-emu-primehack-nogui --version"; + version = "v${finalAttrs.version}"; + }; + }; + updateScript = nix-update-script { }; + }; + + meta = { homepage = "https://github.com/shiiion/dolphin"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ Madouura ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ Madouura ]; broken = stdenv.hostPlatform.isDarwin; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +}) From 5fe07e65806091015aeecbb576f8234d01de0b7d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 15 Mar 2025 20:36:16 +0100 Subject: [PATCH 060/160] dolphin-emu-primehack: do not add darwin-only dependencies when building for linux --- pkgs/by-name/do/dolphin-emu-primehack/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/do/dolphin-emu-primehack/package.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix index fc70ffade761..cddbe407e301 100644 --- a/pkgs/by-name/do/dolphin-emu-primehack/package.nix +++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix @@ -41,10 +41,9 @@ libevdev, udev, vulkan-loader, - - # - Inputs used for Darwin - libpng, + # darwin-only hidapi, + libpng, # passthru testers, @@ -79,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg fmt gettext - hidapi libGL libGLU libSM @@ -89,7 +87,6 @@ stdenv.mkDerivation (finalAttrs: { libXrandr libXxf86vm libao - libpng libpthreadstubs libpulseaudio libusb1 @@ -111,6 +108,10 @@ stdenv.mkDerivation (finalAttrs: { libevdev udev vulkan-loader + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + hidapi + libpng ]; cmakeFlags = From 2510744152dc8294d248b01c099cdc585bef266b Mon Sep 17 00:00:00 2001 From: leiserfg Date: Tue, 18 Mar 2025 09:19:30 +0100 Subject: [PATCH 061/160] kitty: 0.40.0->0.40.1 --- pkgs/by-name/ki/kitty/package.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index 95a3144df619..fd8674f00f4c 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -56,21 +56,21 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.40.0"; + version = "0.40.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; tag = "v${version}"; - hash = "sha256-c+u+lMuokDR8kWM0an3jFPC/qoK2RZTKqHZtfEnqtnM="; + hash = "sha256-ta9MTbSkIkowkd5zBUbtauFNGVRDgxof1SSQXuEgFTQ="; }; goModules = (buildGo123Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-gBEzW2k1HDDmg1P1t6u90Lf1lLe1IKGpF2T9iCA31qs="; + vendorHash = "sha256-wr5R2X+lV8vVVWsDYLLSaz7HRNOB7Zzk/a7knsdDlXs="; }).goModules; buildInputs = @@ -159,18 +159,6 @@ buildPythonApplication rec { # Skip `test_ssh_bootstrap_with_different_launchers` when launcher is `zsh` since it causes: # OSError: master_fd is in error condition ./disable-test_ssh_bootstrap_with_different_launchers.patch - - # Remove after 0.40.1 - (fetchpatch { - url = "https://github.com/kovidgoyal/kitty/commit/6171ca6.patch"; - hash = "sha256-OBB0YcgEYgw3Jcg+Dgus6rwQ4gGL6GMr6pd7m9CGq9k="; - }) - - (fetchpatch { - url = "https://github.com/kovidgoyal/kitty/commit/8cbdd003e2.patch"; - hash = "sha256-pKIJIqIdPfB4kQ6FtpYDumpgjJkMxoLT8fKzfgWYJnw="; - }) - ]; hardeningDisable = [ From 06bbe4080aafeb1021c472ea9459d284f322a3a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Tue, 18 Mar 2025 11:09:39 +0100 Subject: [PATCH 062/160] mago: 0.10.0 -> 0.20.2 Diff: https://github.com/carthage-software/mago/compare/refs/tags/0.10.0...0.20.2 Changelog: https://github.com/carthage-software/mago/releases/tag/0.20.2 --- pkgs/by-name/ma/mago/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index 691fa58d9964..d4003bc7914f 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "mago"; - version = "0.10.0"; + version = "0.20.2"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = version; - hash = "sha256-NYAlLJsKI+twrlryVumjsOnY3xvEeLTO/rAFTZtE+KU="; + hash = "sha256-XRPP57ylTLodOCzRTLO1IXLq9Yuk/vkDovSlMcushy0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0AnJIrA15WC3LPiokwuX9w9riaaL5s2vqwhj4XRa6LM="; + cargoHash = "sha256-Mlxs0ApYOOHNYEt2AWuOixLqBJrJ/++Gy+EFGsb9wKM="; env = { # Get openssl-sys to use pkg-config @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { tests.version = testers.testVersion { package = mago; command = "mago --version"; - version = "mago-cli ${version}"; + version = "mago ${version}"; }; }; From b789030964c75b15539670e3efd1da3f30c6e997 Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 18 Mar 2025 12:55:19 +0100 Subject: [PATCH 063/160] ausweisapp: 2.3.0 -> 2.3.1 https://github.com/Governikus/AusweisApp/releases/tag/2.3.1 --- pkgs/applications/misc/ausweisapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix index e97d9ec3f91a..fb94b2d1e4de 100644 --- a/pkgs/applications/misc/ausweisapp/default.nix +++ b/pkgs/applications/misc/ausweisapp/default.nix @@ -16,13 +16,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ausweisapp"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = finalAttrs.version; - hash = "sha256-/X+S91EA7jrjSYb/jafmRhbbZJUQyg1DoTkzd4ZRjWY="; + hash = "sha256-1G9H+1YBoIgSE8GO8UuUaG9gbVtY+gCp0oPNSNw0oO8="; }; nativeBuildInputs = [ From 7b5166cd0c9681e10c3782663b04511fc4264e40 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 18 Mar 2025 11:58:00 +0000 Subject: [PATCH 064/160] v2rayn: 7.10.0 -> 7.10.5 --- pkgs/by-name/v2/v2rayn/deps.json | 72 +++++++++++++++--------------- pkgs/by-name/v2/v2rayn/package.nix | 4 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json index 65f3fc9b17e5..bfb4fe2f56f2 100644 --- a/pkgs/by-name/v2/v2rayn/deps.json +++ b/pkgs/by-name/v2/v2rayn/deps.json @@ -11,8 +11,8 @@ }, { "pname": "Avalonia", - "version": "11.2.4", - "hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4=" + "version": "11.2.5", + "hash": "sha256-DGTMzInnfvJUJWu2SXiRBercxxe1/paQkSlBHMahp4g=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -31,38 +31,38 @@ }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.4", - "hash": "sha256-21Wfb4p0dCevw8Iu/Fchngt1teAnBaxEWgiUpFkerTo=" + "version": "11.2.5", + "hash": "sha256-gWGIqXrac0fOnmGbovcFWv5Uj14hOyC+n0l45N7owMg=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.4", - "hash": "sha256-fqQBKzHcL0CwuOQ90Gp+UUZZP9OQ9U6H41bvikxQJpo=" + "version": "11.2.5", + "hash": "sha256-eGKc+UnsO5nNiUd7+n3CQW6vIWq2qpazYvYXrVTQY7s=" }, { "pname": "Avalonia.Desktop", - "version": "11.2.4", - "hash": "sha256-WKTOx7RNSb0fOMg5Za4j+u9DwKXDqVzHwQCEXSm7TFo=" + "version": "11.2.5", + "hash": "sha256-rDJ1NJM3tEqB7sRszj0AfplwkkvtE3Hvn7acrIsq+yw=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.2.4", - "hash": "sha256-MUSfRXeJ1bstO2rTqWWCQyVq2EpjM5b5bxe0KxVAEU4=" + "version": "11.2.5", + "hash": "sha256-WsAMBmNfUKMB2II3AfM8A0klfJR/vgEtRUTGpgC6F3A=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.4", - "hash": "sha256-lw8YFXR/pn0awFvFW+OhjZ2LbHonL6zwqLIz+pQp+Sk=" + "version": "11.2.5", + "hash": "sha256-rLzsxUQS1LLLcLWkDR8SLLwLY53vUMqgiKoDWM6PjtM=" }, { "pname": "Avalonia.Native", - "version": "11.2.4", - "hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM=" + "version": "11.2.5", + "hash": "sha256-XQQgcfbRRHPzH432M1KzkSEtLQof40yCt+KIrQREBY0=" }, { "pname": "Avalonia.ReactiveUI", - "version": "11.2.4", - "hash": "sha256-LqwLUDCIbJowol6BNTTsK7a7KjcLLbCM3y3KKvuHRGw=" + "version": "11.2.5", + "hash": "sha256-p3ELTiH4kYdcrUF87zZzRMsOU41Q3XBCBKRmQYWdLBs=" }, { "pname": "Avalonia.Remote.Protocol", @@ -76,33 +76,33 @@ }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.4", - "hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc=" + "version": "11.2.5", + "hash": "sha256-Mpml6U6Fl8FUvENGQxpxuw0+pOPvoWbZXV4V1bLUS9w=" }, { "pname": "Avalonia.Skia", - "version": "11.2.4", - "hash": "sha256-82UQGuCl5hN5kdA3Uz7hptpNnG1EPlSB6k/a6XPSuXI=" + "version": "11.2.5", + "hash": "sha256-su1K1RmQ+syE6ufjrzpQR1yiUa6GEtY5QPlW0GOVKnU=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.2.4", - "hash": "sha256-rnF2/bzN8AuOFlsuekOxlu+uLI7n1kIAmC36FFXMKak=" + "version": "11.2.5", + "hash": "sha256-EjQ2XA81SS91h8oGUwVxLYewm3Lp5Sa2Lmbj0c8y8BU=" }, { "pname": "Avalonia.Win32", - "version": "11.2.4", - "hash": "sha256-LJSKiLbdof8qouQhN7pY1RkMOb09IiAu/nrJFR2OybY=" + "version": "11.2.5", + "hash": "sha256-ljgJgXDxmHOUQ+p8z62mtaK4FTmYAI+c+6gL2lczD/8=" }, { "pname": "Avalonia.X11", - "version": "11.2.4", - "hash": "sha256-qty8D2/HlZz/7MiEhuagjlKlooDoW3fow5yJY5oX4Uk=" + "version": "11.2.5", + "hash": "sha256-wHEHcEvOUyIBgBtQZOIs330KajSv8DSEsJP7w4M9i4E=" }, { "pname": "CliWrap", - "version": "3.8.1", - "hash": "sha256-9XmdodZ2Is+LkuMlc/BNFiBUNWA5tDwBl9kYnReJIhU=" + "version": "3.8.2", + "hash": "sha256-sZQqu03sJL0LlnLssXVXHTen9marNbC/G15mAKjhFJU=" }, { "pname": "DialogHost.Avalonia", @@ -111,8 +111,8 @@ }, { "pname": "Downloader", - "version": "3.3.3", - "hash": "sha256-H8HJKL71qC+nHVmuhhPDEHy434/NXJNqPeitJOe856k=" + "version": "3.3.4", + "hash": "sha256-QbbWlP3IzDzPWuZcQCfqpKQZMPSMETL/+6AXlhcjVc8=" }, { "pname": "DynamicData", @@ -196,13 +196,13 @@ }, { "pname": "Semi.Avalonia", - "version": "11.2.1.4", - "hash": "sha256-X1YIonqLNySnMMope2/+O2HfpArc8AhT/gNBOI+0Ts8=" + "version": "11.2.1.5", + "hash": "sha256-xomim/K3C6F0/105KCVc054AG80Z4cQw1bycHF9MD/U=" }, { "pname": "Semi.Avalonia.DataGrid", - "version": "11.2.1.4", - "hash": "sha256-UDb+Gw8nDsuxbMlV8CJaGItfJ85k+p3XPGPuZrIl0KM=" + "version": "11.2.1.5", + "hash": "sha256-xebEht0T5hPSYhyuqbZEzHw3D7/9K920SZhnIXDrM3s=" }, { "pname": "SkiaSharp", @@ -321,8 +321,8 @@ }, { "pname": "TaskScheduler", - "version": "2.12.0", - "hash": "sha256-zkaWlCHzUrexHMtXVitbNsgZrbgoLrJ4BBrhujvZr+4=" + "version": "2.12.1", + "hash": "sha256-eM4vgA+/ukoXCX3y4Ad5WPeIPiwLLDfhh4P0ukWf4lQ=" }, { "pname": "Tmds.DBus.Protocol", diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index 42b8eda79d04..e15b100c337b 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -21,13 +21,13 @@ buildDotnetModule rec { pname = "v2rayn"; - version = "7.10.0"; + version = "7.10.5"; src = fetchFromGitHub { owner = "2dust"; repo = "v2rayN"; tag = version; - hash = "sha256-j2s88MRyKcrNbUN+Ypewk+vRbhMtFwHpBy2xbabOe1w="; + hash = "sha256-5tLO7KVHj0DXQdJg02Jxs6fgRLJSfFWPbARg9dqKcSI="; fetchSubmodules = true; }; From 8c23be07ee93256e7ca09c2e3373e9e0eec41c04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 13:00:39 +0000 Subject: [PATCH 065/160] knot-dns: 3.4.4 -> 3.4.5 --- pkgs/by-name/kn/knot-dns/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix index 14c73156648f..a0cee0a2722d 100644 --- a/pkgs/by-name/kn/knot-dns/package.nix +++ b/pkgs/by-name/kn/knot-dns/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "sha256-59nW3pfyG/M+kHvZhqQDgCXzlIea8KX9GXhyA6w7ITE="; + sha256 = "sha256-NZr3Cvr6fMqhhDmnwes1Jw/57s6B0HVq5MpxaxQzy0s="; }; outputs = [ From 72600ae5e32361ff01942c344b1dfe365de2dee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Tue, 18 Mar 2025 14:04:40 +0100 Subject: [PATCH 066/160] mqttx: 1.10.1 -> 1.11.1 --- pkgs/by-name/mq/mqttx/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mq/mqttx/package.nix b/pkgs/by-name/mq/mqttx/package.nix index 838d8aedf374..a7fdd5940e1f 100644 --- a/pkgs/by-name/mq/mqttx/package.nix +++ b/pkgs/by-name/mq/mqttx/package.nix @@ -8,7 +8,7 @@ let pname = "mqttx"; - version = "1.10.1"; + version = "1.11.1"; suffixedUrl = suffix: @@ -16,11 +16,11 @@ let sources = { "aarch64-linux" = fetchurl { url = suffixedUrl "-arm64"; - hash = "sha256-QumOqOOFXOXf0oqXWVaz0+69kHDk3HQKvNcQl8X7Fp8="; + hash = "sha256-gRR0gFHqIPXOrSytqERAi7msfrrYXm2xP84Jy+UhrKg="; }; "x86_64-linux" = fetchurl { url = suffixedUrl ""; - hash = "sha256-+TyZnx3/qraoA3rcpIDKedGyTzFvdaAE/v4pzXrB0zU="; + hash = "sha256-rqzh4whp8NaeQb98mKTu+hL3RXQBEOKgvJKwLhzu+hg="; }; }; @@ -35,6 +35,8 @@ in appimageTools.wrapType2 { inherit pname version src; + extraPkgs = pkgs: [ pkgs.xorg.libxshmfence ]; + extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/1024x1024/apps/${pname}.png @@ -43,7 +45,7 @@ appimageTools.wrapType2 { install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace-fail 'Exec=AppRun' 'Exec=${pname}' ''; meta = with lib; { From ec84d842cc6b6a3d3894098f1c5b71444fbf897e Mon Sep 17 00:00:00 2001 From: Tom Cammann Date: Tue, 18 Mar 2025 14:40:12 +0000 Subject: [PATCH 067/160] codefresh: 0.88.5 -> 0.87.3 --- pkgs/by-name/co/codefresh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codefresh/package.nix b/pkgs/by-name/co/codefresh/package.nix index cfba4df8298d..347573bd2d32 100644 --- a/pkgs/by-name/co/codefresh/package.nix +++ b/pkgs/by-name/co/codefresh/package.nix @@ -11,18 +11,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "codefresh"; - version = "0.87.3"; + version = "0.88.5"; src = fetchFromGitHub { owner = "codefresh-io"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-SUwt0oWls823EeLxT4CW+LDdsjAtSxxxKkllhMJXCtM="; + hash = "sha256-u0K3I65JDu6v4mE0EU6Rv6uJOmC6VuZbIVyreHPH9QE="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-tzsHbvoQ59MwE4TYdPweLaAv9r4V8oyTQyvdeyPCsHY="; + hash = "sha256-cMCJ/ANpHsEuO0SNtvf7zlS0HXp328oBP5aXnHSbpDI="; }; nativeBuildInputs = [ yarnConfigHook From 4cb534bc68567b28d5204f9885fdbd031ec75ef9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 15:54:40 +0000 Subject: [PATCH 068/160] libgedit-gtksourceview: 299.4.0 -> 299.5.0 --- pkgs/by-name/li/libgedit-gtksourceview/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libgedit-gtksourceview/package.nix b/pkgs/by-name/li/libgedit-gtksourceview/package.nix index 722c0d19d0a4..68a47e60bfcc 100644 --- a/pkgs/by-name/li/libgedit-gtksourceview/package.nix +++ b/pkgs/by-name/li/libgedit-gtksourceview/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgedit-gtksourceview"; - version = "299.4.0"; + version = "299.5.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "gedit"; repo = "libgedit-gtksourceview"; rev = finalAttrs.version; - hash = "sha256-befm5UIXh2aCpKN2NH0aJhCYLf9j/ug0kVDAD5xNt4k="; + hash = "sha256-3HnlYLa1Zy1GRpX5fjEoXUzfB9X6nydpVjZTzJyhvIs="; }; patches = [ From 0555e30994bf81f6f419a0cd246a22a1cdbab47d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 16:28:41 +0000 Subject: [PATCH 069/160] python312Packages.aioshelly: 13.3.0 -> 13.4.0 --- pkgs/development/python-modules/aioshelly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index d6d9fe09814c..34bd31ebded3 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "13.3.0"; + version = "13.4.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; tag = version; - hash = "sha256-kPFTY1SDysNh64XYaW873SsZKT7uGmaugitXnkpAhA0="; + hash = "sha256-sGcI8+y/l8meYmlerWC2cEhW+LMKnZpoCw4ZWG26c6g="; }; build-system = [ setuptools ]; @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to control Shelly"; homepage = "https://github.com/home-assistant-libs/aioshelly"; - changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${version}"; + changelog = "https://github.com/home-assistant-libs/aioshelly/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From b81f788e06fae958d1a1a338fca2640ab25f244d Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 16 Mar 2025 15:08:20 +0000 Subject: [PATCH 070/160] readest: 0.9.19 -> 0.9.23 --- pkgs/by-name/re/readest/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 11a89acba5c9..2e39521699a3 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { pname = "readest"; - version = "0.9.19"; + version = "0.9.23"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${version}"; - hash = "sha256-Z84vH6vEtUMly++I+2AWBGl+3NXEAyjSIVJ57DnUS54="; + hash = "sha256-MveWZ+9SSd6mPw580U8d8aP7c4rl4861VzCKHpOKiXU="; fetchSubmodules = true; }; @@ -38,14 +38,14 @@ rustPlatform.buildRustPackage rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-gHYZpUQOznFIwH0w0tyWyQYyOwNwL8aRcDthx902h+4="; + hash = "sha256-faLytJLMlWs80HZpN0TnCCEWPe9SPP9QH0bx3HLDO5o="; }; pnpmRoot = "../.."; useFetchCargoVendor = true; - cargoHash = "sha256-uAVYvyNKK0megsl3QEfN3vbuO1gJfwbOm9K0SohuGfg="; + cargoHash = "sha256-5E+3Hpa6hiOORtZ5ykrXVOPucbppwO5KVVS1mb9mVXY="; cargoRoot = "../.."; From 777e7f3a7967d20c531a614c5a0da19c896f6218 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 18 Mar 2025 12:20:56 -0500 Subject: [PATCH 071/160] metasploit: 6.4.43 -> 6.4.53 Format nix scripts with nixfmt 'pkgs/tools/security/metasploit/gemset.nix' 'pkgs/tools/security/metasploit/shell.nix' --- pkgs/tools/security/metasploit/Gemfile | 4 +- pkgs/tools/security/metasploit/Gemfile.lock | 21 ++++++-- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 60 +++++++++++++++++++-- pkgs/tools/security/metasploit/shell.nix | 14 +++-- 5 files changed, 86 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 4e73e39a34e5..edb38fa4e1b5 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,6 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.43" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.53" + +gem "syslog", "~> 0.3.0" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 0360b87c4db2..c04ba2f51c90 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 726e819f87e3022dc90232087bf30edb0d149ba5 - ref: refs/tags/6.4.43 + revision: ce6990ff84c944186dfa104b3aa1edd98962b468 + ref: refs/tags/6.4.53 specs: - metasploit-framework (6.4.43) + metasploit-framework (6.4.53) aarch64 abbrev actionpack (~> 7.0.0) @@ -17,10 +17,12 @@ GIT base64 bcrypt bcrypt_pbkdf + benchmark bigdecimal bootsnap bson chunky_png + concurrent-ruby (= 1.3.4) csv dnsruby drb @@ -33,6 +35,7 @@ GIT faraday-retry faye-websocket ffi (< 1.17.0) + fiddle filesize getoptlong hrr_rb_ssh-ed25519 @@ -62,6 +65,7 @@ GIT octokit (~> 4.0) openssl-ccm openvas-omp + ostruct packetfu patch_finder pcaprub @@ -69,7 +73,7 @@ GIT pg puma railties - rasn1 (= 0.13.0) + rasn1 (= 0.14.0) rb-readline recog redcarpet @@ -179,6 +183,7 @@ GEM base64 (0.2.0) bcrypt (3.1.20) bcrypt_pbkdf (1.1.1) + benchmark (0.4.0) bigdecimal (3.1.8) bindata (2.4.15) bootsnap (1.18.4) @@ -223,6 +228,7 @@ GEM eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) ffi (1.16.3) + fiddle (1.1.6) filesize (0.2.0) getoptlong (0.2.1) gssapi (1.3.1) @@ -249,6 +255,7 @@ GEM rkelly-remix json (2.7.5) little-plugger (1.1.4) + logger (1.6.6) logging (2.4.0) little-plugger (~> 1.1) multi_json (~> 1.14) @@ -322,6 +329,7 @@ GEM openssl-ccm (1.2.3) openssl-cmac (2.0.2) openvas-omp (0.0.4) + ostruct (0.6.1) packetfu (2.0.0) pcaprub (~> 0.13.1) patch_finder (1.0.2) @@ -358,7 +366,7 @@ GEM thor (~> 1.0) zeitwerk (~> 2.5) rake (13.2.1) - rasn1 (0.13.0) + rasn1 (0.14.0) strptime (~> 0.2.5) rb-readline (0.5.5) recog (3.1.11) @@ -443,6 +451,8 @@ GEM sshkey (3.0.0) strptime (0.2.5) swagger-blocks (3.0.0) + syslog (0.3.0) + logger thin (1.8.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) @@ -487,6 +497,7 @@ PLATFORMS DEPENDENCIES metasploit-framework! + syslog (~> 0.3.0) BUNDLED WITH 2.5.22 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 1406fb4aeff0..3f61d6185e32 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "metasploit-framework"; - version = "6.4.43"; + version = "6.4.53"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; tag = finalAttrs.version; - hash = "sha256-1zUt6nInDUIY97fBJa0dQ/hD4WZ1v5LXYdPQhnYKlYw="; + hash = "sha256-yHat9U8EZbUWo4j9ut6K9IPtPFm130pfSmIuhtQhFoQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index ff54d3f154f1..0d7c23000d41 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -239,6 +239,16 @@ }; version = "1.1.1"; }; + benchmark = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg"; + type = "gem"; + }; + version = "0.4.0"; + }; bigdecimal = { groups = [ "default" ]; platforms = [ ]; @@ -509,6 +519,16 @@ }; version = "1.16.3"; }; + fiddle = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1as92bp6pgkab73kj3mh5d1idjr9wykczz7r9i1pkn82wq4xks3r"; + type = "gem"; + }; + version = "1.1.6"; + }; filesize = { groups = [ "default" ]; platforms = [ ]; @@ -679,6 +699,16 @@ }; version = "1.1.4"; }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; + type = "gem"; + }; + version = "1.6.6"; + }; logging = { groups = [ "default" ]; platforms = [ ]; @@ -734,12 +764,12 @@ platforms = [ ]; source = { fetchSubmodules = false; - rev = "726e819f87e3022dc90232087bf30edb0d149ba5"; - sha256 = "134m19v8dl6kc7br5gvmcvhl7y233nnjbhdpywc44397fbm2sdfp"; + rev = "ce6990ff84c944186dfa104b3aa1edd98962b468"; + sha256 = "110n47a8cbk299glmpxmb4yfv0zlibgbmzc8lcbbar849zsssxn8"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.43"; + version = "6.4.53"; }; metasploit-model = { groups = [ "default" ]; @@ -1025,6 +1055,16 @@ }; version = "0.0.4"; }; + ostruct = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + type = "gem"; + }; + version = "0.6.1"; + }; packetfu = { groups = [ "default" ]; platforms = [ ]; @@ -1180,10 +1220,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07dvrv2s9hs2vcbr6lai8vj4vk2i3m4jf468hyvkp9k8xzjvc0fi"; + sha256 = "1rz96j4jzm02rdxrs70hj5an3kmxrfd77d4hy97b80fasj049992"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.0"; }; rb-readline = { groups = [ "default" ]; @@ -1565,6 +1605,16 @@ }; version = "3.0.0"; }; + syslog = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "023lbh48fcn72gwyh1x52ycs1wx1bnhdajmv0qvkidmdsmxnxzjd"; + type = "gem"; + }; + version = "0.3.0"; + }; thin = { groups = [ "default" ]; platforms = [ ]; diff --git a/pkgs/tools/security/metasploit/shell.nix b/pkgs/tools/security/metasploit/shell.nix index 407620581539..f5169e2bb02d 100644 --- a/pkgs/tools/security/metasploit/shell.nix +++ b/pkgs/tools/security/metasploit/shell.nix @@ -1,10 +1,11 @@ -# Env to update Gemfile.lock / gemset.nix { pkgs ? import ../../../.. { }, }: -pkgs.stdenv.mkDerivation { - name = "env"; - nativeBuildInputs = [ pkgs.pkg-config ]; +pkgs.mkShell { + nativeBuildInputs = [ + pkgs.pkg-config + pkgs.libffi # libffi as native input + ]; buildInputs = with pkgs; [ bundix git @@ -16,4 +17,9 @@ pkgs.stdenv.mkDerivation { ruby.devEnv sqlite ]; + # Ensure that pkg-config finds libffi + shellHook = '' + export PKG_CONFIG_PATH="${pkgs.libffi.out}/lib/pkgconfig:$PKG_CONFIG_PATH" + echo "PKG_CONFIG_PATH set to: $PKG_CONFIG_PATH" + ''; } From 48a407177a754ccf4da3e230ac76bc41aabbefac Mon Sep 17 00:00:00 2001 From: "Shahar \"Dawn\" Or" Date: Tue, 18 Mar 2025 20:32:43 +0000 Subject: [PATCH 072/160] nixos: add simple vm-variant test --- nixos/tests/all-tests.nix | 1 + nixos/tests/vm-variant.nix | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 nixos/tests/vm-variant.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 83bd0c45c6f7..86a350bb5744 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1279,6 +1279,7 @@ in { victoriametrics = handleTest ./victoriametrics {}; vikunja = handleTest ./vikunja.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; + vm-variant = handleTest ./vm-variant.nix {}; vscode-remote-ssh = handleTestOn ["x86_64-linux"] ./vscode-remote-ssh.nix {}; vscodium = discoverTests (import ./vscodium.nix); vsftpd = handleTest ./vsftpd.nix {}; diff --git a/nixos/tests/vm-variant.nix b/nixos/tests/vm-variant.nix new file mode 100644 index 000000000000..cc95a3e6ed69 --- /dev/null +++ b/nixos/tests/vm-variant.nix @@ -0,0 +1,31 @@ +{ + pkgs, + ... +}: +let + evalConfig = import ../lib/eval-config.nix; + + nixos = evalConfig { + modules = [ + { + system.stateVersion = "25.05"; + fileSystems."/".device = "/dev/null"; + boot.loader.grub.device = "nodev"; + nixpkgs.hostPlatform = pkgs.system; + virtualisation.vmVariant.networking.hostName = "vm"; + virtualisation.vmVariantWithBootLoader.networking.hostName = "vm-w-bl"; + } + ]; + }; +in +assert nixos.config.virtualisation.vmVariant.networking.hostName == "vm"; +assert nixos.config.virtualisation.vmVariantWithBootLoader.networking.hostName == "vm-w-bl"; +assert nixos.config.networking.hostName == "nixos"; +pkgs.symlinkJoin { + name = "nixos-test-vm-variant-drvs"; + paths = with nixos.config.system.build; [ + toplevel + vm + vmWithBootLoader + ]; +} From 7e41da72a0aa39c2dc86071ea695fb027fc9c58d Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Tue, 11 Mar 2025 00:24:05 +0100 Subject: [PATCH 073/160] milu: modernize --- pkgs/by-name/mi/milu/package.nix | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/mi/milu/package.nix b/pkgs/by-name/mi/milu/package.nix index 0bbf71a24223..c77fd35ad05b 100644 --- a/pkgs/by-name/mi/milu/package.nix +++ b/pkgs/by-name/mi/milu/package.nix @@ -5,6 +5,7 @@ unzip, pkg-config, glib, + llvm, llvmPackages, }: @@ -13,38 +14,44 @@ stdenv.mkDerivation { version = "2016-05-09"; src = fetchFromGitHub { - sha256 = "14cglw04cliwlpvw7qrs6rfm5sv6qa558d7iby5ng3wdjcwx43nk"; - rev = "b5f2521859c0319d321ad3c1ad793b826ab5f6e1"; - repo = "Milu"; owner = "yuejia"; + repo = "Milu"; + rev = "b5f2521859c0319d321ad3c1ad793b826ab5f6e1"; + hash = "sha256-0w7SOZONj2eLX/E0VIrCZutSXTY648P3pTxSRgCnj5E="; }; hardeningDisable = [ "format" ]; preConfigure = '' - sed -i 's#/usr/bin/##g' Makefile - ''; - - installPhase = '' - mkdir -p $out/bin - cp bin/milu $out/bin + substituteInPlace Makefile \ + --replace-fail /usr/bin/ "" \ + --replace-fail bin/milu $out/bin/milu ''; nativeBuildInputs = [ pkg-config unzip ]; + buildInputs = [ glib + llvm.dev llvmPackages.libclang ]; + preBuild = '' + mkdir -p $out/bin + ''; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-incompatible-pointer-types" "-Wno-implicit-function-declaration" "-Wno-error=int-conversion" ]; + # `make all` already installs the binaries + dontInstall = true; + meta = { description = "Higher Order Mutation Testing Tool for C and C++ programs"; homepage = "https://github.com/yuejia/Milu"; From 2c6de4dd7620c203e2c50066beb4e86fd271d094 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 23:25:31 +0000 Subject: [PATCH 074/160] vale: 3.9.6 -> 3.10.0 --- pkgs/by-name/va/vale/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix index fa2f8de31a83..a3dd78ea4c21 100644 --- a/pkgs/by-name/va/vale/package.nix +++ b/pkgs/by-name/va/vale/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { pname = "vale"; - version = "3.9.6"; + version = "3.10.0"; subPackages = [ "cmd/vale" ]; @@ -19,10 +19,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-KerHI0+0oHwKrAbE5JIi50+L20It9ubhhIaTJMKnh3I="; + hash = "sha256-aZ+ihq4ft6HpKBZu7idq0m298WSxBubuEsIPNLvu1RU="; }; - vendorHash = "sha256-ivHOUkX9a4mRsw/ruYr3CzVbAovYMGQI+ExmaB+lP5E="; + vendorHash = "sha256-Zhhp/qbwGTQEZ28S+p7GJodwQcnkFNqNU7WCZKdeoz0="; ldflags = [ "-s" From 38449d478dcaa22de460884368ef09d23a8e78ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 23:30:45 +0000 Subject: [PATCH 075/160] tidal-hifi: 5.17.0 -> 5.18.0 --- pkgs/by-name/ti/tidal-hifi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix index 7165e3249c93..d9584664bdbb 100644 --- a/pkgs/by-name/ti/tidal-hifi/package.nix +++ b/pkgs/by-name/ti/tidal-hifi/package.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.17.0"; + version = "5.18.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-oM0hXimXSrV33tntV+DeYdV0WyyRqioKSm+rL+Oce6Y="; + sha256 = "sha256-R5Xw9uIptVPYEZ73TtdWarQNtn8nhAUN+zA5tnzTaCU="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook3 ]; From bedca1dad7796ea65a70db3a62b52a0d61d381cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Mar 2025 03:10:28 +0000 Subject: [PATCH 076/160] cnspec: 11.45.1 -> 11.46.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 303c5231b498..9b8d385d1d38 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.45.1"; + version = "11.46.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-vLo4ehr2QNErfJ+PQJ4CDSrUqtxMlHsYaAzsSgxoInI="; + hash = "sha256-Bf3+W2F44mTCEyMnKUSoeft4HKY4C3kYmLtuKG4SWls="; }; proxyVendor = true; - vendorHash = "sha256-gPZ8oLuHuwOqQK1RJHMYvWXnyZPenMiNEFaZzDwHsCo="; + vendorHash = "sha256-Q+CHJRroYAhgYLVemC/dcHfS03GHuUoaz/s+hrntdGQ="; subPackages = [ "apps/cnspec" ]; From 8bb19fd30864c5f17cd216f31365519a94331dc7 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 18 Mar 2025 21:43:14 -0700 Subject: [PATCH 077/160] qt6Packages: remove stdenv fully --- pkgs/kde/default.nix | 5 +---- pkgs/top-level/qt6-packages.nix | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index 76a9d19e28aa..14acfe0f2f7f 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -40,10 +40,7 @@ let ) allUrls; in ( - # This removes reference to deprecated `qt6Packages.stdenv` - # so when a KDE package asks for a stdenv, it won't trigger - # an eval warning - (lib.removeAttrs qt6Packages [ "stdenv" ]) + qt6Packages // frameworks // gear // plasma diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index fd3606df0d75..5a8823d10493 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -134,7 +134,4 @@ makeScopeWithSplicing' { xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { }; }); -} // lib.optionalAttrs config.allowAliases { - # when removing, don't forget to remove a workaround in `pkgs/kde/default.nix` - stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv; # Added for 25.05 } From d913095e15d47c2e6067d104164ec4b64902f98e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Mar 2025 06:08:50 +0000 Subject: [PATCH 078/160] latexminted: 0.4.0 -> 0.5.0 --- pkgs/by-name/la/latexminted/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/latexminted/package.nix b/pkgs/by-name/la/latexminted/package.nix index ff6521d1c4f9..850921ca5461 100644 --- a/pkgs/by-name/la/latexminted/package.nix +++ b/pkgs/by-name/la/latexminted/package.nix @@ -8,12 +8,12 @@ python3Packages.buildPythonApplication rec { pname = "latexminted"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-JI44VGAuSDDUBm7hH6huYdzXeMU2q1ZCixwJNTxBHHo="; + hash = "sha256-sQiIVAmqZBSyryBIvafsVTUVuXbfJJfpNwxD8slGJQA="; }; build-system = with python3Packages; [ From 42a40bff4d4230802912d23125f53adb4cc7a4e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Mar 2025 06:18:08 +0000 Subject: [PATCH 079/160] siyuan: 3.1.24 -> 3.1.25 --- pkgs/by-name/si/siyuan/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 101f6dbcd688..f653c61f20a0 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -35,20 +35,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.1.24"; + version = "3.1.25"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-BrFyMaxACkdjQy151vIYiJ9WotogEbEKWnFXNhyqKw4="; + hash = "sha256-ZLhLuRj5gdqca9Sbty7BEUBB/+8SgPYhnhoSOR5j4YE="; }; kernel = buildGo123Module { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-2ryd+GciVGmvqLNgdvoHC1tjjnFZgWO2uObj8uNwu0E="; + vendorHash = "sha256-pW52K3nvIdhpeBj2CtJwwsihcV10+FEf2mgAX61s5nM="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - hash = "sha256-yfcgSCL78hGcq/QDvqx9jMLivW06oRVzI8iqQ7gCrlQ="; + hash = "sha256-01UyupFLr82w0LmainA/7u6195Li/QoTzz/tVxXSVQE="; }; sourceRoot = "${finalAttrs.src.name}/app"; From 5e7c920f047588385cebd27d0332ddf1a88daddc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Mar 2025 06:34:13 +0000 Subject: [PATCH 080/160] pik: 0.16.0 -> 0.18.1 --- pkgs/by-name/pi/pik/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix index b3d2b6c0824a..7a478fee9259 100644 --- a/pkgs/by-name/pi/pik/package.nix +++ b/pkgs/by-name/pi/pik/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "pik"; - version = "0.16.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "jacek-kurlit"; repo = "pik"; rev = version; - hash = "sha256-L5r8ds5Avh6WqiYYg/0hVDjdp/TBGgCZgKnJoDzs7Rw="; + hash = "sha256-8+Q5j9PWiITVgZkJnX+oWbC6QnNDhFxX4jLiMDWnw/g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-d2I4RDo/U+69WwXjxHRsRNUxY2ymxzHqObR6X68xXRo="; + cargoHash = "sha256-6U0QkLgGEONGRDfrDVkxeHSJy9QnfQqn2YiZEswunTk="; passthru.tests.version = testers.testVersion { package = pik; }; From 50880d7b60d11817c40e86b31b94d7a7af9ea144 Mon Sep 17 00:00:00 2001 From: beeb <703631+beeb@users.noreply.github.com> Date: Wed, 19 Mar 2025 08:14:30 +0100 Subject: [PATCH 081/160] lintspec: 0.4.0 -> 0.4.1 --- pkgs/by-name/li/lintspec/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lintspec/package.nix b/pkgs/by-name/li/lintspec/package.nix index 852324d43a29..778c4bb874b9 100644 --- a/pkgs/by-name/li/lintspec/package.nix +++ b/pkgs/by-name/li/lintspec/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "lintspec"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "beeb"; repo = "lintspec"; tag = "v${version}"; - hash = "sha256-QLD2eGuMiNh4qlzGPJOS2VbwpNCQ8+l3qKj2hDNe1oA="; + hash = "sha256-3+E0y3WxyjvIeIaAVhjXoBnS4+THv6L4Dj4LvpRYkog="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EECQpihj+N8TmbSLtheyRo/ZtuTvyLT32D0mVPRR2FI="; + cargoHash = "sha256-TIGNToVqzRUV3/5RpbYpuMrefntft9qasCjOxmpE3lc="; meta = { description = "Blazingly fast linter for NatSpec comments in Solidity code"; From e021ee13f909e6eb7c019b5cd1acf9eac0cd0f67 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 19 Mar 2025 06:59:49 +0000 Subject: [PATCH 082/160] makeFontsCache: fix cross compilation lifting the `callPackage` to scope level ensures splicing works as expected. we still need to emulate fc-cache to produce usable cache entries though. --- .../libraries/fontconfig/make-fonts-cache.nix | 18 ++++++++++++++---- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index a1ac7d1b9859..9054cf6756ba 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -1,13 +1,20 @@ { - runCommand, - lib, + buildPackages, fontconfig, + lib, + runCommand, + stdenv, +}: +let + fontconfig' = fontconfig; +in +{ + fontconfig ? fontconfig', fontDirectories, }: runCommand "fc-cache" { - nativeBuildInputs = [ fontconfig.bin ]; preferLocalBuild = true; allowSubstitutes = false; passAsFile = [ "fontDirs" ]; @@ -29,8 +36,11 @@ runCommand "fc-cache" cat "$fontDirsPath" >> fonts.conf echo "" >> fonts.conf + # N.B.: fc-cache keys its cache entries by architecture. + # We must invoke the host `fc-cache` (not the build fontconfig) if we want + # the cache to be usable by the host. mkdir -p $out - fc-cache -sv + ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe' fontconfig "fc-cache"} -sv # This is not a cache dir in the normal sense -- it won't be automatically # recreated. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db392a2b84ea..9d8ccbae637d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8764,10 +8764,7 @@ with pkgs; makeFontsConf = callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { }; - makeFontsCache = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: - callPackage ../development/libraries/fontconfig/make-fonts-cache.nix { - inherit fontconfig fontDirectories; - }; + makeFontsCache = callPackage ../development/libraries/fontconfig/make-fonts-cache.nix { }; freenect = callPackage ../development/libraries/freenect { inherit (darwin.apple_sdk.frameworks) Cocoa GLUT; From 9435a2b422f090b25f4aa5aee53be1341626672d Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 19 Mar 2025 07:53:24 +0000 Subject: [PATCH 083/160] nixos/fonts: ship fontconfig caches even for cross-compiled hosts --- nixos/modules/config/fonts/fontconfig.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 984daec20431..89c537ff3868 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -58,7 +58,7 @@ let ${lib.concatStringsSep "\n" (map (font: "${font}") config.fonts.packages)} - ${lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' + ${lib.optionalString (pkgs.stdenv.hostPlatform.emulatorAvailable pkgs.buildPackages) '' ${cache} ${lib.optionalString (pkgs.stdenv.hostPlatform.isx86_64 && cfg.cache32Bit) '' From 86adbb1c3ea018c4e5d9efea398febd8a0437c32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Mar 2025 11:17:41 +0000 Subject: [PATCH 084/160] refine: 0.5.2 -> 0.5.5 --- pkgs/by-name/re/refine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix index 7e524c944d03..648818481f40 100644 --- a/pkgs/by-name/re/refine/package.nix +++ b/pkgs/by-name/re/refine/package.nix @@ -34,7 +34,7 @@ in python3Packages.buildPythonApplication rec { pname = "refine"; - version = "0.5.2"; + version = "0.5.5"; pyproject = false; # uses meson src = fetchFromGitLab { @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { owner = "TheEvilSkeleton"; repo = "Refine"; tag = version; - hash = "sha256-G1G9uuch7kdqWvSfCSOgb9o67da7spNKnnka47k4/rY="; + hash = "sha256-b2dNhd5UJqH/l5BOEgcOUZrhCZa8ErdBzNw5g4VjtM8="; }; nativeBuildInputs = [ From a09b0ee885ee351b40951bc002740b65c8329220 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 19 Mar 2025 09:18:05 -0500 Subject: [PATCH 085/160] showoff: Update ruby gems. showoff: Add pdfkit. --- pkgs/servers/http/showoff/Gemfile | 4 +++ pkgs/servers/http/showoff/Gemfile.lock | 32 ++++----------------- pkgs/servers/http/showoff/gemset.nix | 40 +++++++++++++++++++++++--- 3 files changed, 46 insertions(+), 30 deletions(-) diff --git a/pkgs/servers/http/showoff/Gemfile b/pkgs/servers/http/showoff/Gemfile index cfd295096bc1..f25b166e154d 100644 --- a/pkgs/servers/http/showoff/Gemfile +++ b/pkgs/servers/http/showoff/Gemfile @@ -1,2 +1,6 @@ source 'https://rubygems.org' gem 'showoff' + +gem "rexml", "~> 3.4" + +gem "pdfkit", "~> 0.8.7" diff --git a/pkgs/servers/http/showoff/Gemfile.lock b/pkgs/servers/http/showoff/Gemfile.lock index 69111fa16637..d38babcc650a 100644 --- a/pkgs/servers/http/showoff/Gemfile.lock +++ b/pkgs/servers/http/showoff/Gemfile.lock @@ -20,31 +20,16 @@ GEM concurrent-ruby (~> 1.0) iso-639 (0.3.8) csv - json (2.10.1) + json (2.10.2) mini_portile2 (2.8.8) mustermann (2.0.2) ruby2_keywords (~> 0.0.1) - nokogiri (1.18.3) + nokogiri (1.18.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.18.3-aarch64-linux-gnu) - racc (~> 1.4) - nokogiri (1.18.3-aarch64-linux-musl) - racc (~> 1.4) - nokogiri (1.18.3-arm-linux-gnu) - racc (~> 1.4) - nokogiri (1.18.3-arm-linux-musl) - racc (~> 1.4) - nokogiri (1.18.3-arm64-darwin) - racc (~> 1.4) - nokogiri (1.18.3-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.18.3-x86_64-linux-gnu) - racc (~> 1.4) - nokogiri (1.18.3-x86_64-linux-musl) - racc (~> 1.4) ostruct (0.6.1) parslet (2.0.0) + pdfkit (0.8.7.3) public_suffix (6.0.1) racc (1.8.1) rack (2.2.13) @@ -53,6 +38,7 @@ GEM rack-protection (2.2.4) rack redcarpet (3.6.1) + rexml (3.4.1) ruby-dbus (0.14.1) ruby2_keywords (0.0.5) showoff (0.20.4) @@ -86,17 +72,11 @@ GEM tilt (2.6.0) PLATFORMS - aarch64-linux-gnu - aarch64-linux-musl - arm-linux-gnu - arm-linux-musl - arm64-darwin ruby - x86_64-darwin - x86_64-linux-gnu - x86_64-linux-musl DEPENDENCIES + pdfkit (~> 0.8.7) + rexml (~> 3.4) showoff BUNDLED WITH diff --git a/pkgs/servers/http/showoff/gemset.nix b/pkgs/servers/http/showoff/gemset.nix index ded3537faf33..c3836a6716a1 100644 --- a/pkgs/servers/http/showoff/gemset.nix +++ b/pkgs/servers/http/showoff/gemset.nix @@ -55,6 +55,8 @@ "addressable" "eventmachine" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "0xkb1rc6dd3y5s7qsp4wqrri3n9gwsbvnwwv6xwgp241jxdpp4iq"; @@ -63,6 +65,8 @@ version = "0.3.8"; }; eventmachine = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; @@ -72,6 +76,8 @@ }; fidget = { dependencies = [ "ruby-dbus" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "04g2846wjlb8ms5041lv37aqs4jzsziwv58bxg7yzc61pdvi4ksb"; @@ -91,6 +97,8 @@ version = "2.22.2"; }; htmlentities = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; @@ -125,10 +133,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1p4l5ycdxfsr8b51gnvlvhq6s21vmx9z4x617003zbqv3bcqmj6x"; + sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; type = "gem"; }; - version = "2.10.1"; + version = "2.10.2"; }; mini_portile2 = { groups = [ "default" ]; @@ -160,10 +168,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0npx535cs8qc33n0lpbbwl0p9fi3a5bczn6ayqhxvknh9yqw77vb"; + sha256 = "1p1nl5gqs56wlv2gwzdj0px3dw018ywpkg14a4s23b0qjkdgi9n8"; type = "gem"; }; - version = "1.18.3"; + version = "1.18.5"; }; ostruct = { groups = [ "default" ]; @@ -185,6 +193,16 @@ }; version = "2.0.0"; }; + pdfkit = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nmp0csvkh99x1ii6pq29j8424g40lfb7k9ajfkkpzgwygpfk6fd"; + type = "gem"; + }; + version = "0.8.7.3"; + }; public_suffix = { groups = [ "default" ]; platforms = [ ]; @@ -247,7 +265,19 @@ }; version = "3.6.1"; }; + rexml = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; + type = "gem"; + }; + version = "3.4.1"; + }; ruby-dbus = { + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "16lsqdwas6ngyyvq51l7lynj5ayis17zm5hpsg5x3m3n6r5k2gv4"; @@ -313,6 +343,8 @@ "eventmachine" "thin" ]; + groups = [ "default" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; sha256 = "0as52mfw34z3ba6qjab009h2rdn0za0iwrc42kw948hbb8qzcm5m"; From ee1e417d88469317acbde0756831aa6c2ce3b693 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Tue, 18 Mar 2025 10:30:49 -0400 Subject: [PATCH 086/160] python312Packages.lap: init at 0.5.12 Co-Authored-By: Doron Behar --- .../python-modules/lap/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/lap/default.nix diff --git a/pkgs/development/python-modules/lap/default.nix b/pkgs/development/python-modules/lap/default.nix new file mode 100644 index 000000000000..eb18a1f4bdb2 --- /dev/null +++ b/pkgs/development/python-modules/lap/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + cython, + fetchPypi, + numpy, + pytestCheckHook, + python-utils, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "lap"; + version = "0.5.12"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VwtBTqeubAS9SdDsjNrB3FY0c3dVeE1E43+fZourRP0="; + }; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ cython ]; + + dependencies = [ + numpy + python-utils + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "lap" ]; + # See https://github.com/NixOS/nixpkgs/issues/255262 + preCheck = '' + cd "$out" + ''; + + meta = { + description = "Linear Assignment Problem solver (LAPJV/LAPMOD)"; + homepage = "https://github.com/gatagat/lap"; + changelog = "https://github.com/gatagat/lap/releases/tag/v${version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ + doronbehar + tebriel + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04261021c475..be5072d7403b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7317,6 +7317,8 @@ self: super: with self; { inherit (pkgs.__splicedPackages) laszip; }; + lap = callPackage ../development/python-modules/lap { }; + latex2mathml = callPackage ../development/python-modules/latex2mathml { }; latex2pydata = callPackage ../development/python-modules/latex2pydata { }; From 25b6ffb800c13891658350030cab812cbe0f531c Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Tue, 18 Mar 2025 11:04:43 -0400 Subject: [PATCH 087/160] beets-unstable: 2024-12-02 -> 2025-03-12 Co-Authored-By: Doron Behar --- pkgs/tools/audio/beets/builtin-plugins.nix | 8 ++++++++ pkgs/tools/audio/beets/common.nix | 17 ++++++----------- pkgs/tools/audio/beets/default.nix | 19 +++++++++++++++---- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix index bcb22caab20c..ece354ab29e7 100644 --- a/pkgs/tools/audio/beets/builtin-plugins.nix +++ b/pkgs/tools/audio/beets/builtin-plugins.nix @@ -7,6 +7,8 @@ mp3gain, mp3val, python3Packages, + version, + lib, ... }: { @@ -170,3 +172,9 @@ ]; zero = { }; } +# NOTE: There will be no need for this conditional once beets is updated. +// lib.optionalAttrs (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") { + _typing = { + testPaths = [ ]; + }; +} diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index ed070d8fb4d5..d06e10494b59 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -82,17 +82,6 @@ python3Packages.buildPythonApplication { pyproject = true; patches = [ - (fetchpatch { - # Already on master. TODO: remove when updating to the next release - # Issue: https://github.com/beetbox/beets/issues/5527 - # PR: https://github.com/beetbox/beets/pull/5650 - name = "fix-im-backend"; - url = "https://github.com/beetbox/beets/commit/1f938674015ee71431fe9bd97c2214f58473efd2.patch"; - hash = "sha256-koCYeiUhk1ifo6CptOSu3p7Nz0FFUeiuArTknM/tpVQ="; - excludes = [ - "docs/changelog.rst" - ]; - }) ] ++ extraPatches; build-system = [ @@ -113,6 +102,9 @@ python3Packages.buildPythonApplication { unidecode typing-extensions ] + ++ lib.optionals (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") [ + lap + ] ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins)); nativeBuildInputs = [ @@ -160,6 +152,9 @@ python3Packages.buildPythonApplication { rarfile responses ] + ++ lib.optionals (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") [ + requests-mock + ] ++ [ writableTmpDirAsHomeHook ] diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 2a4540681f6f..70d3b644d692 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -20,6 +20,17 @@ */ let extraPatches = [ + (fetchpatch { + # Already on master. TODO: remove when updating to the next release + # Issue: https://github.com/beetbox/beets/issues/5527 + # PR: https://github.com/beetbox/beets/pull/5650 + name = "fix-im-backend"; + url = "https://github.com/beetbox/beets/commit/1f938674015ee71431fe9bd97c2214f58473efd2.patch"; + hash = "sha256-koCYeiUhk1ifo6CptOSu3p7Nz0FFUeiuArTknM/tpVQ="; + excludes = [ + "docs/changelog.rst" + ]; + }) # Bash completion fix for Nix ./patches/bash-completion-always-print.patch # Remove after next release. @@ -46,13 +57,13 @@ lib.makeExtensible (self: { beets-minimal = self.beets.override { disableAllPlugins = true; }; beets-unstable = callPackage ./common.nix { - inherit python3Packages extraPatches; - version = "2.2.0-unstable-2024-12-02"; + inherit python3Packages; + version = "2.2.0-unstable-2025-03-12"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "f92c0ec8b14fbd59e58374fd123563123aef197b"; - hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM="; + rev = "670a3bcd17a46883c71cf07dd313fcd0dff4be9d"; + hash = "sha256-hSY7FhpPL4poOY1/gqk7oLNgQ7KA/MJqx50xOLIP0QA="; }; }; From 71be8884bb4a07269e30c3875621ddd3c6e449aa Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 19 Mar 2025 18:47:31 +0200 Subject: [PATCH 088/160] bluespec: Install `showrules` I don't know why this was missing but it's probably best to install all the `install-extra`. https://www.github.com/B-Lang-org/bsc/blob/65e3a87a17f6b9cf38cbb7b6ad7a4473f025c098/src/comp/Makefile#L359 --- pkgs/by-name/bl/bluespec/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix index 061b22ce330a..26d6b10f9cb4 100644 --- a/pkgs/by-name/bl/bluespec/package.nix +++ b/pkgs/by-name/bl/bluespec/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { src/comp/wrapper.sh substituteInPlace src/comp/Makefile \ - --replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) install-utils' + --replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) $(SHOWRULESEXES) install-utils install-showrules' # For darwin # ld: library not found for -ltcl8.5 From 3161260340601c8839652686b099d9db05f0d684 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Wed, 19 Mar 2025 18:19:33 +0100 Subject: [PATCH 089/160] nextcloud29: 29.0.13 -> 29.0.14 --- pkgs/servers/nextcloud/default.nix | 4 ++-- pkgs/servers/nextcloud/packages/29.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index bbe4069105ca..2cc27f223524 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -60,8 +60,8 @@ let in { nextcloud29 = generic { - version = "29.0.13"; - hash = "sha256-B3hipF/CzO/mSJA3MIYh8H3Gw2bK20/Wo1JbiRGaXb8="; + version = "29.0.14"; + hash = "sha256-mjMuAywSnD6Sp6EBkktfJnsJNvaJdJxF0DE0PIikavs="; packages = nextcloud29Packages; }; diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index 8617f1e8beb8..63e2abe676dc 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -143,7 +143,7 @@ "hash": "sha256-yfTZjAsmv2wdMNNP1Tm0fmzSIlUwRfMraNPgFEHW238=", "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.10/groupfolders-v17.0.10.tar.gz", "version": "17.0.10", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", + "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -190,9 +190,9 @@ ] }, "mail": { - "hash": "sha256-nx9trnOjtl/jd081DB8/5BjtDe6WVwcss0ynxyT/dEU=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.23/mail-v3.7.23.tar.gz", - "version": "3.7.23", + "hash": "sha256-4XLoP07M614QM2n86QvNlol3NVmrfQLBDLZCZ013Lsc=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.7.24/mail-stable3.7.tar.gz", + "version": "3.7.24", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ From 3ebcaa64e18cdf2a20ce0c8ed431e7462afee804 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Wed, 19 Mar 2025 18:19:53 +0100 Subject: [PATCH 090/160] nextcloud30: 30.0.7 -> 30.0.8 --- pkgs/servers/nextcloud/default.nix | 4 ++-- pkgs/servers/nextcloud/packages/30.json | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 2cc27f223524..a114dab4b263 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -66,8 +66,8 @@ in }; nextcloud30 = generic { - version = "30.0.7"; - hash = "sha256-3HIxyDKEBoPLcsPYognaFETVXBNVSoTrn656dfDBJQY="; + version = "30.0.8"; + hash = "sha256-uwhqES+zUW50SSHXrhSCzBvVN+39HxQFHBNI1LatWKI="; packages = nextcloud30Packages; }; diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json index 4f1bdf116b96..0346c5ea1d1a 100644 --- a/pkgs/servers/nextcloud/packages/30.json +++ b/pkgs/servers/nextcloud/packages/30.json @@ -20,9 +20,9 @@ ] }, "calendar": { - "hash": "sha256-MpWmWSyC6ZxzE8Xu+rjCxl9OhdmSydGMR+zcJyoH7uE=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.1.3/calendar-v5.1.3.tar.gz", - "version": "5.1.3", + "hash": "sha256-mAH/A5oiPwIh6K6bb9wd55CmqMoEAaKQVVr8zFNbXE8=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.2.0/calendar-v5.2.0.tar.gz", + "version": "5.2.0", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -140,10 +140,10 @@ ] }, "groupfolders": { - "hash": "sha256-zWRg9oqEhD0SGL82LB1HxbkLt3CbcQsgrBXlCLy94h8=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.1/groupfolders-v18.1.1.tar.gz", - "version": "18.1.1", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", + "hash": "sha256-xlxc4m0xxjrI3Pi+1L63Sm4wQCjJdkHD9JPorsrI5e0=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v18.1.2/groupfolders-v18.1.2.tar.gz", + "version": "18.1.2", + "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -190,9 +190,9 @@ ] }, "mail": { - "hash": "sha256-c/inKInFwLG7MdNcJPV7NzF1QNRgKNWyC+rjnza2/K8=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.2.6/mail-stable4.2.tar.gz", - "version": "4.2.6", + "hash": "sha256-EFhjy0LcJCsNHJy//rGwM1f3UkAGLNXzC6lz6k5JstY=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.3.1/mail-v4.3.1.tar.gz", + "version": "4.3.1", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ From 1a1c801b39278e2daa319f8ca70397b6550c6947 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Wed, 19 Mar 2025 18:20:05 +0100 Subject: [PATCH 091/160] nextcloud31: 31.0.1 -> 31.0.2 --- pkgs/servers/nextcloud/default.nix | 4 ++-- pkgs/servers/nextcloud/packages/31.json | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a114dab4b263..72bdd6ba0800 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -72,8 +72,8 @@ in }; nextcloud31 = generic { - version = "31.0.1"; - hash = "sha256-ufoEWK7JS+e7KHhp+WC7yHBZLZP7w1JxYGwx5Hfk57I="; + version = "31.0.2"; + hash = "sha256-ALVyERt8K5iELZXARt5570Y8z63IoEtUAGx4bh+UwxA="; packages = nextcloud31Packages; }; diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json index 2fe69cf9d338..b2b7bcce45e2 100644 --- a/pkgs/servers/nextcloud/packages/31.json +++ b/pkgs/servers/nextcloud/packages/31.json @@ -20,9 +20,9 @@ ] }, "calendar": { - "hash": "sha256-MpWmWSyC6ZxzE8Xu+rjCxl9OhdmSydGMR+zcJyoH7uE=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.1.3/calendar-v5.1.3.tar.gz", - "version": "5.1.3", + "hash": "sha256-mAH/A5oiPwIh6K6bb9wd55CmqMoEAaKQVVr8zFNbXE8=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.2.0/calendar-v5.2.0.tar.gz", + "version": "5.2.0", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -140,10 +140,10 @@ ] }, "groupfolders": { - "hash": "sha256-xotf3sAiP1sQNHfL+2kuE04YsbV4rGfDYDyZUkteGHY=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.0.3/groupfolders-v19.0.3.tar.gz", - "version": "19.0.3", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", + "hash": "sha256-lFIXNbBqdRHEvNFu2P68IF4v0+E4rFWLdRJYWm3RM/k=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.0.4/groupfolders-v19.0.4.tar.gz", + "version": "19.0.4", + "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -190,9 +190,9 @@ ] }, "mail": { - "hash": "sha256-c/inKInFwLG7MdNcJPV7NzF1QNRgKNWyC+rjnza2/K8=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.2.6/mail-stable4.2.tar.gz", - "version": "4.2.6", + "hash": "sha256-EFhjy0LcJCsNHJy//rGwM1f3UkAGLNXzC6lz6k5JstY=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.3.1/mail-v4.3.1.tar.gz", + "version": "4.3.1", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ From aaf33fc23a6c5cb85f4faeab086dc4abc796020d Mon Sep 17 00:00:00 2001 From: tochiaha Date: Wed, 19 Mar 2025 17:55:20 +0000 Subject: [PATCH 092/160] pythonPackages.cpe: replace gpl3Only to lgpl3Only --- pkgs/development/python-modules/cpe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cpe/default.nix b/pkgs/development/python-modules/cpe/default.nix index 58b827f23eb9..15a39e964229 100644 --- a/pkgs/development/python-modules/cpe/default.nix +++ b/pkgs/development/python-modules/cpe/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { changelog = "https://github.com/nilp0inter/cpe/releases/tag/v${version}"; description = "Common platform enumeration for python"; homepage = "https://github.com/nilp0inter/cpe"; - license = lib.licenses.gpl3Only; + license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ tochiaha ]; }; } From 7b1f6393fbb100c2f253c46de699818db59f1a88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Mar 2025 18:06:24 +0000 Subject: [PATCH 093/160] windsurf: 1.4.6 -> 1.5.6 --- pkgs/by-name/wi/windsurf/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index eb32f3500c78..e18df78ee660 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.4.6", + "version": "1.5.6", "vscodeVersion": "1.94.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/724a915b3b4c73cea3d2c93fc85672d6aa3961e0/Windsurf-darwin-arm64-1.4.6.zip", - "sha256": "156d4d4d54033e15fb0edd0c8f17a30ae26c622692cfcb915fd548a1596ec103" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/164066c0badcfdea724847b1a24fd88eb96f9510/Windsurf-darwin-arm64-1.5.6.zip", + "sha256": "174fcd06dc73a760edf06105678af9b427303c8091cbe0f1454207107383076a" }, "x86_64-darwin": { - "version": "1.4.6", + "version": "1.5.6", "vscodeVersion": "1.94.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/724a915b3b4c73cea3d2c93fc85672d6aa3961e0/Windsurf-darwin-x64-1.4.6.zip", - "sha256": "f41e4ab9d79062357765064993fdf993a05358aae675fdf511996fa3fdf01e55" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/164066c0badcfdea724847b1a24fd88eb96f9510/Windsurf-darwin-x64-1.5.6.zip", + "sha256": "a3891e831ab43452f791a6856f0fd3c63535348583ae673bfcdae4466f36f8df" }, "x86_64-linux": { - "version": "1.4.6", + "version": "1.5.6", "vscodeVersion": "1.94.0", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/724a915b3b4c73cea3d2c93fc85672d6aa3961e0/Windsurf-linux-x64-1.4.6.tar.gz", - "sha256": "116e1fcefe98321764f4d6a5e36a8e16282b20d994c385fd3e3826dd9945e8f4" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/164066c0badcfdea724847b1a24fd88eb96f9510/Windsurf-linux-x64-1.5.6.tar.gz", + "sha256": "5b01ce09139d7d8932be5c297a1c71a891a299825b2d5304f3fed22367188ecb" } } From 90307ab45d2968f2734c0d0020f37b320f2805b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Mar 2025 19:40:05 +0000 Subject: [PATCH 094/160] thunderbird-bin-unwrapped: 128.8.0esr -> 128.8.1esr --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 31961c88b514..ec1af8d8f5fd 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,797 +1,797 @@ { - version = "128.8.0esr"; + version = "128.8.1esr"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/af/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/af/thunderbird-128.8.1esr.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "9588d0fe6fd2368bb0fb509364e57fc03438992da3d73928f533d9f1fe4d0023"; + sha256 = "1013fceb548167ca90b7125291eb85bca2d2e9a3ae4f414f6c7d2a6848bc1b45"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ar/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ar/thunderbird-128.8.1esr.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "9eea4ca2f14295953006e95163b9311a4d466520b46b7bef1ce9fcdc1215ab4d"; + sha256 = "a1c1ec155cdf1ca9ce1e56202da91fb7c6f30ed3f6db7ad1971ac4fdbd4bbb6b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ast/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ast/thunderbird-128.8.1esr.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "afbf4ef8c79c6f70b3c3a41caf1dc25a6531de855e3729859f06c62159e63d1a"; + sha256 = "a85e37acbbdf1c3361b35bb5ab38b49124322923836feb937a7acdbb61e16cf6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/be/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/be/thunderbird-128.8.1esr.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "7eb6f634aaa165533d023e3b948457139c32d10305c76470e7670ce4e2e94d08"; + sha256 = "3db91b4244478bc98a160b45a9d26069f35cf128a7552b3ea036c8998f28ee24"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/bg/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/bg/thunderbird-128.8.1esr.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "008ea5f4e6f045848dcef59d054bb09b354f6954536fe99885afe6070266a504"; + sha256 = "7c70e78e6e5bc46466a01921dc7341724752211a59201d07933c20d0f0343991"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/br/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/br/thunderbird-128.8.1esr.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "0a57171647f6715dd5f585cec30dfe6b02b98dc5c4ed5127357b84d4eb086b82"; + sha256 = "e3c187dbaa095b046a0797d4448c717416c457312abeef910595940638f0450e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ca/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ca/thunderbird-128.8.1esr.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "2b1cbdc07b1365ba05fd6f9562bdf93ef2e078a42e3a54ae28871e9399673ca7"; + sha256 = "dc5fb1457bff9ca89d96472d5bed05150e6968dec081f3ecf83db7fd77b672e5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/cak/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/cak/thunderbird-128.8.1esr.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "4aa28604aacdcb2af30a166bd96fba5b3e41b088bae36056bc80a4f1d0a0053c"; + sha256 = "db0cf8c9769d1f43dd10d9981837bc9eee8d561c0caa3170f76caef5e8de8cf3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/cs/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/cs/thunderbird-128.8.1esr.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6250f19ef04adfcaeac9af92745cf984c004497da887de8148b0f60bfbba3b24"; + sha256 = "ffed1d03587b43b8f91bf1ae951faec6b504f782a79ce157318858a385492d7b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/cy/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/cy/thunderbird-128.8.1esr.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "5c240616a175162ccfbb657acfd6ee8d542a5b1e3d11340e491513cb66f4daea"; + sha256 = "fc47f033c0c2978cec6bbe8b17cd5d3d6be40262c5ca99b868b0ffc35d5b8a72"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/da/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/da/thunderbird-128.8.1esr.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "f668e62471429afb72264dac9b903c74b8f457af4370307bdaaf3d1ffdc2ac1b"; + sha256 = "57f0e2016573fed49e1240a19a94c46d7707b646c0d61b9ddf5c8649d89a435a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/de/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/de/thunderbird-128.8.1esr.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c71591b9064b7aa3d983e7adfb4be5b6de5ceb5ab22dc5481ad77b8e2f56ab69"; + sha256 = "cb5267e7f41b8ccec5105e0602ddd75f912d0627416bd29c0211121aab6e4dfd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/dsb/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/dsb/thunderbird-128.8.1esr.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "9ea0d07f1f1825054a0e0297df2379dbc37e0fc81d063f787e21c6fd60935adc"; + sha256 = "c9123f5f024a150fb26e8155e405d73649f2b8f384114c6e437514a1df59856c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/el/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/el/thunderbird-128.8.1esr.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "8197597e8ca4cfc29ed18991715ac45ab6c4d189d3bdff5736f323e9599ab1e1"; + sha256 = "5bfdb2b5136cb792cd6ec027ee3b4c099172fe38e555867f954c408d689a18ff"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/en-CA/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/en-CA/thunderbird-128.8.1esr.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "366b649b46f1a6020045fa55a9191908208854dc8a37b04a37003efde55319c9"; + sha256 = "3295ccf7957a21a44987dce3af0aeedb6c3b743060eb7223740829c819a04071"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/en-GB/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/en-GB/thunderbird-128.8.1esr.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c9146a918e88758ec3681ea067adee2cc993b3c7a9118cb6e06cdbb231187a3b"; + sha256 = "4213003e05d7e25638e2064dcdd1d869e35662ad288070fd321fe2b60e254004"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/en-US/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/en-US/thunderbird-128.8.1esr.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "1a154cf1af7044817b61405a9ed2582a029c5a90a12dbd1df22b99328f789564"; + sha256 = "2df2b8fab412eb3dbe6a2f3bb0547af5fa66d2c2dbc7f78c0201bbe255fa779d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/es-AR/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/es-AR/thunderbird-128.8.1esr.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "73e21e28d213070b9eb5792ac494d77167708419388bd42eb51096e7400e57b9"; + sha256 = "f0e3980d7771b3ab3d82e352f333cb9ef182e2005b634ef904710bd74de3503f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/es-ES/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/es-ES/thunderbird-128.8.1esr.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0fe24ced84d5dea9cf847c545a5ff4399b1e81b8f58ac8c17ef7d15d91eca247"; + sha256 = "8fe833d918e46a4717ea3539200dedd1e712fa89bf9427a983eb3f4dcc8f067e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/es-MX/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/es-MX/thunderbird-128.8.1esr.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "534c94a1d5f5078292a6838d2fd9887e65464ed845ad4da4a45cb7ac8a0fb6c9"; + sha256 = "00426c67a097968ef0ef876532b1ddaecbcc4d8635dc8805e1a282cefc59ccd7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/et/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/et/thunderbird-128.8.1esr.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "f7eea1df70f2f4ec456202e281b2e0291a10b0f86bfa3491bff6fdac5b680e40"; + sha256 = "1453ef45e4a8d1bb6c74dc91150d3a4f895dd5220b4be33f428845d13417b6bc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/eu/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/eu/thunderbird-128.8.1esr.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "8d13b74989508963cd29bb01048755fcf98ade7cdd2c271a6f801b7ea82377f7"; + sha256 = "bb258a3b54aab7661bfa35be0bc2e3c9de833663dae87df64dc61465f4e4d75e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/fi/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/fi/thunderbird-128.8.1esr.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "98d387f97b69ffc2171720fb6d37b738d2fc376dda9e57fc6b39b7bbc9bbe655"; + sha256 = "9c2ea3244de9763164fb17626cb0a3f40757f86cdee76b5d63ed251fd149f59c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/fr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/fr/thunderbird-128.8.1esr.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "41ec309f7b3a9d4e2d071e68f8e4b503fcbbd554f3e312af7d7dfc93b750a1d2"; + sha256 = "aa0dc1e0adb9fc5928c4594de763becb41e8423fc3adeec5f6f27a643cd9fbfb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/fy-NL/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/fy-NL/thunderbird-128.8.1esr.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "8cfbee2cc94f11b2b53e6075688974b0233227fc83634ca5721ff9664e2eb46c"; + sha256 = "b20065b2e2cc571b02b90e85c7e61c4db76c27ed86f12efc57ddfc3f53ebee31"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ga-IE/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ga-IE/thunderbird-128.8.1esr.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "54677c9563f37ed0f56b3b8d20f6125f67ea864ef98d07dc865d47239f0002f7"; + sha256 = "c2a0f4c18c88cec7bfdef86069014cdba89ef969dbecc00605be18ba6a5c4495"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/gd/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/gd/thunderbird-128.8.1esr.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "94b4db949d642e14e9f6ec055f455f8bc8b3cbe231d6348cc359fd751002b69e"; + sha256 = "f702d1931310215a3f091f560ce34086e1864a7d2a981b6890182d1f6b817c68"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/gl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/gl/thunderbird-128.8.1esr.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ec28d6276a01ca6a1aa8b6038fa47dd2f434487a1f90eedd25ad4c80122d2cb2"; + sha256 = "ac1c1996ec521a6c59d2e55fa5af1f9a71ec1a40fa71aef1de2fa87f30400dc0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/he/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/he/thunderbird-128.8.1esr.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "2ae7a156e9eb0156176488d6181f99cc8646a4998dca30dd452bae27cb2c22dc"; + sha256 = "5bd1242155f000a9e1c3eff3ae1df0900208613f085ecff42ccbf6d2dcc8e673"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/hr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/hr/thunderbird-128.8.1esr.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7462960417715330cc164fd2a716ceb25305fb641e3e258ed6796c6508b4c394"; + sha256 = "16ae5be658966d5ba8b90dd2a970cbc9c04f5037312b283fd2b7b3b26fcd40ab"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/hsb/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/hsb/thunderbird-128.8.1esr.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2cdf6e8e1f022023c5496aaa6ef228ea40d77ead81486754bd650a22e45751af"; + sha256 = "3fd7eb3258053f88498dfb1138f157e7d0d501cb9e2815145e6a11a48dbb1b59"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/hu/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/hu/thunderbird-128.8.1esr.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "e7390e18f16b71fa10428c23fb84f50b559685598c8b0bb5dfb46628cb44e4dd"; + sha256 = "9cfb8919c62a73aa3940d2ada6bd9d43c1bff3841d1ede8b6d65ea36b9fec255"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/hy-AM/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/hy-AM/thunderbird-128.8.1esr.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "6a2d4439cbe650d9648db4783bf5a434da3077aed5244c0cd5bd9867c045744f"; + sha256 = "743d74587977da860f566b82cca1af36920f3a11e4c6f8cb6c388276e105632a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/id/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/id/thunderbird-128.8.1esr.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "a2a753d99147a3793c8f01bd3b7a02da8777c54cbec3e406451176a4f6cd7585"; + sha256 = "1b550d116c2174f478d13fba988bc070165507a61a0ed341a8fbb551cfa2777d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/is/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/is/thunderbird-128.8.1esr.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "afb66adbe8e8f5c41ec3e2482d710c0defae5a1d398611768ad7119f3b5adcc1"; + sha256 = "44f80b2b0358c18e5d5810d59aa9dca376485c12fc4c2da4786d41e979286a7f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/it/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/it/thunderbird-128.8.1esr.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "802ea9a7051008cc288c0ea7db029939524d106ef816195726889bf1ae147de2"; + sha256 = "981b59ba68471132f2529512d2f922c43e4cdc62fe1c8eff5d9e135443e1be89"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ja/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ja/thunderbird-128.8.1esr.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9b5f4529726b08c25222808fb388b47801355325b931c5b50c552efec2540154"; + sha256 = "5095d5ef27963ac2da3cb017c30dff3409ef1e8932b8faa5a8b58b9005a136ab"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ka/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ka/thunderbird-128.8.1esr.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "1d32e3d11e026719c49933a75b0c654beb02fa42fb59114285945a83a07e417c"; + sha256 = "bba448d866c26bf7c545ce72db99d72f4743e3e0b5b26e5dc234d934a75d6f60"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/kab/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/kab/thunderbird-128.8.1esr.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d6a82905ce033298b9b069cb71f9d1314b3114c78a91b432404a0a80d29666dd"; + sha256 = "6406fb5dd20ad88a71fc412f95e54d3219299830dd665680beec30c96624a95a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/kk/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/kk/thunderbird-128.8.1esr.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "5f2a79864551f5f1e9ef1598d2d654123e1506915958d8f9e0144ed186a469c3"; + sha256 = "bab3729c2efcf5642fe7db4d3ca182788a4e3e76472f03c481fb95c749047f04"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ko/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ko/thunderbird-128.8.1esr.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "17a521c722f9adaba473e24ee5127bf7afc51e6d015694a2c67ff06e7506de42"; + sha256 = "ef6120480f99b42cd2b748391e7ebb9d0242e25e9b5878ffc3c617ba10a85aab"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/lt/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/lt/thunderbird-128.8.1esr.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "0f523e80a96e3ce460992eb4ad62bc864171c5e603181e638e03d07bbdd042e8"; + sha256 = "0aab7f17137b9db634f6f8112715825488b5847e9deb6ff1fdb2618046caafe1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/lv/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/lv/thunderbird-128.8.1esr.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ddca006e3c88266da806d672f4a63e4a6a5e9fc7feee6fd7189cc86269e3e5b4"; + sha256 = "706071eaa2cce1446080d7ef4c768fcb405f439d1bc0ca4da7a3fab8f36fdac7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ms/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ms/thunderbird-128.8.1esr.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "beed3a3e60b085d2ba77b5efbdc5c96c602d5494c8e7826d33b6a8153bfc5d7d"; + sha256 = "89886f05fe1aef90349c9b7141fd22137d8558cc3d7b3dd99ff3519e74b6c795"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/nb-NO/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/nb-NO/thunderbird-128.8.1esr.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "acdd4df71cb59511d4487be975c07ec6afad2711e91e51d881f6a15f25e7d011"; + sha256 = "915fc851b73e6555d2fcefd17a0b96cd410f03014fe97f6f678d6c98f9c1926d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/nl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/nl/thunderbird-128.8.1esr.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "993a168d50dfc3525e6c5d1f3395c462a5196524618df74d096ad454804b5670"; + sha256 = "4a82daffc2bd00a66bdcfdb8aecc1e3cda51bd3b71b249a55400c4f16b5db5a4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/nn-NO/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/nn-NO/thunderbird-128.8.1esr.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "1ff1ae6d49f22cc09caf48b43297bb156aa1875e12ba2da1d2a8bb31cabaa76c"; + sha256 = "fc2a46f1ba379a379f5840964bf42f35298371b109a4fc880720c324c5ce6b48"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/pa-IN/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/pa-IN/thunderbird-128.8.1esr.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c0c37e8a27d1e8b6fe954821b3fc22ced28904224ec493f735eccf573187ca42"; + sha256 = "2968d0233af502cf1a1e82b51039208be05f11e31f1bf01a410841464fa65eb7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/pl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/pl/thunderbird-128.8.1esr.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b2b5c897d8faf2b5c64ba52891cdf8414de3e04b348727d93ad00752c9e419ec"; + sha256 = "c2acdaf2418654558f35e524daefe206320c8f4d27c388ae1322fa92f4a8cb53"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/pt-BR/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/pt-BR/thunderbird-128.8.1esr.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "0ce70dd79cb78d48999ea5161123618c333d647a5036e4e55edd48c96f7fd766"; + sha256 = "0c67de7e9501c1e497da49f9001b8b08f5dbed321e435322015a5b5c69b8c0ff"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/pt-PT/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/pt-PT/thunderbird-128.8.1esr.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "6b14610b364c3fa9181bc129c59d2342f8791ad6c05077c064db8dc3dbbdf504"; + sha256 = "09e2a9f011cdf67135bb527c5ad1c856b5f2227e411e711d16ec02cb88208981"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/rm/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/rm/thunderbird-128.8.1esr.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "966c4ff91819318a7f252406688f921c9edce8bb98117e784818a6e7e775fcb1"; + sha256 = "b5d298e135f5143cef392447754874d2e847f8e46eb914789f352fca5894d26b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ro/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ro/thunderbird-128.8.1esr.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a5faf488b80ba04bdccdbbda0602dfb640ca48fbe2e9c5a8cff53ba0c4763c00"; + sha256 = "35c67e8bc6b4b472e40dedf05034cc923198767ba0cc1e356c5badbd00edaa77"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/ru/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/ru/thunderbird-128.8.1esr.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "aa0af6116771ed02bad3e6bcab5977ebcfab1bff74f7b806caaacc4429f510e4"; + sha256 = "373307b2ff24b1e9d484e4b22a7bf185482753c986bda0e2b952fe25a882ca75"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/sk/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/sk/thunderbird-128.8.1esr.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ec92c634d954dd7eff05dbea2fab7ed118c5db88742d15fd1bcca4c4008e44a8"; + sha256 = "8267535b2778242133ba229970f49cf9a7036531fe3e2d83835e5cc13f70a7f6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/sl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/sl/thunderbird-128.8.1esr.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "367ea27becf9f044f00fbd454bbcdb8578f99e42b56c2ad73c709b183911abf8"; + sha256 = "e7091b7c2350c360e2f26e65fba645dbab48628d975e205dacb92dd9dd5c5cdf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/sq/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/sq/thunderbird-128.8.1esr.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "a649b75a0750fd3e11074023877314add6b941e25c8741bf697bbba48301a219"; + sha256 = "52ce1a83eba397ae34b09b3759183cdab32b3d40ac0751c0984f9fdd6842740b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/sr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/sr/thunderbird-128.8.1esr.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b1a12748f3f9a87f757b6b854b912768c2c9a53671b0f3d62aef8b399c6194f8"; + sha256 = "ec2dc3a96d11e0bf514f2ec1087ab05cd7513af6a64804f3655ea5adfd17226e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/sv-SE/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/sv-SE/thunderbird-128.8.1esr.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "58f2a293a2757128cc5dc0bf6299b4687cb3f728bbbd2b6ad85678702c1a7eb1"; + sha256 = "93a0b09b23e97503222db4daea393843626b151e496ba68ae04460b649fae72d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/th/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/th/thunderbird-128.8.1esr.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "411dab56cd9962a89c42e4bb10bb58dd1c7f5413b58c115f9ee74acc32c67d64"; + sha256 = "252058b29a9012a55b48757bff728ce11810ebe4e3d41cacb264aff5e18a839d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/tr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/tr/thunderbird-128.8.1esr.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "44cc10105689efd49f47cd9476fd2c579605daa2295bf336910fa2596afa19c6"; + sha256 = "00f006c00b7b585bac99ef3ad1fdcebe0d44405b793cf963ef7ea8e4cdf41253"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/uk/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/uk/thunderbird-128.8.1esr.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "3ed67c60a1ac64c84a20950c740b0a015ec1499f3b4980c0435555579933571c"; + sha256 = "21af80c8d76000967f204d9ebe7298d4501b98fe350cac0f3b6b04b2bb44d8e5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/uz/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/uz/thunderbird-128.8.1esr.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e0e064197e595478761f210f8bd951f720be9fac342776c7c4e1e510e95c8e85"; + sha256 = "d54696821cc28b860702a98b869a74e7ba5f74c00718b5bbd62912231823ca31"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/vi/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/vi/thunderbird-128.8.1esr.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "78b681c882a117338e7666dd0b483952e70a115ea281e472ff5c551feecf9b81"; + sha256 = "35545cd2fbc4a76603192c8dd93378e4a7ab65fcb292fc3625d8ef5fc7ac57fb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/zh-CN/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/zh-CN/thunderbird-128.8.1esr.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "87c62ff9f0f312cf790e8a6292076b559df52cf7b1449163d9c83da8d9eda873"; + sha256 = "8347af59e572a4dd2a3e38ee6385bdeebdfd9ca589d258d230ef2ef9f042b0c7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-x86_64/zh-TW/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-x86_64/zh-TW/thunderbird-128.8.1esr.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "dd9d9ab103fc41ef2319b0a54c34e0ec2aca8b76796d8fe36b765e1252130b47"; + sha256 = "262b3086e15bc43b91ba609b74e6f53d678bcb5edaf64d66f592508fcfe99b1d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/af/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/af/thunderbird-128.8.1esr.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "6ee7604d646e6847cb17b646c7e7c892d6afc3cd96a379ae21384b8b6c788e92"; + sha256 = "930f42ae5aa3b8f85cb801724060024729143e889e2ac59d8d37a70d962360c0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ar/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ar/thunderbird-128.8.1esr.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "0c02a13c9f0da42a23d106dc2a071b75f5db19ca3fafe5357247eddab51eae4b"; + sha256 = "c4733b184c1dbcf2e8eab86dba07770512a0a579d512b027efae0bd853a8440d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ast/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ast/thunderbird-128.8.1esr.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "9caaecb9c84f499e8828a2a6eec22d6164248d93e69a8f8607d3558d05a741d2"; + sha256 = "e92d681785cc4e7445f913cbcba0590bdc777081b15f54da3df3f0e97b9576bc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/be/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/be/thunderbird-128.8.1esr.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "328fd7af7a8d675f5058842361dc8d5e29f50d19a56658da13b25e96499469da"; + sha256 = "2e83b8a276e57b2b6cbef4815c2aaaf5bda18a7607a9cf372feb08c2b84bbded"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/bg/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/bg/thunderbird-128.8.1esr.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f04dc9f990d0e828d62786ff954c40d74bdc0922a9660fd27861d514493b032f"; + sha256 = "cac015b5f0a949af81278830ef3f31177c1488f28f1724fcd0f5af7943fc7da8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/br/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/br/thunderbird-128.8.1esr.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f356ea134619ea796051a62f7eaaaa2ac58134e286c771576de3b8fefae17b7e"; + sha256 = "3250ed40c32e88e34f8bb08cd98afa80761cf1659acbaa7d13cbea0b5f4285b0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ca/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ca/thunderbird-128.8.1esr.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1171a2b0d63ff9c9c3e3c0cd7918b5d4fa3bdaa86b3b97817a79180f6c00263d"; + sha256 = "007f19df18a04a1d132d9013df6e749fed1248d09ce66bb7514e13c393e338bf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/cak/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/cak/thunderbird-128.8.1esr.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "150ae2063d7b7675d4b2c969d973f28fc76855c114e8c8707ffff59b07d6aa33"; + sha256 = "37ca027a41d337c7f7ca933dd789850a6ee8f978754af7ae0e77c450e36735d7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/cs/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/cs/thunderbird-128.8.1esr.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1f621cdbb2f57ca97e5e16148b8f291a4de73ab19d42abf32d62ae1bc62158b5"; + sha256 = "bb31b0a0db3a2b664fa0c2d0b1471e1ea1c9921ac9ade74c011497a1aa35064b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/cy/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/cy/thunderbird-128.8.1esr.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "8c8e3d13e8963c599dd4fbb1cdbd851258ae898514750b66e93786874c90d43a"; + sha256 = "5731c82e849aeeabf1efe223f026e715a5a84938dc530c5af47a33401f0cb045"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/da/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/da/thunderbird-128.8.1esr.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5e29eb1e57542dd161fe78539998ef7ec750e83cb5152e833cc04ac38ec46770"; + sha256 = "36dbd8f9b33a82f30bfa64130a4a8eaa3fd411c0e04ffe3e8b22f1d2797756a4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/de/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/de/thunderbird-128.8.1esr.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "9ce32575c6b42942817fd7b0aa0f43a1f5950eb0e509780d71bb917e965ca3e3"; + sha256 = "d026c72e97890974f59887768419f52230306f79b70d2e1551d7582e20b6cabb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/dsb/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/dsb/thunderbird-128.8.1esr.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "e4f4a7f18e38f60b06d92e47106d00bd6589ca7d0e7b989fcc21cc4d32d1811f"; + sha256 = "4ed5855cf55679b5139d4b701fc10c8bab6c2d25dfcac876f8f2f1e22e6afd33"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/el/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/el/thunderbird-128.8.1esr.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "788cb80d20f3cd2fcb4de1f4771424fe53f6330f559d6c4046d7626407c0db84"; + sha256 = "9f6b006ced02883b7806d6338c0263afcae9da2ea61a9a95d44a08879ef66977"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/en-CA/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/en-CA/thunderbird-128.8.1esr.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "8e6d7a469722746196e3d8561bf36abfb8f6ca8cf9c5662537486672453f2609"; + sha256 = "b4ed296be204307fd6da4f48ef2f500a936d599b08535ef25c72b7be291f63dd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/en-GB/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/en-GB/thunderbird-128.8.1esr.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "27bac1ababa688a3a06eb91db015a6a9464ee1bfdaec26bb5cad80e11f71b69d"; + sha256 = "db1a929bfb0498446e1925cba740441a6b359c5dbb4d7cc8896b2aec867f89b1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/en-US/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/en-US/thunderbird-128.8.1esr.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "2907e9b6847e21ccbc554b0df0bfda274639aca519cc7e34e0ef1a0db9fa97ef"; + sha256 = "9261a06bcaa2c418333deb60ddef961894aab90409b7981b36e98a0fc18a7dba"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/es-AR/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/es-AR/thunderbird-128.8.1esr.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c5fe849c7653a5f3c8114b5dd0351f1f785a04d66afb79469d76eeb6e3028d1d"; + sha256 = "bd03068065aabd747be87f86e73c17ca93acab9efb6dcb243e587eb53a736dcc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/es-ES/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/es-ES/thunderbird-128.8.1esr.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "0a54f085c0cb01649224d278521d106300a4e6b5c787612979d2bba0811e289a"; + sha256 = "42d9656001b299d04e39061c4b1c4756e55a2fb5cc1652b77bfb755edac94ab8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/es-MX/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/es-MX/thunderbird-128.8.1esr.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b7aa1e5c2b5a9b8b70e0911dc7cb008d43a04da8cd48b1c9f54e5ec042faa38c"; + sha256 = "e0c97af5388c3d44d27275f1e3dd16265906ae81d4e1afc2ca9a329b637b7915"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/et/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/et/thunderbird-128.8.1esr.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "06c3c2934c7f716d22aa44fde42efdf2a40cbf2bb384e71b609ed4e98203b4a6"; + sha256 = "e5e2f18051fca84dd44b2c5a3778ad4969965f2cac86aa4264149edf680edbec"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/eu/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/eu/thunderbird-128.8.1esr.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d0c8e2226382568c9b7aaa2c18b9104c41706ab8d3ec6b89853ede0a77c4db7f"; + sha256 = "a22ab6539a7e9572a7fb6913e9b976d570b67ff69ce585be5132cafd8ec86a52"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/fi/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/fi/thunderbird-128.8.1esr.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "4cbe90fa120c42cc202b4faed2cb282abd8cf0eac3a95efae0f423663331488e"; + sha256 = "a0f2a030c8cce5f2c2969376813d39306a948752fe01c36b7dd81122ae3586ee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/fr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/fr/thunderbird-128.8.1esr.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "0cf4eb481d53cfa06c1c8a1f1a2e38730b076bf4e302bd01b7370e24e2480de2"; + sha256 = "f76eab20e735637746a6980ad3c99d2d35b6b5985f0b9a65c4ef467abcea3d06"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/fy-NL/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/fy-NL/thunderbird-128.8.1esr.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "a2aa822703030cb8ec722e9dfb87d66102094933a5869d6008a2a30cf8594f3d"; + sha256 = "c40cf21e2f8c0e7ea73ea23b4f63dc61c16c1d83966a2754f5b9e7a751f3413a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ga-IE/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ga-IE/thunderbird-128.8.1esr.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "4608ba885d297ac95ee07fc3b8c2ccf9755851141fef6a39c4bc7369f3a6a338"; + sha256 = "f9293a76a3fba4d952a06f689d51273876597213fdda5123c22e8c2749aef046"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/gd/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/gd/thunderbird-128.8.1esr.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "dcd93fcb4b0770cf91392eeacb1ed1e02732c628e89abc7fb1150671ed08cdc0"; + sha256 = "1bcf521d0b4d8b3f878ae8361db92ed32f55a7355eaade166ddda37d8ee2f342"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/gl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/gl/thunderbird-128.8.1esr.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "40face85eb1a4b73b38901bd0e803ebfed360e76b629f01902a8b643e430d45a"; + sha256 = "b96b2db085fc1cdd1605cbab4f812d2ae1f6cee7d313a3559af470e9239c3b5b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/he/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/he/thunderbird-128.8.1esr.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "5d85a0e842d86026204b2380760ed322a28e9288095315874a7c8870a0b5216d"; + sha256 = "4d997401092bf51594fbb85416fc0c3bc39de6f6904603ce2711937c7869b74b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/hr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/hr/thunderbird-128.8.1esr.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "35b6bdcc49fa4dd9b43cc0f3637b8a6901126ec3faa0a276dc2bbd08cf248e9b"; + sha256 = "f18606396db272a32c5eac538b13ac96268a95162262b4672d85015b0b5a4721"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/hsb/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/hsb/thunderbird-128.8.1esr.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "81c7e740bc5b1fb9b409460f8026ded7141c8fe6a07cd3eb2e1147fe6c0d367f"; + sha256 = "647baf1093bb16e9649fca57df1a5dce55edf157de7720edc36fae94cd5c9188"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/hu/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/hu/thunderbird-128.8.1esr.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e0616cc5706edb9e185e2b89a241d558b70a2563a3b224d956eea3b1eedcd393"; + sha256 = "647dc9a3a4e7bb2c40832f5ad4703d19989b1f9f368ddfe450c2244ddd8a913c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/hy-AM/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/hy-AM/thunderbird-128.8.1esr.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e745f1131e2e0959da4e912cda82f1045d95ff99d534df1041b81d027e296609"; + sha256 = "9f7c2d861ad0126821748473dd0d157eeda187517bb69fd1d4e0f8a08a6c0e73"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/id/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/id/thunderbird-128.8.1esr.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "1876cd1daf32f3e63ac7aba974b40cd24e3a273b1a0b041700a7fd7e742ec474"; + sha256 = "3d13da114658f3205186cf66e55cebcc68ff2de4da2f1c1db0701420445691c2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/is/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/is/thunderbird-128.8.1esr.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "7d6936ccd345bd1171b3fa8f3433825fe7642cdf27fd606ba0569a4fabf0b019"; + sha256 = "b177efd5a418b6d0c7552319e6051f8cc0b8d9ec5a393fa27a3bdd9b2821766b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/it/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/it/thunderbird-128.8.1esr.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "2e7f066928590934208a80d1509b92479cd59277af65782b867c4bbb5c5ee98e"; + sha256 = "a20b753d2ddfb27af61636956c18937d730237af9b367b24ff88d79840fe8383"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ja/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ja/thunderbird-128.8.1esr.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "519c5002dfe234ba9ede21d1937c603a43077ef3de0e4a41e75a7982a91aa7cc"; + sha256 = "e90bc454fa9d2d6c8edac68fe919f4ab449979a857fe51063a9109a6fbbe5b5d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ka/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ka/thunderbird-128.8.1esr.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "e5918b0bbd7be4dde5dfcd8bba4d25163afe1ae91d5179cc8338b7cb40a4ed45"; + sha256 = "82bbe2fa5a34bb4ad238b8b2c683322b7bc3d1ac3121ef4d231264196a7526be"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/kab/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/kab/thunderbird-128.8.1esr.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "9bd22a75faed090c6e277e3c125f46945df6123b4a8bd4d4b56d21e358c08f37"; + sha256 = "5a999970c668dd7a6ab87f0e180a3991a6bf8778c704a12492507e46129e3cd4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/kk/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/kk/thunderbird-128.8.1esr.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "42b1deca6cd6a432e5d8ef0c3201eaad7f07dd691a176b95b81af7b4a5ca6152"; + sha256 = "d359db37616b5daef05712caeb7ee5132d01d59ac01ff2f583e591a4f6364d32"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ko/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ko/thunderbird-128.8.1esr.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d7946d96e69d3df2caa77c987823115d0e250eb01916a56a6aaf350b2ff95329"; + sha256 = "a99a4cc4659eaadb70ab51cb1172b8e97b1bd87dec87655247a5c828cbf2f1f2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/lt/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/lt/thunderbird-128.8.1esr.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "4d2a2e8f04a2cdfbe90e38267d915e03e172a76ab1526e865d20baeb3d7f193f"; + sha256 = "078bda43f06b5e6e3027542b8dfe4e58799e96557bdf29996aab5f25f8ca40ab"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/lv/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/lv/thunderbird-128.8.1esr.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "0d6728bfb6f333689cc2ae2a881e2847579877ead88ac8778e688dcf2ffbcf3e"; + sha256 = "f15ee9402ecd9f11434f585446b3578fb2b93a0e4e5dca44826982e4b0a82d6c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ms/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ms/thunderbird-128.8.1esr.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "89fb06ff7ef59cc9f42508c0428e030b1f266c48a9a7559aa95c4b77501d761d"; + sha256 = "86004e8ce785f8fef61bf253f002fa9d7f5de04a4e7e09edd070c107888fb390"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/nb-NO/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/nb-NO/thunderbird-128.8.1esr.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "4ba60571c2ecb6f22981714994e759ceb9cb483c3dd6bc041a8cc61998b40be4"; + sha256 = "d483f4dcb1e0ead9be294f7f95b3f89669242511b87fce4a5ce4b95c70f21f99"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/nl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/nl/thunderbird-128.8.1esr.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "9de5fdf33067b827e58c84318a2190492e59c21dc2a00e69cc18f37d0a83ad84"; + sha256 = "b07a12fa9fe4f6df7e3ab079e03d812edcc617ad8ab7a359303dc8f25f613bb5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/nn-NO/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/nn-NO/thunderbird-128.8.1esr.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "44e4d3aaef8b88095de1936b613f3921525b7f519714116d8051766ea2efd033"; + sha256 = "4128292d44d973421529200a69ea702e278363090b5bcd94c6c09d4e11edfa54"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/pa-IN/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/pa-IN/thunderbird-128.8.1esr.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f77d7bc8181ef537325eb5a6f22f60c2d40e2c8dcf15b02831b57203e276edcd"; + sha256 = "c34f0f3d50ea007d82e107e4cb527890af8c3e544720b547c235d6ce0e5563f3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/pl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/pl/thunderbird-128.8.1esr.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "e948dfa022ea94d25762612e63c76e416dbe913aa1d47c5aa6cd358cc77c2ea3"; + sha256 = "fa1a049f1164b313c10d91e207a642e5c0ecb9f03fbb777753acdd7e7dd004ce"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/pt-BR/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/pt-BR/thunderbird-128.8.1esr.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "d472e41fd62b31a19af12e271fbce644a4d2d116635f3c64421858d1b51abe4a"; + sha256 = "9f7e7cf6e2efa7af246ecb98f8c24a2458ab14b31552ca978f6a7030435a2084"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/pt-PT/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/pt-PT/thunderbird-128.8.1esr.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "3fbf0a2b4434f5932f08578a3af14a49480d1930a1229edddeaa3336264ea0ad"; + sha256 = "e668083cdce68fd2ad29aa87270944e5632bf0ad1ced7e005a95abfbb523bebb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/rm/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/rm/thunderbird-128.8.1esr.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d97bcf58c214e8465a51fb564f5c1b9e1aa9f2a17ff29234fb92196e8b9ee2ee"; + sha256 = "7bfcedc109e5e2034f8647e79228e88b4375b613f41cbe8ddb45105146f64087"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ro/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ro/thunderbird-128.8.1esr.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "e8b6ca77aa53e2070246f224ce5dc29fd008d7c986b48eabdf69145470ce52b6"; + sha256 = "a7c1e99b66cff5a3e5c2ba6131f93a7b6c551fb1e75e8b97b742d3c0b82e86d0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/ru/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/ru/thunderbird-128.8.1esr.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e489b69413451f6ddbf289bde34ad48e00db84ec37ff757001821b844b5c16e1"; + sha256 = "3e851b9b7c831dcfd3fe1bce762df5ca518e85ed47a13a80220cae99c32752d2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/sk/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/sk/thunderbird-128.8.1esr.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "c1d325a06b97cc4dd62408ff32709a51f5665f509d407347e1f243a59eeed698"; + sha256 = "54d0d040a9b780a95306e7994e139292fb4cf135a0fa2c66a0bdbfb27dd5a9a1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/sl/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/sl/thunderbird-128.8.1esr.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "e4519c0f7fdf2393d0bfa15fba9948e9efaa89c1e667a2d61903392b2f044594"; + sha256 = "0398d487fbd0c5ecb57aac1510e26888577188afc28d075686aa78204b1bb02c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/sq/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/sq/thunderbird-128.8.1esr.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "66296bbe89d276e62fea05138ea93b7b7a388ad1738e70b4814b76696ff1dd65"; + sha256 = "b13870f6713eaf55661411e4aceef8079a270306be17301e49e8871a421d2d6e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/sr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/sr/thunderbird-128.8.1esr.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "c53049ce45ca361168b3370f1ee0f64fa16e8551747a86747684140028a67ca6"; + sha256 = "16ef868a87edf38215d331d018e3c25909bb6e6d9cd0ea01545590e9fb73bfb7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/sv-SE/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/sv-SE/thunderbird-128.8.1esr.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "5a537a27653c7ecf7076253e5a1b72c16e1e3f75c28a88470e29bd347ced40a7"; + sha256 = "4ef5386b75fabd2e42ca2cfceb8ef85c9278d4cd709f7878742ad4e6693e0483"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/th/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/th/thunderbird-128.8.1esr.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b4116e1f2d2aad6b7c864581921bf59055bc450673cec552f29897a3a1568d77"; + sha256 = "ea09ac54c7fdc357d11cadf51ddc555235c6d3ad1ab713b884ca4ebb9ec14b0a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/tr/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/tr/thunderbird-128.8.1esr.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "b2501fea5df377bb527c91e89361d92b289dac637617be11372d06c6d68f8f0b"; + sha256 = "5c43584fbbaf34bceff32c9d98156f109ab1c67c9e0d18c612ab90f3f3675cd5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/uk/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/uk/thunderbird-128.8.1esr.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c7dbb9ae871c807cc670d1c3e9a034865f8000f5d5dece38f98a9022f206ca54"; + sha256 = "a474ab35b1b7305fff98e512738e32cbdd50193a98c9e5c6eea1418054407218"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/uz/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/uz/thunderbird-128.8.1esr.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "8941fc3a641a0d883b43efb97480310f6772bcfe107026c39843255558c2296d"; + sha256 = "79caad981fde8c0ffa13157ef64224ce5e27aae218a15370eb7b0c686f82aba5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/vi/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/vi/thunderbird-128.8.1esr.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ca123b7c755cd8d6021d9bf658313e33a3e2cb68ecfdb872dc0acc88fa3b8dd2"; + sha256 = "225480794d385493ecc1beb84f84c8c9509d6ad306648902d03277b0cb33feb8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/zh-CN/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/zh-CN/thunderbird-128.8.1esr.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "3db69d00105d970c9cbf5daf6690f8d0325688627a9af9587b1e1a4a7680dcc8"; + sha256 = "d6ab0c6c1a3171b3efd6c4684c9b6ef593fd4ba014e9ad77dd04691006027b64"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.0esr/linux-i686/zh-TW/thunderbird-128.8.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.8.1esr/linux-i686/zh-TW/thunderbird-128.8.1esr.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "f9dd0043b71e59e34312f2dc53b19a42ecca8a1d3a223e07a73772723a3fba3d"; + sha256 = "970b4015c12d149fb598abf585c5955944840dff254b3c4110d0c834161ceda2"; } ]; } From c317d5e222882331eeeb2ea28d6a68313d2da8bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 19 Mar 2025 21:51:14 +0100 Subject: [PATCH 095/160] nixos/mobilizon: create sitemap directory Mar 19 21:35:05 mobilizon mobilizon[1324]: 21:35:05.504 [info] {"args":{},"attempt":19,"duration":130905,"error":"** (File.Error) could not write to file \"/var/lib/mobilizon/sitemap/sitemap-00001.xml\": no such file or directory","event":"job:exception","id":178203,"max_attempts":20,"meta":{},"queue":"background","queue_time":510620016,"source":"oban","state":"failure","tags":[],"worker":"Mobilizon.Service.Workers.BuildSiteMap"} --- nixos/modules/services/web-apps/mobilizon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix index 539f64ba94c6..584f6c7a04b0 100644 --- a/nixos/modules/services/web-apps/mobilizon.nix +++ b/nixos/modules/services/web-apps/mobilizon.nix @@ -398,6 +398,7 @@ in }; systemd.tmpfiles.rules = [ + "d /var/lib/mobilizon/sitemap 700 mobilizon mobilizon - -" "d /var/lib/mobilizon/uploads/exports/csv 700 mobilizon mobilizon - -" "Z /var/lib/mobilizon 700 mobilizon mobilizon - -" ]; From ff0cfa9d7bb91f9079fa53d2da554b29561aa54e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Mar 2025 22:12:56 +0000 Subject: [PATCH 096/160] turn-rs: 3.3.4 -> 3.4.0 --- pkgs/by-name/tu/turn-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix index e499661dd786..fe76e4aad375 100644 --- a/pkgs/by-name/tu/turn-rs/package.nix +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "turn-rs"; - version = "3.3.4"; + version = "3.4.0"; src = fetchFromGitHub { owner = "mycrl"; repo = "turn-rs"; tag = "v${version}"; - hash = "sha256-GAmer7uSCgHdVVvTafMfAgdvMCp/FUT/quF88VLcWgo="; + hash = "sha256-BW5dNPkf/JGrf00BI41rEoZRmqftoz+RMGiP6ECVEec="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vLx6bvhb/Xq5BzKPOEqfx1BzGeDHx+47okdcW5Pu5YM="; + cargoHash = "sha256-wnbovuxh3wc1TU8BYZEOG/8SO9bCUd0eWRC81MtAdqo="; # By default, no features are enabled # https://github.com/mycrl/turn-rs?tab=readme-ov-file#features-1 From 9c02a1e422c4be807c4cc34978e310bfbab6bd90 Mon Sep 17 00:00:00 2001 From: Jeremy Fleischman Date: Mon, 10 Mar 2025 16:58:13 -0700 Subject: [PATCH 097/160] services/cloudflare-dyndns: require that apiTokenFile be an api token Previously, this option was supposed to be a file of the form `CLOUDFLARE_API_TOKEN=...`, which has a few problems: - That's not an api token. It's an env file fit for passing to systemd's `EnvironmentFile` option. The user could typo the variable name, or intentionally/unintentionally include unrelated environment variables. - It's not how secret files usually work in NixOS. Secret files are usually just the secret, and don't leak details about how the secret is passed to the service. - This increases friction for people switching between cloudflare dyndns services, such as `services.cloudflare-dyndns` and `services.cfdyndns`, which both have a `apiToken` option, but (before this change) with different semantics. --- .../manual/release-notes/rl-2505.section.md | 2 + .../services/networking/cloudflare-dyndns.nix | 47 +++++++++++++------ 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 4e62adf97c4d..33ddeb022e95 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -227,6 +227,8 @@ - `pkgs.nextcloud28` has been removed since it's out of support upstream. +- `services.cloudflare-dyndns.apiTokenFile` now must be just your Cloudflare api token. Previously it was supposed to be a file of the form `CLOUDFLARE_API_TOKEN=...`. + - `buildGoModule` now passes environment variables via the `env` attribute. `CGO_ENABLED` should now be specified with `env.CGO_ENABLED` when passing to buildGoModule. Direct specification of `CGO_ENABLED` is now redirected by a compatibility layer with a warning, but will become an error in future releases. Go-related environment variables previously shadowed by `buildGoModule` now results in errors when specified directly. Such variables include `GOOS` and `GOARCH`. diff --git a/nixos/modules/services/networking/cloudflare-dyndns.nix b/nixos/modules/services/networking/cloudflare-dyndns.nix index 4e2684b39d43..f99935210b06 100644 --- a/nixos/modules/services/networking/cloudflare-dyndns.nix +++ b/nixos/modules/services/networking/cloudflare-dyndns.nix @@ -15,12 +15,13 @@ in package = lib.mkPackageOption pkgs "cloudflare-dyndns" { }; apiTokenFile = lib.mkOption { - type = lib.types.nullOr lib.types.str; - default = null; + type = lib.types.pathWith { + absolute = true; + inStore = false; + }; + description = '' The path to a file containing the CloudFlare API token. - - The file must have the form `CLOUDFLARE_API_TOKEN=...` ''; }; @@ -91,19 +92,35 @@ in Type = "simple"; DynamicUser = true; StateDirectory = "cloudflare-dyndns"; - EnvironmentFile = cfg.apiTokenFile; Environment = [ "XDG_CACHE_HOME=%S/cloudflare-dyndns/.cache" ]; - ExecStart = - let - args = - [ "--cache-file /var/lib/cloudflare-dyndns/ip.cache" ] - ++ (if cfg.ipv4 then [ "-4" ] else [ "-no-4" ]) - ++ (if cfg.ipv6 then [ "-6" ] else [ "-no-6" ]) - ++ lib.optional cfg.deleteMissing "--delete-missing" - ++ lib.optional cfg.proxied "--proxied"; - in - "${lib.getExe cfg.package} ${toString args}"; + LoadCredential = [ + "apiToken:${cfg.apiTokenFile}" + ]; }; + + script = + let + args = + [ "--cache-file /var/lib/cloudflare-dyndns/ip.cache" ] + ++ (if cfg.ipv4 then [ "-4" ] else [ "-no-4" ]) + ++ (if cfg.ipv6 then [ "-6" ] else [ "-no-6" ]) + ++ lib.optional cfg.deleteMissing "--delete-missing" + ++ lib.optional cfg.proxied "--proxied"; + in + '' + export CLOUDFLARE_API_TOKEN=$(< "''${CREDENTIALS_DIRECTORY}/apiToken") + + # Added 2025-03-10: `cfg.apiTokenFile` used to be passed as an + # `EnvironmentFile` to the service, which required it to be of + # the form "CLOUDFLARE_API_TOKEN=" rather than just the secret. + # If we detect this legacy usage, error out. + if [[ $CLOUDFLARE_API_TOKEN == CLOUDFLARE_API_TOKEN* ]]; then + echo "Error: your api token starts with 'CLOUDFLARE_API_TOKEN='. Remove that, and instead specify just the token." >&2 + exit 1 + fi + + exec ${lib.getExe cfg.package} ${toString args} + ''; } // lib.optionalAttrs (cfg.frequency != null) { startAt = cfg.frequency; From 67a6eb4d6c145ebcd01deeaf3d88d587c3458763 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 19 Mar 2025 19:16:25 +0100 Subject: [PATCH 098/160] python312Packages.devito: 4.8.12 -> 4.8.14 Diff: https://github.com/devitocodes/devito/compare/refs/tags/v4.8.12...v4.8.14 Changelog: https://github.com/devitocodes/devito/releases/tag/v4.8.14 --- .../python-modules/devito/default.nix | 99 ++++++++++--------- 1 file changed, 52 insertions(+), 47 deletions(-) diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 70dc31735c67..988e2a5c7c7c 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -9,17 +9,16 @@ # dependencies anytree, - cached-property, cgen, click, + cloudpickle, codepy, - distributed, llvmPackages, multidict, - nbval, + numpy, + packaging, psutil, py-cpuinfo, - scipy, sympy, # tests @@ -27,18 +26,19 @@ matplotlib, pytest-xdist, pytestCheckHook, + scipy, }: buildPythonPackage rec { pname = "devito"; - version = "4.8.12"; + version = "4.8.14"; pyproject = true; src = fetchFromGitHub { owner = "devitocodes"; repo = "devito"; tag = "v${version}"; - hash = "sha256-Eqyq96mVB5ZhPaLASesWhzjjHcXz/tAIOPP//8yGoBM="; + hash = "sha256-NM60H8Fx0pe4JEF7K8A+1i1MbxKhgab5cGcCD8wl9l8="; }; pythonRemoveDeps = [ "pip" ]; @@ -49,16 +49,15 @@ buildPythonPackage rec { dependencies = [ anytree - cached-property cgen click + cloudpickle codepy - distributed - nbval multidict + numpy + packaging psutil py-cpuinfo - scipy sympy ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; @@ -67,36 +66,45 @@ buildPythonPackage rec { matplotlib pytest-xdist pytestCheckHook + scipy ]; - pytestFlagsArray = [ "-x" ]; + pytestFlagsArray = + [ + "-x" + # Tests marked as 'parallel' require mpi and fail in the sandbox: + # FileNotFoundError: [Errno 2] No such file or directory: 'mpiexec' + "-m 'not parallel'" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # assert np.all(f.data == check) + # assert Data(False) + "--deselect tests/test_data.py::TestDataReference::test_w_data" + + # AssertionError: assert 'omp for schedule(dynamic,1)' == 'omp for coll...le(dynamic,1)' + "--deselect tests/test_dle.py::TestNestedParallelism::test_nested_cache_blocking_structure_subdims" + + # codepy.CompileError: module compilation failed + # FAILED compiler invocation + "--deselect tests/test_dle.py::TestNodeParallelism::test_dynamic_nthreads" + + # AssertionError: assert all(not i.pragmas for i in iters[2:]) + "--deselect tests/test_dle.py::TestNodeParallelism::test_incr_perfect_sparse_outer" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # IndexError: tuple index out of range + "--deselect tests/test_dle.py::TestNestedParallelism" + + # codepy.CompileError: module compilation failed + "--deselect tests/test_autotuner.py::test_nested_nthreads" + + # assert np.all(np.isclose(f0.data, check0)) + # assert Data(false) + "--deselect tests/test_interpolation.py::TestSubDomainInterpolation::test_inject_subdomain" + ]; - # I've had to disable the following tests since they fail while using nix-build, but they do pass - # outside the build. They mostly related to the usage of MPI in a sandboxed environment. disabledTests = [ - "test_assign_parallel" - "test_cache_blocking_structure_distributed" - "test_codegen_quality0" - "test_coefficients_w_xreplace" - "test_docstrings" - "test_docstrings[finite_differences.coefficients]" - "test_gs_parallel" - "test_if_halo_mpi" - "test_if_parallel" - "test_index_derivative" - "test_init_omp_env_w_mpi" - "test_loop_bounds_forward" - "test_min_max_mpi" - "test_mpi" - "test_mpi_nocomms" - "test_new_distributor" - "test_setupWOverQ" - "test_shortcuts" - "test_stability_mpi" - "test_subdomainset_mpi" - "test_subdomains_mpi" - # Download dataset from the internet "test_gs_2d_float" "test_gs_2d_int" @@ -111,6 +119,9 @@ buildPythonPackage rec { # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - codepy.CompileError: module compilation failed "test_v0" + + # AssertionError: assert(np.allclose(grad_u.data, grad_v.data, rtol=tolerance, atol=tolerance)) + "test_gradient_equivalence" ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Numerical tests @@ -123,18 +134,12 @@ buildPythonPackage rec { ]; disabledTestPaths = - [ - "tests/test_pickle.py" - "tests/test_benchmark.py" - "tests/test_mpi.py" - "tests/test_autotuner.py" - "tests/test_data.py" - "tests/test_dse.py" - "tests/test_gradient.py" - ] - ++ lib.optionals ( - (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin - ) [ "tests/test_dle.py" ]; + lib.optionals + ((stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin) + [ + # Flaky: codepy.CompileError: module compilation failed + "tests/test_dse.py" + ]; pythonImportsCheck = [ "devito" ]; From 6a9b3389607f244ce3ff5ad1152446cd6dc81a7a Mon Sep 17 00:00:00 2001 From: Jonathan Carroll Otsuka Date: Wed, 19 Mar 2025 16:13:19 -0500 Subject: [PATCH 099/160] emacs: set `FD_SETSIZE` and `DARWIN_UNLIMITED_SELECT` on darwin This fixes the issue around macOS and `too many open files`. Prior work: https://github.com/d12frosted/homebrew-emacs-plus/commit/4b34ed7402a4f3e1f212b2c6fa0851f4b59e247c Context: https://en.liujiacai.net/2022/09/03/emacs-maxopenfiles/ --- pkgs/applications/editors/emacs/make-emacs.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index ef8a5d923822..e203a5fd3506 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -460,10 +460,13 @@ mkDerivation (finalAttrs: { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths; } - // lib.optionalAttrs (variant == "macport") { - # Fixes intermittent segfaults when compiled with LLVM >= 7.0. - # See https://github.com/NixOS/nixpkgs/issues/127902 - NIX_CFLAGS_COMPILE = "-include ${./macport_noescape_noop.h}"; + // { + NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ + # Fixes intermittent segfaults when compiled with LLVM >= 7.0. + # See https://github.com/NixOS/nixpkgs/issues/127902 + (lib.optionalString (variant == "macport") "-include ${./macport_noescape_noop.h}") + (lib.optionalString stdenv.hostPlatform.isDarwin "-DFD_SETSIZE=10000 -DDARWIN_UNLIMITED_SELECT") + ]; }; enableParallelBuilding = true; From 814aeb0e32d29631ab157d37be8548b5586fa5ad Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 20 Mar 2025 02:49:54 +0200 Subject: [PATCH 100/160] bluespec: Support `x86_64-darwin` and `aarch64-linux` --- pkgs/by-name/bl/bluespec/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix index 26d6b10f9cb4..8a617c992502 100644 --- a/pkgs/by-name/bl/bluespec/package.nix +++ b/pkgs/by-name/bl/bluespec/package.nix @@ -172,12 +172,10 @@ stdenv.mkDerivation rec { homepage = "https://github.com/B-Lang-org/bsc"; license = lib.licenses.bsd3; platforms = [ + "aarch64-linux" "x86_64-linux" - "aarch64-darwin" - ]; + ] ++ lib.platforms.darwin; mainProgram = "bsc"; - # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562 - # aarch64 fails, as GHC fails with "ghc: could not execute: opt" maintainers = with lib.maintainers; [ jcumming thoughtpolice From c6cfeba039b247aae8758c1cb0b35a485b294c23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 00:52:33 +0000 Subject: [PATCH 101/160] comet-gog: 0.2.0 -> 0.3.0 --- pkgs/by-name/co/comet-gog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/comet-gog/package.nix b/pkgs/by-name/co/comet-gog/package.nix index c5676da76151..49b5e7c4f2dd 100644 --- a/pkgs/by-name/co/comet-gog/package.nix +++ b/pkgs/by-name/co/comet-gog/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "comet-gog"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "imLinguin"; repo = "comet"; tag = "v${version}"; - hash = "sha256-LAEt2i/SRABrz+y2CTMudrugifLgHNxkMSdC8PXYF0E="; + hash = "sha256-oJSP/zqr4Jp09Rh15a3o1GWsTA0y22+Zu2mU0HXHLHY="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-SvDE+QqaSK0+4XgB3bdmqOtwxBDTlf7yckTR8XjmMXc="; + cargoHash = "sha256-VY9+5QUJYYifLokf69laapCCBRYFo1BOd6kQpxO2wkc="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From 55554a40a8608646e95c07cedc0e42a09a6d93c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 01:09:44 +0000 Subject: [PATCH 102/160] gocryptfs: 2.5.1 -> 2.5.2 --- pkgs/by-name/go/gocryptfs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gocryptfs/package.nix b/pkgs/by-name/go/gocryptfs/package.nix index f23086ee7a7c..f368a95fa11b 100644 --- a/pkgs/by-name/go/gocryptfs/package.nix +++ b/pkgs/by-name/go/gocryptfs/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "gocryptfs"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yTZD4Q/krl6pW6EdtU+sdCWOOo9LHJqHCuNubAoEIyo="; + sha256 = "sha256-H3J+1a4Y6/BqgU7D9j/PNtP6Ci3EjrtO/ADx3GpJMgI="; }; - vendorHash = "sha256-bzhwYiTqI3MV0KxDT5j9TVnWJxM0BuLgEC8/r+2aQjI="; + vendorHash = "sha256-WfTJ8TuFupEa391XQMDl3hKTjrmRHJqvYb1haAGHW/U="; nativeBuildInputs = [ makeWrapper From 7290ed073b40ee98abb9f37bec78a4ce082b0ba9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 01:56:32 +0000 Subject: [PATCH 103/160] ledger-live-desktop: 2.102.0 -> 2.104.0 --- pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index 3e969747f698..1c5a6835018b 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -8,11 +8,11 @@ let pname = "ledger-live-desktop"; - version = "2.102.0"; + version = "2.104.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-mi4YOY8TYorLiUbRCmknY3NBzTXId7/vfdvzUJSrdrI="; + hash = "sha256-RZweB6zE4POJRyvUXMC2nPyyIsZrTc2KkrxuZtmdZYY="; }; appimageContents = appimageTools.extractType2 { From 83102b89167d450182a6ff548a8272853f8b0be3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 02:09:36 +0000 Subject: [PATCH 104/160] ginkgo: 2.23.0 -> 2.23.1 --- pkgs/by-name/gi/ginkgo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix index d2902ee8cc99..b7403ce96b37 100644 --- a/pkgs/by-name/gi/ginkgo/package.nix +++ b/pkgs/by-name/gi/ginkgo/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.23.0"; + version = "2.23.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-ku3pB9LLlDjwEEzJEVgCK+ar+L+beyMrjDtASfBWqLM="; + sha256 = "sha256-yQnkKh5RXzUIff4gSKDo79GZuRvjkT1vK0IUbvKdVjk="; }; vendorHash = "sha256-uqpib3k5PtQOsndic0GV1rYBeVlY5Tpg931yHfU6dWI="; From adc17a6105c58b7f56897ef1b85f11d68aa9046c Mon Sep 17 00:00:00 2001 From: Robert Kovacsics Date: Tue, 18 Mar 2025 02:09:22 +0000 Subject: [PATCH 105/160] rpiboot: Fix bootfiles location (use INSTALL_PREFIX) Since https://github.com/raspberrypi/usbboot/commit/0952ce01e1d42a59aeaccb998a58b840393740b3 the rpiboot package doesn't hard-code the path, but uses INSTALL_PREFIX, so we should use that to properly configure the default location for the bootfiles. --- pkgs/by-name/rp/rpiboot/package.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/rp/rpiboot/package.nix b/pkgs/by-name/rp/rpiboot/package.nix index a3cbf58f7cd4..7f0a68862f7a 100644 --- a/pkgs/by-name/rp/rpiboot/package.nix +++ b/pkgs/by-name/rp/rpiboot/package.nix @@ -22,15 +22,10 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 ]; nativeBuildInputs = [ pkg-config ]; - patchPhase = '' - sed -i "s@/usr/@$out/@g" main.c - ''; + makeFlags = [ "INSTALL_PREFIX=$(out)" ]; - installPhase = '' + preInstall = '' mkdir -p $out/bin - mkdir -p $out/share/rpiboot - cp rpiboot $out/bin - cp -r msd firmware eeprom-erase mass-storage-gadget* recovery* secure-boot* rpi-eeprom rpi-imager-embedded $out/share/rpiboot ''; passthru.updateScript = gitUpdater { }; From 502728235b7fc73f93aca3406cc1a62cbeab2098 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 19 Mar 2025 21:31:06 -0500 Subject: [PATCH 106/160] fastfetch: 2.38.0 -> 2.39.0 Changelog: https://github.com/fastfetch-cli/fastfetch/releases/tag/2.39.0 --- pkgs/by-name/fa/fastfetch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index c660d923c7df..d12fa778eb2a 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -45,13 +45,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.38.0"; + version = "2.39.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-9ph6Zp1x/MP0apB39L+HFUCl7qQ9UfIU89/78+qy6Vc="; + hash = "sha256-2XuODYi3kC9d1rO1LFAdixS7SrrjTOgj+Tm3waMGa+M="; }; outputs = [ From 9f664e81cc00d8ec87a5d8d290708f5769f82ccd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 02:45:32 +0000 Subject: [PATCH 107/160] renovate: 39.191.0 -> 39.208.1 --- pkgs/by-name/re/renovate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index b670cf3a4a3d..0b2a13317059 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "renovate"; - version = "39.191.0"; + version = "39.208.1"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; tag = finalAttrs.version; - hash = "sha256-HJvtYqEUmIr+P8g6cCr+NSgmZkzF7TZaVifyhI84oSY="; + hash = "sha256-Y4EJCbIK3XZAilbf/zMEfjEDYHNrUrAGRfsNmY0h/Bw="; }; postPatch = '' @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-w0BaiLwP2AC2KsP2+GTgagMcfFbP/FBaUurbL9y+pXw="; + hash = "sha256-5KGTt6lx44LNpHG/RelCQ1ZlQOMOL6bJi66M2nCiirg="; }; env.COREPACK_ENABLE_STRICT = 0; From 1f2ee8fbeb26f3bf94f1c8874d78e1557e06fd66 Mon Sep 17 00:00:00 2001 From: dandedotdev Date: Thu, 20 Mar 2025 11:08:41 +0800 Subject: [PATCH 108/160] yew-fmt: 0.5.5 -> 0.6 --- pkgs/by-name/ye/yew-fmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ye/yew-fmt/package.nix b/pkgs/by-name/ye/yew-fmt/package.nix index d6341b7cf075..2956e91d9ab1 100644 --- a/pkgs/by-name/ye/yew-fmt/package.nix +++ b/pkgs/by-name/ye/yew-fmt/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "yew-fmt"; - version = "0.5.5"; + version = "0.6"; src = fetchFromGitHub { owner = "its-the-shrimp"; repo = "yew-fmt"; tag = "v${version}"; - hash = "sha256-2sOw8wWfnEphYsruQyhZMW3KofcGkNHJB6Q1jhFP3oo="; + hash = "sha256-KhZezkR9VhdfGkNe1hSF90pe9K4VGDlBltasb7xnmRI="; }; - cargoHash = "sha256-o4oRVI3+Nz8fwdwlyVvXUuhCQr4Bbg5Kife/PJoJCJY="; + cargoHash = "sha256-Y6OicST0GbUL4RpvdvtBLFlLwryQMKlaut5x9+cNiM8="; nativeCheckInputs = [ rustfmt ]; passthru.updateScript = nix-update-script { }; useFetchCargoVendor = true; From 4dbb2839dcac0b6d06b8e39d0058257ab5eaa344 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 03:24:59 +0000 Subject: [PATCH 109/160] mpc-qt: 24.06 -> 24.12.1-flatpak --- pkgs/applications/video/mpc-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index 70d3a4c20073..7868257ffda7 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "mpc-qt"; - version = "24.06"; + version = "24.12.1-flatpak"; src = fetchFromGitHub { owner = "mpc-qt"; repo = "mpc-qt"; rev = "v${version}"; - hash = "sha256-kEG7B99io3BGjN94nEX1pN10Bcjj21rb46Vcn2OtpN8="; + hash = "sha256-gn94kVs3Lbd+ggj4jTacHpmnVO2lH/QDhFk+hJC1N/c="; }; nativeBuildInputs = [ From 32e152a7525a5fc2304c95b6f589a2925907e9b7 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Thu, 20 Mar 2025 09:52:49 +0800 Subject: [PATCH 110/160] pwvucontrol: 0.4.8 -> 0.4.9 Diff: https://github.com/saivert/pwvucontrol/compare/refs/tags/0.4.8...0.4.9 --- pkgs/by-name/pw/pwvucontrol/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pw/pwvucontrol/package.nix b/pkgs/by-name/pw/pwvucontrol/package.nix index 62975da236f1..47fcecde48b7 100644 --- a/pkgs/by-name/pw/pwvucontrol/package.nix +++ b/pkgs/by-name/pw/pwvucontrol/package.nix @@ -43,18 +43,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "pwvucontrol"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "saivert"; repo = "pwvucontrol"; tag = finalAttrs.version; - hash = "sha256-E3UfZO0R6WGeUffgGQ2ceHiG4hwIuFntTdCpojaWL8E="; + hash = "sha256-fmEXVUz3SerVgWijT/CAoelSUzq861AkBVjP5qwS0ao="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-uaRpaiVjxc0j4oDbmmwt8SPS7O7hWzoYO62jLYzHl1c="; + hash = "sha256-oQSH4P9WxvkXZ53KM5ZoRAZyQFt60Zz7guBbgT1iiBk="; }; nativeBuildInputs = [ From 1c2eadbdeeb73797d53341f6812c95cba6b8851f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 04:16:31 +0000 Subject: [PATCH 111/160] alist: 3.42.0 -> 3.43.0 --- pkgs/by-name/al/alist/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix index 74fc2982563f..2c2f3e3d3610 100644 --- a/pkgs/by-name/al/alist/package.nix +++ b/pkgs/by-name/al/alist/package.nix @@ -11,14 +11,14 @@ }: buildGoModule rec { pname = "alist"; - version = "3.42.0"; - webVersion = "3.42.0"; + version = "3.43.0"; + webVersion = "3.43.0"; src = fetchFromGitHub { owner = "AlistGo"; repo = "alist"; tag = "v${version}"; - hash = "sha256-qUW9bA2TeAVve77i43+ITxClLaO3aqm5959itf+iFqs="; + hash = "sha256-0+gt5S/eklSp8K4z1bXUVHaG7L3zKhi6TdVaxX/Y83w="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -32,11 +32,11 @@ buildGoModule rec { }; web = fetchzip { url = "https://github.com/AlistGo/alist-web/releases/download/${webVersion}/dist.tar.gz"; - hash = "sha256-g2+qdLrxuyuqxlyVk32BKJCbMfXNs29KLEPxAkTQHjU="; + hash = "sha256-uFa9V8DSHk0ET0BCdfT37qUNP2kLNjmt2S6fEk1muME="; }; proxyVendor = true; - vendorHash = "sha256-uid+uT4eOtDsCNsKqGqPc4vMDnKUatG4V2n0Z7r6ccY="; + vendorHash = "sha256-40YuarjrOvwHyXmHZoiqGMueN7dzu8zQ6hgInmsWVJg="; buildInputs = [ fuse ]; From 1135cde082d1cc70e38206c6b22303656850be03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 07:09:10 +0000 Subject: [PATCH 112/160] python312Packages.types-tqdm: 4.67.0.20250301 -> 4.67.0.20250319 --- pkgs/development/python-modules/types-tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-tqdm/default.nix b/pkgs/development/python-modules/types-tqdm/default.nix index 162025c961e1..935929519d1b 100644 --- a/pkgs/development/python-modules/types-tqdm/default.nix +++ b/pkgs/development/python-modules/types-tqdm/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "types-tqdm"; - version = "4.67.0.20250301"; + version = "4.67.0.20250319"; pyproject = true; src = fetchPypi { pname = "types_tqdm"; inherit version; - hash = "sha256-XomjitibhngjNo65fZ+Q0vxpgGuwVd3mJxagXaYrXg0="; + hash = "sha256-rpR6ZL2Nfte30rc2nfBfkYH4R+woKP3Iot6wu4cBrao="; }; build-system = [ setuptools ]; From 22f70327aee70f9182c5eae6e7561db6b889d79a Mon Sep 17 00:00:00 2001 From: Robin Date: Thu, 20 Mar 2025 08:31:52 +0100 Subject: [PATCH 113/160] dotnet-repl: 0.3.230 -> 0.3.239 --- pkgs/by-name/do/dotnet-repl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/dotnet-repl/package.nix b/pkgs/by-name/do/dotnet-repl/package.nix index 746819980117..3941b45926fa 100644 --- a/pkgs/by-name/do/dotnet-repl/package.nix +++ b/pkgs/by-name/do/dotnet-repl/package.nix @@ -6,12 +6,12 @@ buildDotnetGlobalTool { pname = "dotnet-repl"; - version = "0.3.230"; + version = "0.3.239"; dotnet-sdk = dotnetCorePackages.sdk_9_0; dotnet-runtime = dotnetCorePackages.runtime_9_0; - nugetHash = "sha256-FtITkDZ0Qbjo0XvQ8psRlIsbEZhMjIhk8mVrHmUxlIg="; + nugetHash = "sha256-wn4i0zC56gxnjsgjdiMxLinmUsSROhmimu0lmBZo1hA="; meta = { description = "A polyglot REPL built on .NET Interactive"; From c853644fa3396948c48b8db421b4a882dce6ffeb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 07:58:53 +0000 Subject: [PATCH 114/160] mieru: 3.12.0 -> 3.13.0 --- pkgs/by-name/mi/mieru/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix index 329687f31a4b..eff21c563892 100644 --- a/pkgs/by-name/mi/mieru/package.nix +++ b/pkgs/by-name/mi/mieru/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mieru"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "enfein"; repo = "mieru"; rev = "v${version}"; - hash = "sha256-F7YawlcIH/V+qudXjfFKIrVNjds+fhw6BdlCe2VDdUc="; + hash = "sha256-Hy5Uy6lC3d8N2lsnGLrcN/D5/eiycp7X7h6V8vo3tPA="; }; vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM="; From 3ec998bc509ac14778bafb7e39b2375b05051f7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 07:58:57 +0000 Subject: [PATCH 115/160] prrte: 3.0.8 -> 3.0.9 --- pkgs/by-name/pr/prrte/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix index a4284b88168f..6e6089f50321 100644 --- a/pkgs/by-name/pr/prrte/package.nix +++ b/pkgs/by-name/pr/prrte/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "prrte"; - version = "3.0.8"; + version = "3.0.9"; src = fetchFromGitHub { owner = "openpmix"; repo = "prrte"; rev = "v${version}"; - hash = "sha256-4Xc6We0mXpKCwfHlmqi+WbFjdQegWHGzWrEnMVqkqtU="; + hash = "sha256-wLM+txjngY5gh/+yiaSKrenG6oIzF2dPgMumIGyCsXU="; fetchSubmodules = true; }; From dd5d47dbfdb4ef22dd022da06e0f5c6720ae8fa9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 07:59:07 +0000 Subject: [PATCH 116/160] pmix: 5.0.6 -> 5.0.7 --- pkgs/by-name/pm/pmix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pm/pmix/package.nix b/pkgs/by-name/pm/pmix/package.nix index 606c11ee1c64..d4eed1fef336 100644 --- a/pkgs/by-name/pm/pmix/package.nix +++ b/pkgs/by-name/pm/pmix/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pmix"; - version = "5.0.6"; + version = "5.0.7"; src = fetchFromGitHub { repo = "openpmix"; owner = "openpmix"; rev = "v${finalAttrs.version}"; - hash = "sha256-uzsUqf4ZmXmz3vTtD01RkILPxrtCiQ5RMyZ57KAKG1U="; + hash = "sha256-qj/exBi1siCHY1QqNY+ad6n3XI4JZuwnM93Vp+rj1AQ="; fetchSubmodules = true; }; From d042f70b85568a64a00ebd37ee7dd88c0a8a88a1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 20 Mar 2025 09:08:01 +0100 Subject: [PATCH 117/160] libretro.ppsspp: mark as broken on aarch64-linux --- pkgs/applications/emulators/libretro/cores/ppsspp.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index eb10bd383457..7a5013f1eb3b 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -51,5 +51,9 @@ mkLibretroCore { description = "PPSSPP libretro port"; homepage = "https://github.com/hrydgard/ppsspp"; license = lib.licenses.gpl2Plus; + badPlatforms = [ + # error: cannot convert 'uint32x4_t' to 'int' in initialization + "aarch64-linux" + ]; }; } From 348e34de2492beca8623ae1604bba95e53fb4f06 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 20 Mar 2025 09:10:44 +0100 Subject: [PATCH 118/160] libretro.parallel-n64: mark as broken on aarch64-linux --- pkgs/applications/emulators/libretro/cores/parallel-n64.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/emulators/libretro/cores/parallel-n64.nix b/pkgs/applications/emulators/libretro/cores/parallel-n64.nix index 8ef0e6d442bd..7b4d61f82703 100644 --- a/pkgs/applications/emulators/libretro/cores/parallel-n64.nix +++ b/pkgs/applications/emulators/libretro/cores/parallel-n64.nix @@ -38,5 +38,11 @@ mkLibretroCore { description = "Parallel Mupen64plus rewrite for libretro"; homepage = "https://github.com/libretro/parallel-n64"; license = lib.licenses.gpl3Only; + badPlatforms = [ + # ./mupen64plus-core/src/r4300/new_dynarec/arm64/linkage_aarch64.o: in function `.E12': + # (.text+0x5b4): relocation truncated to fit: R_AARCH64_CONDBR19 against symbol `invalidate_block' defined in .text section in ./mupen64plus-core/src/r4300/new_dynarec/new_dynarec_64.o + # collect2: error: ld returned 1 exit status + "aarch64-linux" + ]; }; } From 5cd5fcbf419d42c3b774b64e6353298b23fb3b0c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 19 Mar 2025 22:03:35 +0100 Subject: [PATCH 119/160] python312Packages.jaxlib: 0.5.1 -> 0.5.2 --- .../development/python-modules/jaxlib/bin.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index f969f398edae..4a8bfb8d31af 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -18,7 +18,7 @@ }: let - version = "0.5.1"; + version = "0.5.3"; inherit (python) pythonVersion; # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the @@ -49,65 +49,65 @@ let "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp310"; - hash = "sha256-ZbxJAKBJHfxvubamLoEA0SFCnVjHQplF7CtCTBqCvyc="; + hash = "sha256-Ur5sl3Wv9zimEXDYwEdQXHW7eZpFUY5mp6CQgSexF4U="; }; "3.10-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp310"; - hash = "sha256-CQ/n1LyOGXaHcdvIMZ3pAkdGu1Z/XZujebUQLxdljEE="; + hash = "sha256-lyQA20r26FJw2B215uYg0xOV8EcuUQxQ381Ms/crciA="; }; "3.10-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp310"; - hash = "sha256-LavMsIZHaBj3N80OYi/YjcT1u08N9Melxow0s2bohH8="; + hash = "sha256-SP9cifuKD+BNR16d3AdLSHmpHXq2ilHOxc0eh/gebEc="; }; "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-gMDtVEZkSzg8qj5hdUCAO7DvNuVgnNd1bU0pE6jeUS4="; + hash = "sha256-KeFTD8gYMyFvHii1eNDFlpdlT3LuMcekTtd1O69axGY="; }; "3.11-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp311"; - hash = "sha256-afS54HrQdNRBuZIbeoOu5PT/09VCAz/exQvhRW0GEcY="; + hash = "sha256-pGZvgdcsBg7T5YHe0RapyqmwpwoUilTLEqHTr8o2JLU="; }; "3.11-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp311"; - hash = "sha256-M0xJrUEfOaUFXCPxOVUq4yvZr+aWq7scrfnETr72B/c="; + hash = "sha256-tivYsp5aT5v6pXyNr24EggssmU9Ejz3sYC1kJVVF6fI="; }; "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-Uee1n8QLsnBEDFBJs8gvn3/a2uMZnxaBhiDP24C5Z68="; + hash = "sha256-Wl6IqxzW/feNaavjVE6PCcziAN0zm7hfvjwupn8qXmg="; }; "3.12-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp312"; - hash = "sha256-W0ulqj9ZtfLjfVJc7dav4P7suIQW5fQ+uacJz97YslA="; + hash = "sha256-vd9jYDd6oceS5H/YfzB8NC4zHl/zWC+UCxvKAPa0vHM="; }; "3.12-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp312"; - hash = "sha256-rj3ii/m4Z4HDCjLIi3y9HTIiqMIpqpbL4hBV3NCeuIk="; + hash = "sha256-05Tb3koca9Z1Ac+ynTgZoQuQDLU0zA/GAzGfcJLyTPo="; }; "3.13-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp313"; - hash = "sha256-3BCf+mhzZAImw2DaeTqKe+r4xIdRrD/bKfprM3kB4YY="; + hash = "sha256-u3WTy3//yxOWPyL6UintlguPtK5ew7CCAEjL1n8ejjE="; }; "3.13-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp313"; - hash = "sha256-3zcE8TXP+H/Z1BkwJIkl8vFjvu1u/qqrzNl0AVgNz9g="; + hash = "sha256-6QS5Le37x+VFclqNdnaYcDCunAaQAdlHAbwQnG2rQQA="; }; "3.13-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp313"; - hash = "sha256-jFf7vnmqPOOsLsZXp/F4Z7mzwsrYhbLIOQVnzJc47ug="; + hash = "sha256-MTIcJSgqBqbfyUBQe8FNCgrIONjO1sB6oAp/rjTOez8="; }; }; in From 067aa11fac16cd74a08343b6c0cf2b35a02147fa Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 19 Mar 2025 22:03:51 +0100 Subject: [PATCH 120/160] python312Packages.jax-cuda12-plugin: 0.5.1 -> 0.5.3 --- .../python-modules/jax-cuda12-plugin/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix index e9d22d155f69..a1bcf01218da 100644 --- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix @@ -40,42 +40,42 @@ let "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp310"; - hash = "sha256-ymCGSgWlzqRK51dthHtHeeTeYYUKmhgjg0H8Q6dY1Vs="; + hash = "sha256-uiVVln+bbDgci075+wPQW8Vewl7P7lz+RcWs4099QVI="; }; "3.10-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp310"; - hash = "sha256-488emSaNinBBPw+sM1krh2nBPckdch+RxYeEa+nYhAM="; + hash = "sha256-YXGu0vSzvdX8E3gt4QcsamNPzhNzG3XQywpquPTm5lA="; }; "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-NGVbjq/H2b/sMbB3rBPULgjY7YZV0kFHxa38AVFSaU8="; + hash = "sha256-qqcEpe9UdZXQItscHkh4oGdxFkEqk2DBFdZ/9LZOFZY="; }; "3.11-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp311"; - hash = "sha256-ik8Mje8QnXb1uqwbKuRpCURFzS1/vYxZf83WI+sC/1Q="; + hash = "sha256-KY0tdo8QKbdKCx0BJw5Uk0nSw33Adlh5ZULNqWfre9M="; }; "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-Fp22Rbr+whOO2YOvjxTk0RqElyivpXIC55qRBNmJLxY="; + hash = "sha256-IDDPEgjOTqcO5WysYd3SOfl5hpX8Obt3OcUKJdbp2kQ="; }; "3.12-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp312"; - hash = "sha256-wqhtVj3AR5rLTHmuz/vuwYn6vY6XAP4/cxvwOV4dbBE="; + hash = "sha256-wlF6fCGG+HCIlGluJs+W69YLeHnOyjmLLEarso0slsg="; }; "3.13-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp313"; - hash = "sha256-J0kTjLGHMZBoa7FPMxBIskwXjwXkdIo9L/fSA2c1rT0="; + hash = "sha256-GGJZWyttgVZ50R4OiJ5SMYXuVKRtRuAiaJ9w/EVU3ZE="; }; "3.13-aarch64-linux" = getSrcFromPypi { platform = "manylinux2014_aarch64"; dist = "cp313"; - hash = "sha256-C7aXl3+NbGOS9WLDQF6D68xvXLfCCBQFCE9tXPoJ4yo="; + hash = "sha256-If7BtWyYeD6gVpt0elZ1Hx+f8hh7SKzBHHANO/xeGjE="; }; }; in From fe66b5b6f22f93360cede5d6c7f7e95336131cf5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 19 Mar 2025 22:04:14 +0100 Subject: [PATCH 121/160] python312Packages.jax-cuda12-pjrt: 0.5.1 -> 0.5.3 --- pkgs/development/python-modules/jax-cuda12-pjrt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix index 6dff1eb69ef7..14c59787f06a 100644 --- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix +++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix @@ -39,7 +39,7 @@ let srcs = { "x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_x86_64.whl"; - hash = "sha256-05Xe87NP1oSOEVlu8pdaiV0fUG31EuQbH8XS3lIMjlE="; + hash = "sha256-xTeDBlaLoMgbIwp3ndMZTJ3RAzmrY2CugJKBCNN+f3U="; }; # "aarch64-linux" = fetchurl { # url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_aarch64.whl"; From f35542a2c74cb2045788772894ea67b5d9dfcfef Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 19 Mar 2025 22:05:16 +0100 Subject: [PATCH 122/160] python312Packages.jax: 0.5.2 -> 0.5.3 Diff: https://github.com/jax-ml/jax/compare/jax-v0.5.2...jax-v0.5.3 Changelog: https://github.com/jax-ml/jax/releases/tag/jax-v0.5.3 --- pkgs/development/python-modules/jax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 7cf05a432916..30b6789692a9 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; src = fetchFromGitHub { @@ -48,7 +48,7 @@ buildPythonPackage rec { repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jax tags! tag = "jax-v${version}"; - hash = "sha256-Z7yMV4P423Pr574QPk0bVupWj2//RelLi/eLUqN/BlE="; + hash = "sha256-t4LHwpCz08zrQGWBehyPs2JnxsOvtV3L14MCdTqMeEI="; }; build-system = [ setuptools ]; From 7c93e453118f4f4b56381880cbb6d0ed5447932b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 20 Mar 2025 09:37:22 +0100 Subject: [PATCH 123/160] python312Packages.equinox: ignore DeprecationWarning in pytest https://github.com/patrick-kidger/equinox/issues/979 --- pkgs/development/python-modules/equinox/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index d9bbc922431a..834e6f5d732b 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -56,6 +56,14 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # Since jax 0.5.3: + # DeprecationWarning: shape requires ndarray or scalar arguments, got at position 0. In a future JAX release this will be an error. + # https://github.com/patrick-kidger/equinox/issues/979 + "-W" + "ignore::DeprecationWarning" + ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated! "test_filter" From f18673aa02b3656a22741c50f4a18e39a0d19b08 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Tue, 4 Mar 2025 18:37:51 -0800 Subject: [PATCH 124/160] llvmPackages_20: 20.1.0-rc3 -> 20.1.1 --- .../compilers/llvm/common/libc/default.nix | 1 + .../compilers/llvm/common/llvm/default.nix | 11 +++++++++-- .../compilers/llvm/common/mlir/default.nix | 2 ++ pkgs/development/compilers/llvm/default.nix | 2 +- pkgs/top-level/aliases.nix | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix index 2ba098da2814..6ccc7e44ff61 100644 --- a/pkgs/development/compilers/llvm/common/libc/default.nix +++ b/pkgs/development/compilers/llvm/common/libc/default.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = llvm_meta // { + broken = stdenv.hostPlatform.isDarwin; homepage = "https://libc.llvm.org/"; description = "Standard C library for LLVM"; }; diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index f9986621df4a..345e466412c2 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -513,12 +513,19 @@ stdenv.mkDerivation (finalAttrs: { ] ++ [ "-DLLVM_TABLEGEN=${buildLlvmTools.tblgen}/bin/llvm-tblgen" ]; + + triple = + if stdenv.hostPlatform.isDarwin && lib.versionAtLeast release_version "20" then + # JIT tests expect the triple to use Darwin arch's naming for CPU architectures. + "${stdenv.hostPlatform.darwinArch}-apple-${stdenv.hostPlatform.darwinPlatform}" + else + stdenv.hostPlatform.config; in flagsForLlvmConfig ++ [ "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_HOST_TRIPLE=${triple}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${triple}" "-DLLVM_ENABLE_DUMP=ON" (lib.cmakeBool "LLVM_ENABLE_TERMINFO" enableTerminfo) ] ++ optionals (!finalAttrs.finalPackage.doCheck) [ diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix index 8f2f28c72c65..9bccb3c4c6c1 100644 --- a/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -71,6 +71,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; meta = llvm_meta // { + # Very broken since the dependencies aren't propagating at all with tblgen through the CMake. + broken = lib.versionAtLeast release_version "20"; homepage = "https://mlir.llvm.org/"; description = "Multi-Level IR Compiler Framework"; longDescription = '' diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 27eda9772f5d..30825787132a 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -31,7 +31,7 @@ let "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; - "20.1.0-rc3".officialRelease.sha256 = "sha256-mLSBoyq24FD+khynC6sC5IkDFqizgAn07lR9+ZRXlV0="; + "20.1.1".officialRelease.sha256 = "sha256-hDFYi5wAUDQ8xfjvbGFi05KdawrN9lwrrSC8AcTpCEE="; "21.0.0-git".gitRelease = { rev = "4fde8c341f9166e6ec6dff6e7704be175e382f5b"; rev-version = "21.0.0-unstable-2025-03-16"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 741dca6e8c2b..712e0e62d8b5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1735,7 +1735,7 @@ mapAliases { openbsdCross = openbsd; # Added 2024-09-06 # LLVM packages for (integration) testing that should not be used inside Nixpkgs: - llvmPackages_latest = llvmPackages_19; + llvmPackages_latest = llvmPackages_20; /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: From d6b565f2777adffb13aa605463148157556282bc Mon Sep 17 00:00:00 2001 From: n Date: Thu, 20 Mar 2025 14:39:01 +0530 Subject: [PATCH 125/160] nixos/yabar: update package option description --- nixos/modules/programs/yabar.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix index c9275889927b..08d7036a3e39 100644 --- a/nixos/modules/programs/yabar.nix +++ b/nixos/modules/programs/yabar.nix @@ -79,8 +79,7 @@ in description = '' The package which contains the `yabar` binary. - Nixpkgs provides the `yabar` and `yabar-unstable`, - so it's possible to choose. + Nixpkgs offers both a stable (`yabar`) and unstable (`yabar-unstable`) version of Yabar. ''; }; From a229ef5feb0a550816c5f78d8e7e7de5c408482c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 20 Mar 2025 10:11:26 +0100 Subject: [PATCH 126/160] python312Packages.optimistix: ignore DeprecationWarning in pytest --- pkgs/development/python-modules/optimistix/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/optimistix/default.nix b/pkgs/development/python-modules/optimistix/default.nix index c292b993e232..8b98dbe711c6 100644 --- a/pkgs/development/python-modules/optimistix/default.nix +++ b/pkgs/development/python-modules/optimistix/default.nix @@ -13,7 +13,7 @@ lineax, typing-extensions, - # checks + # tests beartype, jaxlib, optax, @@ -53,6 +53,13 @@ buildPythonPackage rec { pytest-xdist ]; + pytestFlagsArray = [ + # Since jax 0.5.3: + # DeprecationWarning: shape requires ndarray or scalar arguments, got at position 0. In a future JAX release this will be an error. + "-W" + "ignore::DeprecationWarning" + ]; + meta = { description = "Nonlinear optimisation (root-finding, least squares, ...) in JAX+Equinox"; homepage = "https://github.com/patrick-kidger/optimistix"; From fdd3d82032bc42974a2f6718762e839054c8d97f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 09:18:10 +0000 Subject: [PATCH 127/160] vacuum-go: 0.16.3 -> 0.16.4 --- pkgs/by-name/va/vacuum-go/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index 4fb520baedaf..32f0993d4eb2 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -8,14 +8,14 @@ buildGoModule rec { pname = "vacuum-go"; - version = "0.16.3"; + version = "0.16.4"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error tag = "v${version}"; - hash = "sha256-wlxEKAP8A8T+rBQ2HqoOdBlkqFBqrIxuuEidPAeUO3E="; + hash = "sha256-7nVDKR2H84SW6s97jgShylcc1degLzkjkeldlGBcQ/o="; }; vendorHash = "sha256-1lr1VQU4JHg0PZbjAUmALFZJiYc+HTwrk0E/t/1qXqE="; From 95f3cb6771c37f622c8847d5a3dade9dcb3f8a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 19 Mar 2025 15:29:14 -0600 Subject: [PATCH 128/160] linux/hardened/patches/5.10: v5.10.234-hardened1 -> v5.10.235-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d7bc239e65a9..6f73e98b2b2f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.10.234-hardened1.patch", - "sha256": "0155pikfzyrmrf9xc2bid6s7jz6qw6pb1x1pbzgphsvsi83jm886", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.234-hardened1/linux-hardened-v5.10.234-hardened1.patch" + "name": "linux-hardened-v5.10.235-hardened1.patch", + "sha256": "1xhpwy62jbwbc71s2cglxhrn7radpp256v05d587gf7jwhbi2zmc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.235-hardened1/linux-hardened-v5.10.235-hardened1.patch" }, - "sha256": "1rgb4v6dvqlw1mgzsli0hxaj2d5d4m1nylgcrwm4bkpiwbzc95wm", - "version": "5.10.234" + "sha256": "1k7iq4np3pflkq3d71ya8xs5czhslhy2iha4ls9lma81269y6fwm", + "version": "5.10.235" }, "5.15": { "patch": { From 78456574ae7c13aaa437c2378a70e202c0e310cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 19 Mar 2025 15:29:18 -0600 Subject: [PATCH 129/160] linux/hardened/patches/5.15: v5.15.178-hardened1 -> v5.15.179-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 6f73e98b2b2f..c4de303ee7bd 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.15.178-hardened1.patch", - "sha256": "01gbhdfnbxsb20qvgchk1qar7mf9phrzfidx825jags1v565jbpf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.178-hardened1/linux-hardened-v5.15.178-hardened1.patch" + "name": "linux-hardened-v5.15.179-hardened1.patch", + "sha256": "18255w5x7fjx37zdzbmigp641izc5h8fp2h8z7lj33z2mf7gfs9y", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.179-hardened1/linux-hardened-v5.15.179-hardened1.patch" }, - "sha256": "0hkw2l4gr5m6jw2adxcgm2sb6kl0w51r6s4hcbn6rlm4bvmzgsgg", - "version": "5.15.178" + "sha256": "0vqk4wd0cacigz42gigdzbj415hcdn2k2m01yr7k8pcv3rxs86ck", + "version": "5.15.179" }, "5.4": { "patch": { From c017059ad6d1afe049106aba4d66d5468bf8b80d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 19 Mar 2025 15:29:24 -0600 Subject: [PATCH 130/160] linux/hardened/patches/5.4: v5.4.290-hardened1 -> v5.4.291-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c4de303ee7bd..e30671462013 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v5.4.290-hardened1.patch", - "sha256": "0bd1g3zx5x5hxljw0qfis6h5y13pjlw1sizj7cx261iqb35vsv3x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.290-hardened1/linux-hardened-v5.4.290-hardened1.patch" + "name": "linux-hardened-v5.4.291-hardened1.patch", + "sha256": "1i7x7pdmqbrj306jbqv75ij1lq4hvdmw1qnfa4975zyzdd8d0khq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.291-hardened1/linux-hardened-v5.4.291-hardened1.patch" }, - "sha256": "0mm4q8f6kbqddy4zaxjf5xyqpnla5qprvsf7v3vq01gmlzr3rivc", - "version": "5.4.290" + "sha256": "0vpgb3lmhgv5iw9b1z0kqr6vdv44if49marfp5858z3a8yj69bdk", + "version": "5.4.291" }, "6.1": { "patch": { From 620b2ff633f2f80ee9806b85ad84f6c0c86da8ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 19 Mar 2025 15:29:29 -0600 Subject: [PATCH 131/160] linux/hardened/patches/6.1: v6.1.129-hardened1 -> v6.1.131-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index e30671462013..c7f625a86433 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.1.129-hardened1.patch", - "sha256": "0lacg5p2pw56cwijiiby6isa5r4nwmi5lh1p1lr1n1yy8nzzs3kx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.129-hardened1/linux-hardened-v6.1.129-hardened1.patch" + "name": "linux-hardened-v6.1.131-hardened1.patch", + "sha256": "005qvy3r69cy007fvj7m4b49m3vplndb280p2q72wnk9mpw8axrp", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.131-hardened1/linux-hardened-v6.1.131-hardened1.patch" }, - "sha256": "0axm373w49cjga541nxk9rxpkh75wl1b04l8w6clm93mvszy6qwx", - "version": "6.1.129" + "sha256": "05jvvv3khadvfgdrv43fcrnm606jk4064a7qivkvnk1vc08gbjj4", + "version": "6.1.131" }, "6.11": { "patch": { From 365f78f6eb3dca12b42520bade6b603c213987eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 19 Mar 2025 15:29:34 -0600 Subject: [PATCH 132/160] linux/hardened/patches/6.12: v6.12.17-hardened1 -> v6.12.19-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c7f625a86433..a1b27d6280a6 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,12 +52,12 @@ "6.12": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.12.17-hardened1.patch", - "sha256": "15glq35gdh4mn69qqlv2hr79clwk1xphf6cfhh5n67xjkxri8jxw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.17-hardened1/linux-hardened-v6.12.17-hardened1.patch" + "name": "linux-hardened-v6.12.19-hardened1.patch", + "sha256": "1f78k1bns49gfb8ari5jg5wkfai206nfpsnwj0y5h5yrjg0x8sx8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.19-hardened1/linux-hardened-v6.12.19-hardened1.patch" }, - "sha256": "1cv3vrvwsj4ldbq7f9ccmal9as2ziw0cn8g3fd4lx5w09z9mq82w", - "version": "6.12.17" + "sha256": "0cb5ri6xsd9fyf0s48xrrsbhqzbgjd0iddnid6qk8i60prbz0fyp", + "version": "6.12.19" }, "6.13": { "patch": { From 52899feda0f026a8db79d42ff8a091e6bac8e3fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 19 Mar 2025 15:29:39 -0600 Subject: [PATCH 133/160] linux/hardened/patches/6.13: v6.13.5-hardened1 -> v6.13.7-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a1b27d6280a6..d393c7219c97 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -62,12 +62,12 @@ "6.13": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.13.5-hardened1.patch", - "sha256": "04adsib4g7rfgmq1sc7przp3fpw6djb4vvf8ypn94a7dihg7f8ip", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.13.5-hardened1/linux-hardened-v6.13.5-hardened1.patch" + "name": "linux-hardened-v6.13.7-hardened1.patch", + "sha256": "0s0h6z9qxqcfdz14zbaalapl2py7z40hf4p6405f2hy5hajdcxq3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.13.7-hardened1/linux-hardened-v6.13.7-hardened1.patch" }, - "sha256": "1qp6aprkkf2iwlhg2czd2msyqc728ab1vyr2v1nw3yzkhh3wngi8", - "version": "6.13.5" + "sha256": "07c08x68fgcsgriss5z8w427h69y52s887vas91jzb5p70hbcf9s", + "version": "6.13.7" }, "6.6": { "patch": { From 939cb1c3af093d17bdf371ad69cefaa94636712e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 19 Mar 2025 15:29:43 -0600 Subject: [PATCH 134/160] linux/hardened/patches/6.6: v6.6.80-hardened1 -> v6.6.83-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d393c7219c97..10b2356c63f3 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -72,11 +72,11 @@ "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.6.80-hardened1.patch", - "sha256": "09hhswaslihs5w58jka5xfw2kz70mg7awsvhbca9il5wn7wppp0j", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.80-hardened1/linux-hardened-v6.6.80-hardened1.patch" + "name": "linux-hardened-v6.6.83-hardened1.patch", + "sha256": "0wzgkj4ypa3clbzq40jkm3qjhbnj8wj48wc9vxx8v15gl4rppgga", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.83-hardened1/linux-hardened-v6.6.83-hardened1.patch" }, - "sha256": "09qkadl9fm0c589qyjdwhgryr85xampz0k7lsafmrx142g813ybc", - "version": "6.6.80" + "sha256": "0262q81mwhy8plql8hnnfvagp460vfl127kaayya113l7gkbnjw9", + "version": "6.6.83" } } From c48d0033f755ac3d353c767ab8349d1ab7ee75d7 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 20 Mar 2025 11:02:10 +0100 Subject: [PATCH 135/160] nixos/radicale: assertion so that users set settings.auth.type explicitly --- nixos/modules/services/networking/radicale.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index 76e74e07a4e5..fd0a63212d49 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -119,6 +119,14 @@ in are mutually exclusive. ''; } + { + assertion = cfg.config != "" || (cfg.settings ? auth && cfg.settings.auth ? type); + message = '' + Radicale 3.5.0 changed the default value for `auth.type` from `none` to `denyall`. + You probably don't want `denyall`, so please set this explicitly. + https://github.com/Kozea/Radicale/blob/v3.5.0/CHANGELOG.md + ''; + } ]; warnings = From 9fae7dbfdfa3640b476ed8b348255d71e856564e Mon Sep 17 00:00:00 2001 From: Taliyah Webb Date: Thu, 20 Mar 2025 11:42:03 +0100 Subject: [PATCH 136/160] xdragon: sync short description with upstream --- pkgs/tools/X11/xdragon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xdragon/default.nix b/pkgs/tools/X11/xdragon/default.nix index babdb75224cb..9fa790b2048b 100644 --- a/pkgs/tools/X11/xdragon/default.nix +++ b/pkgs/tools/X11/xdragon/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "Simple drag-and-drop source/sink for X (called dragon in upstream)"; + description = "Simple drag-and-drop source/sink for X or Wayland (called dragon in upstream)"; homepage = "https://github.com/mwh/dragon"; license = licenses.gpl3; maintainers = with maintainers; [ das_j ]; From 13d60d66d7f373e7b782204a2bdb9a1ed9f426f9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 26 Jan 2025 16:05:37 +0200 Subject: [PATCH 137/160] amtterm: allow compiling with gamt This adds a graphical version of amtterm, called `gamt`, which automatically gets built if gtk/gdk and vte are discovered. It's gated behind a `withGamt` flag, defaulting to false, and available as `gamt`. This follows the same logic as qcam. --- pkgs/by-name/am/amtterm/package.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/am/amtterm/package.nix b/pkgs/by-name/am/amtterm/package.nix index 6d6788cd2238..8e90685b40c3 100644 --- a/pkgs/by-name/am/amtterm/package.nix +++ b/pkgs/by-name/am/amtterm/package.nix @@ -3,10 +3,13 @@ lib, stdenv, makeWrapper, + gtk3, openssl, perl, perlPackages, pkg-config, + vte, + withGamt ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -18,7 +21,12 @@ stdenv.mkDerivation (finalAttrs: { perl SOAPLite ]) - ++ [ openssl ]; + ++ [ openssl ] + + ++ lib.optionals withGamt [ + gtk3 + vte + ]; nativeBuildInputs = [ makeWrapper pkg-config diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 093dff485087..3c0963d06bed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8752,6 +8752,8 @@ with pkgs; protobuf = protobuf_21; }; + gamt = callPackage ../by-name/am/amtterm/package.nix { withGamt = true; }; + gcr = callPackage ../development/libraries/gcr { }; gcr_4 = callPackage ../development/libraries/gcr/4.nix { }; From 68a8e76525d0b40c6b4129266567db2e756d2270 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 20 Mar 2025 12:01:55 +0100 Subject: [PATCH 138/160] habitat: 1.6.848 -> 1.6.1243 --- pkgs/by-name/ha/habitat/Cargo.lock | 4675 --------------------------- pkgs/by-name/ha/habitat/package.nix | 17 +- 2 files changed, 4 insertions(+), 4688 deletions(-) delete mode 100644 pkgs/by-name/ha/habitat/Cargo.lock diff --git a/pkgs/by-name/ha/habitat/Cargo.lock b/pkgs/by-name/ha/habitat/Cargo.lock deleted file mode 100644 index 71c5ab204a70..000000000000 --- a/pkgs/by-name/ha/habitat/Cargo.lock +++ /dev/null @@ -1,4675 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "actix-codec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe" -dependencies = [ - "bitflags 1.3.2", - "bytes", - "futures-core", - "futures-sink", - "log 0.4.20", - "memchr", - "pin-project-lite", - "tokio", - "tokio-util 0.7.8", -] - -[[package]] -name = "actix-http" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0070905b2c4a98d184c4e81025253cb192aa8a73827553f38e9410801ceb35bb" -dependencies = [ - "actix-codec", - "actix-rt", - "actix-service", - "actix-tls", - "actix-utils", - "ahash", - "base64 0.21.2", - "bitflags 1.3.2", - "bytes", - "bytestring", - "derive_more", - "encoding_rs", - "futures-core", - "h2", - "http", - "httparse", - "httpdate", - "itoa 1.0.1", - "language-tags", - "local-channel", - "mime", - "percent-encoding", - "pin-project-lite", - "rand 0.8.5", - "sha1", - "smallvec", - "tokio", - "tokio-util 0.7.8", - "tracing", -] - -[[package]] -name = "actix-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6" -dependencies = [ - "quote", - "syn 1.0.104", -] - -[[package]] -name = "actix-router" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb60846b52c118f2f04a56cc90880a274271c489b2498623d58176f8ca21fa80" -dependencies = [ - "bytestring", - "firestorm", - "http", - "log 0.4.20", - "regex 1.7.3", - "serde", -] - -[[package]] -name = "actix-rt" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e" -dependencies = [ - "actix-macros", - "futures-core", - "tokio", -] - -[[package]] -name = "actix-server" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da34f8e659ea1b077bb4637948b815cd3768ad5a188fdcd74ff4d84240cd824" -dependencies = [ - "actix-rt", - "actix-service", - "actix-utils", - "futures-core", - "futures-util", - "mio 0.8.8", - "num_cpus", - "socket2 0.4.9", - "tokio", - "tracing", -] - -[[package]] -name = "actix-service" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f5f9d66a8730d0fae62c26f3424f5751e5518086628a40b7ab6fca4a705034" -dependencies = [ - "futures-core", - "paste", - "pin-project-lite", -] - -[[package]] -name = "actix-tls" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fde0cf292f7cdc7f070803cb9a0d45c018441321a78b1042ffbbb81ec333297" -dependencies = [ - "actix-codec", - "actix-rt", - "actix-service", - "actix-utils", - "futures-core", - "log 0.4.20", - "pin-project-lite", - "tokio-rustls", - "tokio-util 0.7.8", - "webpki-roots", -] - -[[package]] -name = "actix-utils" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e491cbaac2e7fc788dfff99ff48ef317e23b3cf63dbaf7aaab6418f40f92aa94" -dependencies = [ - "local-waker", - "pin-project-lite", -] - -[[package]] -name = "actix-web" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96" -dependencies = [ - "actix-codec", - "actix-http", - "actix-router", - "actix-rt", - "actix-server", - "actix-service", - "actix-tls", - "actix-utils", - "ahash", - "bytes", - "bytestring", - "cfg-if 1.0.0", - "derive_more", - "encoding_rs", - "futures-core", - "futures-util", - "http", - "itoa 1.0.1", - "language-tags", - "log 0.4.20", - "mime", - "once_cell", - "pin-project-lite", - "regex 1.7.3", - "serde", - "serde_json", - "serde_urlencoded", - "smallvec", - "socket2 0.4.9", - "time 0.3.11", - "url", -] - -[[package]] -name = "addr" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a93b8a41dbe230ad5087cc721f8d41611de654542180586b315d9f4cf6b72bef" -dependencies = [ - "psl", - "psl-types", -] - -[[package]] -name = "addr2line" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" -dependencies = [ - "getrandom 0.2.3", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -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 = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" -dependencies = [ - "backtrace", -] - -[[package]] -name = "arc-swap" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f" - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] -name = "async-trait" -version = "0.1.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide 0.4.4", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" - -[[package]] -name = "bimap" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" - -[[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 = "blake2b_simd" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-buffer" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" -dependencies = [ - "generic-array", -] - -[[package]] -name = "broadcast" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb214f702da3cc6aa1666520f40ea66f506644db5e1065be4bbc972f7ec3750b" - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "bytestring" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90706ba19e97b90786e19dc0d5e2abd80008d99d4c0c5d1ad0b5e72cec7c494d" -dependencies = [ - "bytes", -] - -[[package]] -name = "caps" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" -dependencies = [ - "libc", - "thiserror", -] - -[[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 = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "time 0.1.43", - "wasm-bindgen", - "winapi 0.3.9", -] - -[[package]] -name = "clap" -version = "2.33.1" -source = "git+https://github.com/habitat-sh/clap.git?branch=v2-master#21690ba25d1ac5783f4fb413ff87e6d086d15b49" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "colosseum" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "370c83b49aedf022ee27942e8ae1d9de1cf40dc9653ee6550e4455d08f6406f9" - -[[package]] -name = "configopt" -version = "0.1.0" -source = "git+https://github.com/habitat-sh/configopt.git#98e4041a9922d6ebb5e548c3241fb82c76c6a4c0" -dependencies = [ - "colosseum", - "configopt-derive", - "lazy_static 1.4.0", - "serde", - "structopt", - "toml 0.7.6", -] - -[[package]] -name = "configopt-derive" -version = "0.1.0" -source = "git+https://github.com/habitat-sh/configopt.git#98e4041a9922d6ebb5e548c3241fb82c76c6a4c0" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "proc_macro_roids", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "constant_time_eq" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "core-foundation" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "cpu-time" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "cpufeatures" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" -dependencies = [ - "libc", -] - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.15", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static 1.4.0", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "ctrlc" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e" -dependencies = [ - "nix", - "windows-sys 0.48.0", -] - -[[package]] -name = "cxx" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 1.0.104", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "derive_more" -version = "0.99.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.3.3", - "syn 1.0.104", -] - -[[package]] -name = "destructure_traitobject" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "digest" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" -dependencies = [ - "block-buffer 0.10.2", - "crypto-common", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[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 0.3.9", -] - -[[package]] -name = "dns-lookup" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f332aa79f9e9de741ac013237294ef42ce2e9c6394dc7d766725812f1238812" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "socket2 0.5.3", - "windows-sys 0.48.0", -] - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "ed25519" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc" -dependencies = [ - "signature", -] - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "encoding_rs" -version = "0.8.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "env" -version = "0.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876927d21ef1ae98001c8c35a1d8dfd682136914b23ef04276820fa6d43c3630" - -[[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 0.4.20", - "regex 1.7.3", - "termcolor", -] - -[[package]] -name = "env_proxy" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a5019be18538406a43b5419a5501461f0c8b49ea7dfda0cfc32f4e51fc44be1" -dependencies = [ - "log 0.4.20", - "url", -] - -[[package]] -name = "equivalent" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" - -[[package]] -name = "erased-serde" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" -dependencies = [ - "serde", -] - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "errno" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067" -dependencies = [ - "gcc", - "libc", -] - -[[package]] -name = "error-chain" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8" - -[[package]] -name = "fancy-regex" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" -dependencies = [ - "bit-set", - "regex 1.7.3", -] - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "field-offset" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" -dependencies = [ - "memoffset 0.6.4", - "rustc_version 0.3.3", -] - -[[package]] -name = "filetime" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", -] - -[[package]] -name = "firestorm" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c5f6c2c942da57e2aaaa84b8a521489486f14e75e7fa91dab70aba913975f98" - -[[package]] -name = "fixedbitset" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" - -[[package]] -name = "flate2" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" -dependencies = [ - "crc32fast", - "miniz_oxide 0.7.1", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags 1.3.2", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gcc" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" - -[[package]] -name = "generator" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d9279ca822891c1a4dae06d185612cf8fc6acfe5dff37781b41297811b12ee" -dependencies = [ - "cc", - "libc", - "log 0.4.20", - "rustversion", - "winapi 0.3.9", -] - -[[package]] -name = "generic-array" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.10.2+wasi-snapshot-preview1", -] - -[[package]] -name = "gimli" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "h2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 1.9.2", - "slab", - "tokio", - "tokio-util 0.7.8", - "tracing", -] - -[[package]] -name = "hab" -version = "0.0.0" -dependencies = [ - "anyhow", - "atty", - "base64 0.21.2", - "bitflags 2.4.0", - "chrono", - "clap", - "configopt", - "ctrlc", - "dirs", - "env_logger", - "flate2", - "futures", - "glob", - "habitat-sup-client", - "habitat-sup-protocol", - "habitat_api_client", - "habitat_common", - "habitat_core", - "handlebars 0.29.1", - "lazy_static 1.4.0", - "libc", - "log 0.4.20", - "pbr", - "rants", - "reqwest", - "retry", - "rustls", - "same-file", - "serde", - "serde_json", - "serde_yaml 0.9.25", - "structopt", - "tabwriter", - "tar", - "tempfile", - "termcolor", - "thiserror", - "tokio", - "toml 0.7.6", - "url", - "uuid 1.2.2", - "walkdir", - "webpki", - "widestring 1.0.2", - "winapi 0.3.9", - "winreg 0.51.0", -] - -[[package]] -name = "habitat-launcher" -version = "0.0.0" -dependencies = [ - "anyhow", - "env_logger", - "habitat-launcher-protocol", - "habitat_common", - "habitat_core", - "ipc-channel", - "libc", - "log 0.4.20", - "nix", - "prost", - "semver 1.0.18", - "thiserror", - "winapi 0.3.9", -] - -[[package]] -name = "habitat-launcher-client" -version = "0.0.0" -dependencies = [ - "bincode", - "env_logger", - "habitat-launcher-protocol", - "habitat_common", - "habitat_core", - "ipc-channel", - "libc", - "log 0.4.20", - "prost", - "serde", - "thiserror", -] - -[[package]] -name = "habitat-launcher-protocol" -version = "0.0.0" -dependencies = [ - "bytes", - "prost", - "prost-build", - "serde", -] - -[[package]] -name = "habitat-rst-reader" -version = "0.0.0" -dependencies = [ - "clap", - "env_logger", - "habitat_butterfly", - "log 0.4.20", -] - -[[package]] -name = "habitat-sup-client" -version = "0.0.0" -dependencies = [ - "futures", - "habitat-sup-protocol", - "habitat_common", - "habitat_core", - "log 0.4.20", - "prost", - "rustls", - "termcolor", - "tokio", - "tokio-util 0.7.8", -] - -[[package]] -name = "habitat-sup-protocol" -version = "0.0.0" -dependencies = [ - "base64 0.21.2", - "bytes", - "habitat_core", - "lazy_static 1.4.0", - "log 0.4.20", - "prost", - "prost-build", - "rand 0.8.5", - "serde", - "tempfile", - "tokio", - "tokio-util 0.7.8", - "toml 0.7.6", -] - -[[package]] -name = "habitat_api_client" -version = "0.0.0" -dependencies = [ - "broadcast", - "bytes", - "chrono", - "env", - "futures", - "habitat_core", - "habitat_http_client", - "log 0.4.20", - "pbr", - "percent-encoding", - "rand 0.8.5", - "regex 1.7.3", - "reqwest", - "serde", - "serde_json", - "tee", - "tokio", - "tokio-util 0.7.8", - "url", -] - -[[package]] -name = "habitat_butterfly" -version = "0.1.0" -dependencies = [ - "byteorder", - "bytes", - "env_logger", - "habitat_common", - "habitat_core", - "lazy_static 1.4.0", - "log 0.4.20", - "mktemp", - "parking_lot", - "prometheus", - "prost", - "prost-build", - "rand 0.8.5", - "serde", - "serde_json", - "tempfile", - "threadpool", - "toml 0.7.6", - "uuid 1.2.2", - "winapi 0.3.9", - "zmq", -] - -[[package]] -name = "habitat_common" -version = "0.0.0" -dependencies = [ - "async-trait", - "bimap", - "bitflags 2.4.0", - "clap", - "dirs", - "glob", - "habitat_api_client", - "habitat_core", - "handlebars 0.28.3", - "lazy_static 1.4.0", - "libc", - "log 0.4.20", - "native-tls", - "nix", - "owning_ref", - "parking_lot", - "pbr", - "petgraph", - "regex 1.7.3", - "reqwest", - "retry", - "rustls", - "serde", - "serde-transcode", - "serde_json", - "serde_yaml 0.9.25", - "tempfile", - "termcolor", - "thiserror", - "tokio", - "toml 0.7.6", - "uuid 1.2.2", - "valico", - "winapi 0.3.9", -] - -[[package]] -name = "habitat_core" -version = "0.0.0" -dependencies = [ - "base64 0.21.2", - "blake2b_simd", - "caps", - "cc", - "chrono", - "ctrlc", - "dirs", - "dns-lookup", - "errno 0.3.2", - "glob", - "habitat_win_users", - "hex", - "lazy_static 1.4.0", - "libc", - "log 0.4.20", - "native-tls", - "nix", - "num_cpus", - "os_info", - "paste", - "pem 3.0.1", - "pin-project", - "rand 0.8.5", - "rcgen", - "regex 1.7.3", - "reqwest", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "serde_test", - "sodiumoxide", - "tabwriter", - "tar", - "tempfile", - "thiserror", - "tokio", - "tokio-rustls", - "toml 0.7.6", - "url", - "webpki", - "widestring 1.0.2", - "winapi 0.3.9", - "windows-acl", - "xz2", -] - -[[package]] -name = "habitat_http_client" -version = "0.0.0" -dependencies = [ - "base64 0.21.2", - "env_proxy", - "habitat_core", - "httparse", - "log 0.4.20", - "native-tls", - "pem 3.0.1", - "reqwest", - "serde", - "serde_json", - "tempfile", - "url", -] - -[[package]] -name = "habitat_pkg_export_container" -version = "0.0.0" -dependencies = [ - "anyhow", - "base64 0.21.2", - "clap", - "env_logger", - "hab", - "habitat_common", - "habitat_core", - "handlebars 0.29.1", - "lazy_static 1.4.0", - "linked-hash-map", - "log 0.4.20", - "rusoto_core", - "rusoto_credential", - "rusoto_ecr", - "serde", - "serde_json", - "tempfile", - "termcolor", - "thiserror", - "tokio", - "url", -] - -[[package]] -name = "habitat_pkg_export_tar" -version = "0.0.0" -dependencies = [ - "anyhow", - "clap", - "env_logger", - "flate2", - "habitat_common", - "habitat_core", - "handlebars 0.29.1", - "lazy_static 1.4.0", - "log 0.4.20", - "mktemp", - "serde", - "serde_json", - "tar", - "tempfile", - "thiserror", - "tokio", - "url", -] - -[[package]] -name = "habitat_sup" -version = "0.0.0" -dependencies = [ - "actix-rt", - "actix-web", - "anyhow", - "byteorder", - "bytes", - "caps", - "clap", - "configopt", - "cpu-time", - "ctrlc", - "derivative", - "fs2", - "futures", - "glob", - "hab", - "habitat-launcher-client", - "habitat-launcher-protocol", - "habitat-sup-protocol", - "habitat_api_client", - "habitat_butterfly", - "habitat_common", - "habitat_core", - "habitat_http_client", - "hyper", - "lazy_static 1.4.0", - "libc", - "log 0.4.20", - "log4rs", - "mio 0.8.8", - "multimap 0.9.0", - "nix", - "notify", - "num_cpus", - "parking_lot", - "pin-project", - "prometheus", - "prost", - "prost-build", - "prost-types", - "rand 0.8.5", - "rants", - "regex 1.7.3", - "reqwest", - "rustls", - "rustls-pemfile", - "serde", - "serde-transcode", - "serde_derive", - "serde_json", - "serde_yaml 0.9.25", - "state", - "structopt", - "tempfile", - "termcolor", - "thiserror", - "tokio", - "tokio-rustls", - "tokio-util 0.7.8", - "toml 0.7.6", - "url", - "uuid 1.2.2", - "valico", - "winapi 0.3.9", -] - -[[package]] -name = "habitat_win_users" -version = "0.0.0" -dependencies = [ - "cc", - "log 0.4.20", - "widestring 1.0.2", - "winapi 0.3.9", -] - -[[package]] -name = "handlebars" -version = "0.28.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bed53dfb11098ec893ed54aa8b9828ffb98d28acbe56a49419935e5a8688ca9" -dependencies = [ - "lazy_static 0.2.11", - "log 0.3.9", - "pest 0.3.3", - "quick-error", - "regex 0.2.11", - "serde", - "serde_json", -] - -[[package]] -name = "handlebars" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb04af2006ea09d985fef82b81e0eb25337e51b691c76403332378a53d521edc" -dependencies = [ - "lazy_static 0.2.11", - "log 0.3.9", - "pest 0.3.3", - "quick-error", - "regex 0.2.11", - "serde", - "serde_json", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac", - "digest 0.9.0", -] - -[[package]] -name = "http" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.1", -] - -[[package]] -name = "http-body" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa 1.0.1", - "pin-project-lite", - "socket2 0.4.9", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "winapi 0.3.9", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[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 = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[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", -] - -[[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 = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.2", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - -[[package]] -name = "ipc-channel" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9b32d360ae2d4662212f1d29bc8a277256f49029cea20fd6c182b89819aea7" -dependencies = [ - "bincode", - "crossbeam-channel 0.4.4", - "fnv", - "lazy_static 1.4.0", - "libc", - "mio 0.6.23", - "rand 0.7.3", - "serde", - "tempfile", - "uuid 0.8.2", - "winapi 0.3.9", -] - -[[package]] -name = "ipnet" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" - -[[package]] -name = "is-terminal" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" -dependencies = [ - "hermit-abi 0.3.2", - "io-lifetimes", - "rustix 0.36.8", - "windows-sys 0.45.0", -] - -[[package]] -name = "itertools" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - -[[package]] -name = "itoa" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" - -[[package]] -name = "js-sys" -version = "0.3.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce791b7ca6638aae45be056e068fc756d871eb3b3b10b8efa62d1c9cec616752" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json-pointer" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe841b94e719a482213cee19dd04927cf412f26d8dc84c5a446c081e49c2997" -dependencies = [ - "serde_json", -] - -[[package]] -name = "jsonway" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effcb749443c905fbaef49d214f8b1049c240e0adb7af9baa0e201e625e4f9de" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "kqueue" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - -[[package]] -name = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" - -[[package]] -name = "lazy_static" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "libsodium-sys" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b779387cd56adfbc02ea4a668e704f729be8d6a6abd2c27ca5ee537849a92fd" -dependencies = [ - "cc", - "libc", - "pkg-config", - "walkdir", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[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.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "linux-raw-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" - -[[package]] -name = "local-channel" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6246c68cf195087205a0512559c97e15eaf95198bf0e206d662092cdcb03fe9f" -dependencies = [ - "futures-core", - "futures-sink", - "futures-util", - "local-waker", -] - -[[package]] -name = "local-waker" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f9a2d3e27ce99ce2c3aad0b09b1a7b916293ea9b2bf624c13fe646fadd8da4" - -[[package]] -name = "lock_api" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -dependencies = [ - "log 0.4.20", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -dependencies = [ - "serde", -] - -[[package]] -name = "log-mdc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" - -[[package]] -name = "log4rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36ca1786d9e79b8193a68d480a0907b612f109537115c6ff655a3a1967533fd" -dependencies = [ - "anyhow", - "arc-swap", - "chrono", - "derivative", - "fnv", - "humantime", - "libc", - "log 0.4.20", - "log-mdc", - "parking_lot", - "serde", - "serde-value", - "serde_json", - "serde_yaml 0.8.26", - "thiserror", - "thread-id", - "typemap-ors", - "winapi 0.3.9", -] - -[[package]] -name = "loom" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2111607c723d7857e0d8299d5ce7a0bf4b844d3e44f8de136b13da513eaf8fc4" -dependencies = [ - "cfg-if 1.0.0", - "generator", - "scoped-tls", - "serde", - "serde_json", -] - -[[package]] -name = "lzma-sys" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e06754c4acf47d49c727d5665ca9fb828851cda315ed3bd51edd148ef78a8772" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "md-5" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "memchr" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" - -[[package]] -name = "memoffset" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metadeps" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b122901b3a675fac8cecf68dcb2f0d3036193bc861d1ac0e1c337f7d5254c2" -dependencies = [ - "error-chain", - "pkg-config", - "toml 0.2.1", -] - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[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.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[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.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log 0.4.20", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "log 0.4.20", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - -[[package]] -name = "mktemp" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bdc1f74dd7bb717d39f784f844e490d935b3aa7e383008006dbbf29c1f7820a" -dependencies = [ - "uuid 1.2.2", -] - -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] -name = "multimap" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70db9248a93dc36a36d9a47898caa007a32755c7ad140ec64eeeb50d5a730631" -dependencies = [ - "serde", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static 1.4.0", - "libc", - "log 0.4.20", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "net2" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", - "memoffset 0.7.1", - "pin-utils", - "static_assertions", -] - -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -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 0.5.8", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log 0.4.20", - "mio 0.8.8", - "walkdir", - "windows-sys 0.48.0", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.2", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "object" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55827317fb4c08822499848a14237d2874d6f139828893017237e7ab93eb386" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl" -version = "0.10.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "openssl-probe" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" - -[[package]] -name = "openssl-src" -version = "111.25.0+1.1.1t" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-float" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039f02eb0f69271f26abe3202189275d7aa2258b903cb0281b5de710a2570ff3" -dependencies = [ - "num-traits", -] - -[[package]] -name = "os_info" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" -dependencies = [ - "log 0.4.20", - "serde", - "winapi 0.3.9", -] - -[[package]] -name = "owning_ref" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" -dependencies = [ - "stable_deref_trait", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37" -dependencies = [ - "backtrace", - "cfg-if 1.0.0", - "libc", - "petgraph", - "redox_syscall 0.2.10", - "smallvec", - "thread-id", - "windows-sys 0.34.0", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pbr" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5827dfa0d69b6c92493d6c38e633bbaa5937c153d0d7c28bf12313f8c6d514" -dependencies = [ - "crossbeam-channel 0.5.8", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "pem" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" -dependencies = [ - "base64 0.21.2", - "serde", -] - -[[package]] -name = "pem" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3127afbfc30b4cad60c34aeb741fb562a808642b81142bcf4afb73142da960" -dependencies = [ - "base64 0.21.2", - "serde", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pest" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6dda33d67c26f0aac90d324ab2eb7239c819fc7b2552fe9faa4fe88441edc8" - -[[package]] -name = "pest" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -dependencies = [ - "ucd-trie", -] - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.0.0", -] - -[[package]] -name = "phf" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" -dependencies = [ - "phf_shared", - "rand 0.8.5", -] - -[[package]] -name = "phf_shared" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" - -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -[[package]] -name = "prettyplease" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" -dependencies = [ - "proc-macro2", - "syn 1.0.104", -] - -[[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.104", - "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.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proc_macro_roids" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06675fa2c577f52bcf77fbb511123927547d154faa08097cc012c66ec3c9611a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "prometheus" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" -dependencies = [ - "cfg-if 1.0.0", - "fnv", - "lazy_static 1.4.0", - "memchr", - "parking_lot", - "protobuf", - "thiserror", -] - -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" -dependencies = [ - "bytes", - "heck 0.4.0", - "itertools", - "lazy_static 1.4.0", - "log 0.4.20", - "multimap 0.8.3", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex 1.7.3", - "syn 1.0.104", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost", -] - -[[package]] -name = "protobuf" -version = "2.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020f86b07722c5c4291f7c723eac4676b3892d47d9a7708dc2779696407f039b" - -[[package]] -name = "psl" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac31add97d7c393248c273c9f862bcfd396e870db1ff5dec63e0e707db82ae4" -dependencies = [ - "psl-types", -] - -[[package]] -name = "psl-types" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[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 0.6.3", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom 0.2.3", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rants" -version = "0.6.0" -source = "git+https://github.com/habitat-sh/rants.git#7fd1434ecaaf9af743ccab1840034f5d71329935" -dependencies = [ - "bytes", - "futures", - "log 0.4.20", - "native-tls", - "nom", - "owning_ref", - "pin-project", - "rand 0.8.5", - "serde", - "serde_json", - "tokio", - "tokio-native-tls", - "tokio-stream", - "tokio-util 0.7.8", - "uuid 1.2.2", -] - -[[package]] -name = "rcgen" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4954fbc00dcd4d8282c987710e50ba513d351400dbdd00e803a05172a90d8976" -dependencies = [ - "pem 2.0.1", - "ring", - "time 0.3.11", - "yasna", -] - -[[package]] -name = "redox_syscall" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" -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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" -dependencies = [ - "getrandom 0.2.3", - "redox_syscall 0.2.10", -] - -[[package]] -name = "regex" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" -dependencies = [ - "aho-corasick 0.6.10", - "memchr", - "regex-syntax 0.5.6", - "thread_local", - "utf8-ranges", -] - -[[package]] -name = "regex" -version = "1.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" -dependencies = [ - "aho-corasick 0.7.18", - "memchr", - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-syntax" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" -dependencies = [ - "ucd-util", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "reqwest" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f242f1488a539a79bac6dbe7c8609ae43b7914b7736210f239a37cccb32525" -dependencies = [ - "base64 0.13.1", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "lazy_static 1.4.0", - "log 0.4.20", - "mime", - "native-tls", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tokio-util 0.6.10", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg 0.7.0", -] - -[[package]] -name = "retry" -version = "1.0.0" -source = "git+https://github.com/habitat-sh/retry#42c71e75aa231d8bf9befa7a0ec93dd570a21454" -dependencies = [ - "rand 0.8.5", - "tokio", -] - -[[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 0.3.9", -] - -[[package]] -name = "rusoto_core" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db30db44ea73551326269adcf7a2169428a054f14faf9e1768f2163494f2fa2" -dependencies = [ - "async-trait", - "base64 0.13.1", - "bytes", - "crc32fast", - "futures", - "http", - "hyper", - "hyper-tls", - "lazy_static 1.4.0", - "log 0.4.20", - "rusoto_credential", - "rusoto_signature", - "rustc_version 0.4.0", - "serde", - "serde_json", - "tokio", - "xml-rs", -] - -[[package]] -name = "rusoto_credential" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee0a6c13db5aad6047b6a44ef023dbbc21a056b6dab5be3b79ce4283d5c02d05" -dependencies = [ - "async-trait", - "chrono", - "dirs-next", - "futures", - "hyper", - "serde", - "serde_json", - "shlex", - "tokio", - "zeroize", -] - -[[package]] -name = "rusoto_ecr" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2acfd092a618d37dbfb6f42e519c6e530a11115859a3e1f03d1daf8cc648d09" -dependencies = [ - "async-trait", - "bytes", - "futures", - "rusoto_core", - "serde", - "serde_json", -] - -[[package]] -name = "rusoto_signature" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ae95491c8b4847931e291b151127eccd6ff8ca13f33603eb3d0035ecb05272" -dependencies = [ - "base64 0.13.1", - "bytes", - "chrono", - "digest 0.9.0", - "futures", - "hex", - "hmac", - "http", - "hyper", - "log 0.4.20", - "md-5", - "percent-encoding", - "pin-project-lite", - "rusoto_credential", - "rustc_version 0.4.0", - "serde", - "sha2", - "tokio", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" - -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.18", -] - -[[package]] -name = "rustix" -version = "0.36.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" -dependencies = [ - "bitflags 1.3.2", - "errno 0.2.8", - "io-lifetimes", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustix" -version = "0.38.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" -dependencies = [ - "bitflags 2.4.0", - "errno 0.3.2", - "libc", - "linux-raw-sys 0.4.3", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "log 0.4.20", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64 0.21.2", -] - -[[package]] -name = "rustversion" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088" - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static 1.4.0", - "winapi 0.3.9", -] - -[[package]] -name = "scoped-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest 2.1.3", -] - -[[package]] -name = "serde" -version = "1.0.185" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-transcode" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590c0e25c2a5bb6e85bf5c1bce768ceb86b316e7a01bdf07d2cb4ec2271990e2" -dependencies = [ - "serde", -] - -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.185" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", -] - -[[package]] -name = "serde_json" -version = "1.0.105" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" -dependencies = [ - "indexmap 2.0.0", - "itoa 1.0.1", - "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_urlencoded" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" -dependencies = [ - "form_urlencoded", - "itoa 0.4.7", - "ryu", - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" -dependencies = [ - "indexmap 1.9.2", - "ryu", - "serde", - "yaml-rust", -] - -[[package]] -name = "serde_yaml" -version = "0.9.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" -dependencies = [ - "indexmap 2.0.0", - "itoa 1.0.1", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "sha1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77f4e7f65455545c2153c1253d25056825e77ee2533f0e41deb65a93a34852f" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures 0.2.5", - "digest 0.10.3", -] - -[[package]] -name = "sha2" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures 0.1.5", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "shlex" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a568c8f2cd051a4d283bd6eb0343ac214c1b0f1ac19f93e1175b2dee38c73d" - -[[package]] -name = "signal-hook-registry" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19772be3c4dd2ceaacf03cb41d5885f2a02c4d8804884918e3a258480803335" - -[[package]] -name = "siphasher" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729a25c17d72b06c68cb47955d44fda88ad2d3e7d77e025663fdd69b93dd71a1" - -[[package]] -name = "slab" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" - -[[package]] -name = "smallvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "socket2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "sodiumoxide" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e26be3acb6c2d9a7aac28482586a7856436af4cfe7100031d219de2d2ecb0028" -dependencies = [ - "ed25519", - "libc", - "libsodium-sys", - "serde", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "state" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8" -dependencies = [ - "loom", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "structopt" -version = "0.3.15" -source = "git+https://github.com/habitat-sh/structopt.git#63c56f42ae330b15f44a86c160b0cf6868b90a6f" -dependencies = [ - "clap", - "lazy_static 1.4.0", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.8" -source = "git+https://github.com/habitat-sh/structopt.git#63c56f42ae330b15f44a86c160b0cf6868b90a6f" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tabwriter" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36205cfc997faadcc4b0b87aaef3fbedafe20d38d4959a7ca6ff803564051111" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tee" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c12559dba7383625faaff75be24becf35bfc885044375bcab931111799a3da" - -[[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "redox_syscall 0.3.5", - "rustix 0.38.4", - "windows-sys 0.48.0", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "test-probe" -version = "0.1.0" -dependencies = [ - "actix-rt", - "actix-web", - "clap", - "serde", - "serde_json", - "toml 0.7.6", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", -] - -[[package]] -name = "thread-id" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f" -dependencies = [ - "libc", - "redox_syscall 0.2.10", - "winapi 0.3.9", -] - -[[package]] -name = "thread_local" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -dependencies = [ - "lazy_static 1.4.0", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217" -dependencies = [ - "itoa 1.0.1", - "libc", - "num_threads", -] - -[[package]] -name = "tinyvec" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio 0.8.8", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.3", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-stream" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util 0.7.8", -] - -[[package]] -name = "tokio-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log 0.4.20", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "futures-util", - "hashbrown 0.12.3", - "pin-project-lite", - "slab", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4" - -[[package]] -name = "toml" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" -dependencies = [ - "indexmap 2.0.0", - "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.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78" -dependencies = [ - "indexmap 2.0.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" - -[[package]] -name = "tracing" -version = "0.1.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" -dependencies = [ - "cfg-if 1.0.0", - "log 0.4.20", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "typemap-ors" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a68c24b707f02dd18f1e4ccceb9d49f2058c2fb86384ef9972592904d7a28867" -dependencies = [ - "unsafe-any-ors", -] - -[[package]] -name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" - -[[package]] -name = "ucd-util" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85f514e095d348c279b1e5cd76795082cf15bd59b93207832abe0b1d8fed236" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" - -[[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-segmentation" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unsafe-any-ors" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a303d30665362d9680d7d91d78b23f5f899504d4f08b3c4cf08d055d87c0ad" -dependencies = [ - "destructure_traitobject", -] - -[[package]] -name = "unsafe-libyaml" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "uritemplate-next" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcde98d1fc3f528255b1ecb22fb688ee0d23deb672a8c57127df10b98b4bd18c" -dependencies = [ - "regex 1.7.3", -] - -[[package]] -name = "url" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf8-ranges" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" - -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.3", -] - -[[package]] -name = "uuid" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" -dependencies = [ - "getrandom 0.2.3", -] - -[[package]] -name = "valico" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a0a4df97f827fcbcbe69c65364acddddf3a4bb50e6507f63361177a7ea7a4" -dependencies = [ - "addr", - "base64 0.21.2", - "chrono", - "downcast-rs", - "erased-serde", - "fancy-regex", - "json-pointer", - "jsonway", - "percent-encoding", - "phf", - "phf_codegen", - "serde", - "serde_json", - "uritemplate-next", - "url", - "uuid 1.2.2", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log 0.4.20", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[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.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b608ecc8f4198fe8680e2ed18eccab5f0cd4caaf3d83516fa5fb2e927fda2586" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "580aa3a91a63d23aac5b6b267e2d13cb4f363e31dce6c352fca4752ae12e479f" -dependencies = [ - "bumpalo", - "lazy_static 1.4.0", - "log 0.4.20", - "proc-macro2", - "quote", - "syn 1.0.104", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16646b21c3add8e13fdb8f20172f8a28c3dbf62f45406bcff0233188226cfe0c" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171ebf0ed9e1458810dfcb31f2e766ad6b3a89dbda42d8901f2b268277e5f09c" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2657dd393f03aa2a659c25c6ae18a13a4048cebd220e147933ea837efc589f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.104", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e0c4a743a309662d45f4ede961d7afa4ba4131a59a639f29b0069c3798bbcc2" - -[[package]] -name = "web-sys" -version = "0.3.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c70a82d842c9979078c772d4a1344685045f1a5628f677c2b2eab4dd7d2696" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" -dependencies = [ - "webpki", -] - -[[package]] -name = "which" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" -dependencies = [ - "either", - "lazy_static 1.4.0", - "libc", -] - -[[package]] -name = "widestring" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" - -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[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-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[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 0.3.9", -] - -[[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-acl" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177b1723986bcb4c606058e77f6e8614b51c7f9ad2face6f6fd63dd5c8b3cec3" -dependencies = [ - "field-offset", - "libc", - "widestring 0.4.3", - "winapi 0.3.9", -] - -[[package]] -name = "windows-sys" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825" -dependencies = [ - "windows_aarch64_msvc 0.34.0", - "windows_i686_gnu 0.34.0", - "windows_i686_msvc 0.34.0", - "windows_x86_64_gnu 0.34.0", - "windows_x86_64_msvc 0.34.0", -] - -[[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.1", -] - -[[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.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "winnow" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winreg" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "xattr" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" -dependencies = [ - "libc", -] - -[[package]] -name = "xml-rs" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c" - -[[package]] -name = "xz2" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" -dependencies = [ - "lzma-sys", -] - -[[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 = "yasna" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" -dependencies = [ - "time 0.3.11", -] - -[[package]] -name = "zeroize" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd" - -[[package]] -name = "zmq" -version = "0.9.2" -source = "git+https://github.com/habitat-sh/rust-zmq?branch=v0.9.2-symlinks-removed#048f33ed4b9241a2c63b4c9b61fdf8bcd142ae00" -dependencies = [ - "bitflags 1.3.2", - "libc", - "log 0.4.20", - "zmq-sys", -] - -[[package]] -name = "zmq-sys" -version = "0.11.0" -source = "git+https://github.com/habitat-sh/rust-zmq?branch=v0.9.2-symlinks-removed#048f33ed4b9241a2c63b4c9b61fdf8bcd142ae00" -dependencies = [ - "libc", - "metadeps", -] diff --git a/pkgs/by-name/ha/habitat/package.nix b/pkgs/by-name/ha/habitat/package.nix index cfc5e8361f32..e33b1c62e48e 100644 --- a/pkgs/by-name/ha/habitat/package.nix +++ b/pkgs/by-name/ha/habitat/package.nix @@ -13,26 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "habitat"; - version = "1.6.848"; + version = "1.6.1243"; src = fetchFromGitHub { owner = "habitat-sh"; repo = "habitat"; rev = version; - hash = "sha256-oK9ZzENwpEq6W1qnhSgkr7Rhy7Fxt/BS4U5nxecyPu8="; + hash = "sha256-+5If4veDOGTTIhYxhAiq1cC4Sy6vAmjX5hrmUmpGlFU="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "clap-2.33.1" = "sha256-ixyNr91VNB2ce2cIr0CdPmvKYRlckhKLeaSbqxouIAY="; - "configopt-0.1.0" = "sha256-76MeSoRD796ZzBqX3CoDJnunekVo2XfctpxrpspxmAU="; - "rants-0.6.0" = "sha256-B8uDoiqddCki3j7aC8kilEcmJjvB4ICjZjjTun2UEkY="; - "retry-1.0.0" = "sha256-ZaHnzOCelV4V0+MTIbH3DXxdz8QZVgcMq2YeV0S6X6o="; - "structopt-0.3.15" = "sha256-0vIX7J7VktKytT3ZnOm45qPRMHDkdJg20eU6pZBIH+Q="; - "zmq-0.9.2" = "sha256-bsDCPYLb9hUr6htPQ7rSoasKAqoWBx5FiEY1gOOtdJQ="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-AI7Ij9F/K/chjxQUC0SnBsQQPLlVS6esa5LJAGRS9YI="; nativeBuildInputs = [ pkg-config From 1f125409e26f9c852699457ab96bb233f0fb923c Mon Sep 17 00:00:00 2001 From: Neyts Zupan Date: Thu, 20 Mar 2025 10:21:59 +0000 Subject: [PATCH 139/160] paretosecurity: 0.0.87 -> 0.0.88 Tests have been fixed to no longer do network access. --- pkgs/by-name/pa/paretosecurity/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix index 34d5ad430a38..6a128e775047 100644 --- a/pkgs/by-name/pa/paretosecurity/package.nix +++ b/pkgs/by-name/pa/paretosecurity/package.nix @@ -9,18 +9,15 @@ buildGoModule rec { pname = "paretosecurity"; - version = "0.0.87"; + version = "0.0.88"; src = fetchFromGitHub { owner = "ParetoSecurity"; repo = "agent"; rev = version; - hash = "sha256-SgMALLuGq4HGj5eo7JdvtcWOEGuUoLyC3pgamB1WBzI="; + hash = "sha256-UVnZhkajrc9q6AZvIU7oi931ugxkiVSPk1NugAERnek="; }; - # tests do network access, fix pending - doCheck = false; - vendorHash = "sha256-HReQu23sHLaxc5N8h2vYv64ruJPmY4HM9whAEKV+3Eo="; proxyVendor = true; From 309676a63ded3da1753f31e549145570c47f3fd2 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 20 Mar 2025 12:56:33 +0100 Subject: [PATCH 140/160] chromium,chromedriver: 134.0.6998.88 -> 134.0.6998.117 https://chromereleases.googleblog.com/2025/03/stable-channel-update-for-desktop_19.html This update includes 2 security fixes. CVEs: CVE-2025-2476 --- .../networking/browsers/chromium/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index f0434cc6c658..334a99b1dc1d 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,9 +1,9 @@ { "chromium": { - "version": "134.0.6998.88", + "version": "134.0.6998.117", "chromedriver": { - "hash_darwin": "sha256-UtXlvBUnMZpCXT/xI7l4nfv3EgJZgugP1/fVg4rKgk4=", - "hash_darwin_aarch64": "sha256-yWRVP5LaEEhHfKkV0UmC7cpEuSnU5sgL3C/Aa2Ri3sc=" + "hash_darwin": "sha256-/o95v3X6mot2yReOEazoCNvfhuDm6xy/O1ksb0blWzU=", + "hash_darwin_aarch64": "sha256-9CFDVWt/UPg1mgP1lc7uVrzNV6Eiy8Ze/svoJNmT8Mw=" }, "deps": { "depot_tools": { @@ -19,8 +19,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "7e3d5c978c6d3a6eda25692cfac7f893a2b20dd0", - "hash": "sha256-4RRB7uYI3I7c1dSypU2gzF9TCA2MJ7yStKEvm6vfSnE=", + "rev": "cbb247b860ca6b9b18dfa791157e274eab8cad6e", + "hash": "sha256-StWP7bsmD5Byn9uLZz6mo/OTChUsW1Y0RhxuofsPLbY=", "recompress": true }, "src/third_party/clang-format/script": { @@ -615,8 +615,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "fb519f2fe5d4409bc0033a4ae00ab9a7095fe566", - "hash": "sha256-Y0KtUKn6DxpxVLRM+jPvUPhPzekTAma1HYs27xlJlkw=" + "rev": "aefbd9403c1b3032ad4cd0281ef312ed262c7125", + "hash": "sha256-tP6DnMeOoVqfTSn6bYXMLiCb4wg5f9uB28KzYMAeBUw=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -780,8 +780,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "a57459aad9ec3ed5f78d9ded700d52e31029efd2", - "hash": "sha256-IE1X6lfMyoXsN+7ebJ3RWXAgpR98AjituL3faQbNag0=" + "rev": "4f282ae4acae85cdcc8c167cbc296a86d24c1cf6", + "hash": "sha256-wpz9W/ZurpCT/dGIHGpmdkI3dsXbP8TPNeee2w9zBU8=" } } }, From 90a8ed2d163780a60b7afa19374c44791531c4ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 12:45:21 +0000 Subject: [PATCH 141/160] vpl-gpu-rt: 25.1.3 -> 25.1.4 --- pkgs/by-name/vp/vpl-gpu-rt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix index 525100f2e2f5..ffb6cfe30a37 100644 --- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix +++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "vpl-gpu-rt"; - version = "25.1.3"; + version = "25.1.4"; outputs = [ "out" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "vpl-gpu-rt"; rev = "intel-onevpl-${version}"; - hash = "sha256-9ycPPdXEa1bSpVG3mIJc8bq3pNNf0Iie1LGBRpv/Lto="; + hash = "sha256-pu9iEAhQE7eHmrjzsyWtIecT79vcZyr5QfPq/Ce3Xxg="; }; nativeBuildInputs = [ cmake pkg-config ]; From ecbe4f7ff2acb1b3dc8d8322aa8b65d7adbc28ac Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Thu, 20 Mar 2025 13:13:09 +0000 Subject: [PATCH 142/160] umu-launcher-unwrapped: add update script --- pkgs/by-name/um/umu-launcher-unwrapped/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix index 967103de982f..0f775632bc07 100644 --- a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix +++ b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, hatch, lib, + nix-update-script, python3Packages, rustPlatform, scdoc, @@ -83,6 +84,8 @@ python3Packages.buildPythonPackage rec { "test_parse_args_noopts" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Unified launcher for Windows games on Linux using the Steam Linux Runtime and Tools"; changelog = "https://github.com/Open-Wine-Components/umu-launcher/releases/tag/${version}"; From feed8f206d30a93b4f21bae8b0b83ed3a5b5120d Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Thu, 20 Mar 2025 13:14:48 +0000 Subject: [PATCH 143/160] umu-launcher{-unwrapped}: 1.2.5 -> 1.2.6 --- pkgs/by-name/um/umu-launcher-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix index 0f775632bc07..cb5f94e2922c 100644 --- a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix +++ b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix @@ -14,18 +14,18 @@ }: python3Packages.buildPythonPackage rec { pname = "umu-launcher-unwrapped"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "Open-Wine-Components"; repo = "umu-launcher"; tag = version; - hash = "sha256-bZ6Ywc524NrapkFrwFiWbqmVe1j0hunEH9YKrYQ8R2E="; + hash = "sha256-DkfB78XhK9CXgN/OpJZTjwHB7IcLC4h2HM/1JW42ZO0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-nU4xZn9NPd7NgexiaNYLdo4BCbH98duZ07XYeUiceP0="; + hash = "sha256-JhNErFDJsM20BhgIgJSUBeNzAst8f+s1NzpLfl2m2es="; }; nativeCheckInputs = [ From eb77f31202f9b98b645c0f53d0de699276310ca9 Mon Sep 17 00:00:00 2001 From: isabel Date: Thu, 20 Mar 2025 09:54:43 +0000 Subject: [PATCH 144/160] wakapi: 2.12.3 -> 2.13.1 --- pkgs/by-name/wa/wakapi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix index 87aa0da39261..38b539035c56 100644 --- a/pkgs/by-name/wa/wakapi/package.nix +++ b/pkgs/by-name/wa/wakapi/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "2.12.3"; + version = "2.13.1"; in buildGoModule { pname = "wakapi"; @@ -14,10 +14,10 @@ buildGoModule { owner = "muety"; repo = "wakapi"; tag = version; - hash = "sha256-kgzxeU5hM9fSidyJEmdTr26/w5OaBk1VdjSztmOgMYs="; + hash = "sha256-zasMqEvSqylJWKjS5TKYKmGJnGfCUEOq2UvsVUeizBw="; }; - vendorHash = "sha256-q5o88fwc1S14ZwGyDS9aFtJMfPZ4pmMjffmeXODhajg="; + vendorHash = "sha256-b2FOdCXmSgFzdXLnxt/V7+cuESWXVXVRmT53DgLwZYI="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; From a9be2d904d16da72366156fa467e268024c51fb9 Mon Sep 17 00:00:00 2001 From: isabel Date: Thu, 20 Mar 2025 09:55:31 +0000 Subject: [PATCH 145/160] wakapi: add update script --- pkgs/by-name/wa/wakapi/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix index 38b539035c56..e6d9ac1b50f2 100644 --- a/pkgs/by-name/wa/wakapi/package.nix +++ b/pkgs/by-name/wa/wakapi/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, }: let version = "2.13.1"; @@ -30,6 +31,10 @@ buildGoModule { "-w" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { homepage = "https://wakapi.dev/"; changelog = "https://github.com/muety/wakapi/releases/tag/${version}"; From e32e29f5249508f310eed6eb230b3f728ca99684 Mon Sep 17 00:00:00 2001 From: isabel Date: Thu, 20 Mar 2025 09:56:33 +0000 Subject: [PATCH 146/160] wakapi: add nixosTest to passthru --- pkgs/by-name/wa/wakapi/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix index e6d9ac1b50f2..af0f7680fe4d 100644 --- a/pkgs/by-name/wa/wakapi/package.nix +++ b/pkgs/by-name/wa/wakapi/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + nixosTests, nix-update-script, }: let @@ -32,6 +33,7 @@ buildGoModule { ]; passthru = { + nixos = nixosTests.wakapi; updateScript = nix-update-script { }; }; From 484a0477d83c9369af0213b83d08a52e4a12f327 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sun, 19 Jan 2025 16:39:44 +0100 Subject: [PATCH 147/160] lib/types: types.either deprecate functor.wrapped in favor of functor.payload.elemType --- doc/release-notes/rl-2505.section.md | 1 + lib/tests/modules.sh | 8 ++++++++ lib/tests/modules/deprecated-wrapped.nix | 10 ++++++++++ lib/types.nix | 6 +++--- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index e949e7b451eb..e386ead66797 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -79,6 +79,7 @@ - `lib.types.nullOr` - `lib.types.functionTo` - `lib.types.coercedTo` + - `lib.types.either` - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6. diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 2f21e466450d..e623c0fb55b8 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -439,6 +439,14 @@ NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribu NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.functor.wrapped ./deprecated-wrapped.nix NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.finalType.functor.wrapped ./deprecated-wrapped.nix NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.coercedType.functor.wrapped ./deprecated-wrapped.nix +# either +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.functor.wrapped ./deprecated-wrapped.nix + +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.nestedTypes.left.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.nestedTypes.right.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.nestedTypes.left.functor.wrapped ./deprecated-wrapped.nix +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.nestedTypes.right.functor.wrapped ./deprecated-wrapped.nix # Even with multiple assignments, a type error should be thrown if any of them aren't valid checkConfigError 'A definition for option .* is not of type .*' \ diff --git a/lib/tests/modules/deprecated-wrapped.nix b/lib/tests/modules/deprecated-wrapped.nix index 5559cd3e9332..c50a7d79f59f 100644 --- a/lib/tests/modules/deprecated-wrapped.nix +++ b/lib/tests/modules/deprecated-wrapped.nix @@ -10,6 +10,7 @@ let nullOr functionTo coercedTo + either ; in { @@ -56,6 +57,12 @@ in options.coercedTo = mkOption { type = coercedTo (listOf types.str) lib.id (listOf types.str); }; + options.either = mkOption { + type = either (listOf types.str) (listOf types.str); + }; + options.mergedEither = mkOption { + type = either (listOf types.str) (listOf types.str); + }; } ) # Module B @@ -77,6 +84,9 @@ in options.mergedFunctionTo = mkOption { type = functionTo (listOf types.str); }; + options.mergedEither = mkOption { + type = either (listOf types.str) (listOf types.str); + }; } ) ]; diff --git a/lib/types.nix b/lib/types.nix index a03c673c1068..ee1410127b1a 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -1134,13 +1134,13 @@ rec { then t2.merge loc defs else mergeOneOption loc defs; typeMerge = f': - let mt1 = t1.typeMerge (elemAt f'.wrapped 0).functor; - mt2 = t2.typeMerge (elemAt f'.wrapped 1).functor; + let mt1 = t1.typeMerge (elemAt f'.payload.elemType 0).functor; + mt2 = t2.typeMerge (elemAt f'.payload.elemType 1).functor; in if (name == f'.name) && (mt1 != null) && (mt2 != null) then functor.type mt1 mt2 else null; - functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; }; + functor = elemTypeFunctor name { elemType = [ t1 t2 ]; }; nestedTypes.left = t1; nestedTypes.right = t2; }; From 8afffefda81459bb0ace792ac3efd84492eac7c7 Mon Sep 17 00:00:00 2001 From: DataHearth Date: Mon, 13 Jan 2025 20:40:40 +0100 Subject: [PATCH 148/160] python3Packages.pylette: init at 4.0.0 --- .../python-modules/pylette/default.nix | 68 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/development/python-modules/pylette/default.nix diff --git a/pkgs/development/python-modules/pylette/default.nix b/pkgs/development/python-modules/pylette/default.nix new file mode 100644 index 000000000000..443295029ca0 --- /dev/null +++ b/pkgs/development/python-modules/pylette/default.nix @@ -0,0 +1,68 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + scikit-learn, + typer, + requests, + pillow, + numpy, + pytestCheckHook, + opencv-python, + requests-mock, +}: +buildPythonPackage rec { + pname = "pylette"; + version = "4.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "qTipTip"; + repo = "Pylette"; + tag = version; + hash = "sha256-i8+QQpYoRfgoV9Nm/FvXSJV+TEvmaaPsPIeG+PU838Q="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + scikit-learn + pillow + requests + typer + numpy + ]; + + pythonImportsCheck = [ + "Pylette" + ]; + + pythonRelaxDeps = [ + "numpy" + "Pillow" + "typer" + ]; + + disabledTests = [ + # hangs forever + "test_color_extraction_deterministic_kmeans" + ]; + + nativeCheckInputs = [ + opencv-python + pytestCheckHook + requests-mock + typer + ]; + + meta = { + changelog = "https://github.com/qTipTip/Pylette/releases/tag/${version}"; + description = "Python library for extracting color palettes from images"; + homepage = "https://qtiptip.github.io/Pylette/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ DataHearth ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2a96787ebe0e..91c1643f8a60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12357,6 +12357,8 @@ self: super: with self; { pyleri = callPackage ../development/python-modules/pyleri { }; + pylette = callPackage ../development/python-modules/pylette { }; + pylev = callPackage ../development/python-modules/pylev { }; pylgnetcast = callPackage ../development/python-modules/pylgnetcast { }; From 32fc03cbf1318c21803673d74c09c0ef656a5446 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 20 Mar 2025 14:50:20 +0000 Subject: [PATCH 149/160] lon: init at 0.2.0 Adds a package for lon, a minimal Nix dependency / lockfile manager. --- pkgs/by-name/lo/lon/package.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/lo/lon/package.nix diff --git a/pkgs/by-name/lo/lon/package.nix b/pkgs/by-name/lo/lon/package.nix new file mode 100644 index 000000000000..9fa33e864e1f --- /dev/null +++ b/pkgs/by-name/lo/lon/package.nix @@ -0,0 +1,30 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "lon"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "nikstur"; + repo = "lon"; + tag = version; + hash = "sha256-VGvK0ahBl440NMs03WqmP7T4a1DP13yfX47YI84rlGU="; + }; + + sourceRoot = "source/rust/lon"; + + useFetchCargoVendor = true; + cargoHash = "sha256-YzQ6A1dH2D56/3inAmsE6G5rCnpWhDawxk6+FMWfhkc="; + + meta = { + description = "Lock & update Nix dependencies"; + homepage = "https://github.com/nikstur/lon"; + maintainers = with lib.maintainers; [ ma27 ]; + license = lib.licenses.mit; + mainProgram = "lon"; + }; +} From a8fe3576eccb50f8bc08beb3396704582c7f7d58 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 20 Mar 2025 16:25:37 +0100 Subject: [PATCH 150/160] ruff: 0.11.0 -> 0.11.1 Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.11.0...0.11.1 Changelog: https://github.com/astral-sh/ruff/releases/tag/0.11.1 --- pkgs/by-name/ru/ruff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 4f6def011fd7..69de5c5fecb8 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-/CVpNBOBpvQhz7X80nUHC2x7ZxxCJH8O0WAABJKEriA="; + hash = "sha256-uouy47Lzrrht3wBUiQePW7x6QJfpIce9ny/p6HNwCNY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-t2VRNmuKdl1kgZ5g2BS79PFKhJsxDHwxxuMRDcjt//k="; + cargoHash = "sha256-EaMNkliJmeKwxrnlK+aCFGvzbvVIjS0qHc9h9z9m47I="; nativeBuildInputs = [ installShellFiles ]; From bacbce25972440534a7f3352a418d41eebcb6f17 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 20 Mar 2025 10:44:53 -0500 Subject: [PATCH 151/160] vimPlugins: update on 2025-03-20 --- .../editors/vim/plugins/generated.nix | 556 +++++++++--------- .../editors/vim/plugins/overrides.nix | 9 +- 2 files changed, 285 insertions(+), 280 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 76b1ecbdd148..946f79b86085 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -70,12 +70,12 @@ final: prev: CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2025-03-14"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "b0893fff5f2d3b22155f3113381a614fd4f65a8a"; - sha256 = "1viqnzcjifpd2w00fmq66bw7mbg9wd9dh35iwacvapf524k6rk3q"; + rev = "0b0838e31fda8a52e792a5fb6b79ab68e711bc10"; + sha256 = "0d6j042hallc7g7q278i3adi14ziv6d593avl2ykxd0h9njdca4p"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; meta.hydraPlatforms = [ ]; @@ -200,12 +200,12 @@ final: prev: LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2025-03-05"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "17cb04b2fbb817e899ba057c0f3d794134a0c35d"; - sha256 = "1yhaxfjlsya3hpzxk7349ld02wz5mzjfl1130l8ifr18r7fcb855"; + rev = "675cd53462759796e5e410a9f25b9c39c286941c"; + sha256 = "0g7zx8qgxn7m8ffnm198115v0yyf3ggvh6gbvs16v618na0cqw5a"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; meta.hydraPlatforms = [ ]; @@ -369,12 +369,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2025-03-10"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "e03b50ce453b1ce9f6b7805239c52db604d740dc"; - sha256 = "17pj6lnl9dwzv5s2a40dnflxd8sx2dq0w1mm9zdx5r93m9wkxxsb"; + rev = "39015717d8b25262119df1a8dd4069b17aea8d82"; + sha256 = "11gyidsfvzpqynlx7r6bbw4qhs6ldjgkj2pj4qg3m833n0da0h3g"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.hydraPlatforms = [ ]; @@ -617,12 +617,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2025-03-06"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "2204cf08791449a6a2fd2ef187a29112eeefd989"; - sha256 = "1482md9kzyrr7mjkca3nnyqgy64q8clhi6xbvgql8qjw7ifz51mx"; + rev = "9ebc13583cff447f5493a63e99dfca526b3c3088"; + sha256 = "17mjs95jnnvsg1ihwbsa3z6hr88rvfh36pv1x4cad7hsaal3dcrg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -709,12 +709,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2025-03-14"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "1c91102112ac5addbdbf178268c61a2ead64fb2a"; - sha256 = "06nbwzjr85vxly8xanm96k9fims29ybxydzw4jywqx9awz18cfch"; + rev = "7fcc0548b03e1c7d7d269af76ea3e27b9a59f8bd"; + sha256 = "00is4hbxxk9wsd3z33gs5f2n1ll84l3myxs4vljx4n5ah6g9rc5m"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; meta.hydraPlatforms = [ ]; @@ -839,12 +839,12 @@ final: prev: arrow-nvim = buildVimPlugin { pname = "arrow.nvim"; - version = "2024-10-15"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "otavioschwanck"; repo = "arrow.nvim"; - rev = "5438c977e729a29d96bd54c8da3103154e80dbd1"; - sha256 = "1sjd0gv7ka6by3fkgh8h48jwwfxmbgm21xcj7637349mj2ciaz7c"; + rev = "9608ce6d7e6935efd423946a319f7f4041cbde93"; + sha256 = "00xz4wnmllw8pc707py0n8a5avag5wyrk165i9yl0al2y92fw5fn"; }; meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/"; meta.hydraPlatforms = [ ]; @@ -1060,12 +1060,12 @@ final: prev: augment-vim = buildVimPlugin { pname = "augment.vim"; - version = "2025-02-12"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "augmentcode"; repo = "augment.vim"; - rev = "a50e362f6c16a0c43da20f613e337a6dfd3fb94a"; - sha256 = "1m1nfiij7wxw63zjh09hc14dxd45rwb6pf48ls101fh461gffdpr"; + rev = "97418c9dfc1918fa9bdd23863ea3d2e49130727f"; + sha256 = "1sq4lpwzd2xc97l4h7zyglhg0jwg3xfw9qfidi26rz28dd1v2ivs"; }; meta.homepage = "https://github.com/augmentcode/augment.vim/"; meta.hydraPlatforms = [ ]; @@ -1138,12 +1138,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2025-03-12"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "79ef41274354a486cf4f100a7adf4a7575802ccf"; - sha256 = "15f1h1pl1jsi86d2k182lbcjaqymixjgv395x7ga0zz09k1alwdm"; + rev = "317412742990371f8e4709074da5c378456a27ff"; + sha256 = "06kxf9carklffzar4q62hgdid60v5a38w4d5wrz0864wrdyh9kjd"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; meta.hydraPlatforms = [ ]; @@ -1503,12 +1503,12 @@ final: prev: blink-cmp-git = buildVimPlugin { pname = "blink-cmp-git"; - version = "2025-03-07"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "Kaiser-Yang"; repo = "blink-cmp-git"; - rev = "2b12fe6599f85e36d4c810ebcf64e30985c6b852"; - sha256 = "0s859j7p6128lwc9p22nq59g3zhzp3m132n03qpj6h6lrrvlz6fw"; + rev = "863e0670217d0dffb9edc6ab41b676a4128f813b"; + sha256 = "0g66rhd5yd3mk2shysliz7k0sh76nr1rbfv0rqxl8kjm7jnc5nh5"; }; meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-git/"; meta.hydraPlatforms = [ ]; @@ -1529,12 +1529,12 @@ final: prev: blink-compat = buildVimPlugin { pname = "blink.compat"; - version = "2025-02-11"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.compat"; - rev = "4104671562c663d059d91a99da3780bead5bc467"; - sha256 = "0bsf8kg5s3m1xk9d4n0yl0h5xyk484hip3z8va547f6ibim9ccv4"; + rev = "2ed6d9a28b07fa6f3bface818470605f8896408c"; + sha256 = "009475xy41l4dpayswhx65q6a7djzw7rz2ycbrbpyg041y0qynqs"; }; meta.homepage = "https://github.com/Saghen/blink.compat/"; meta.hydraPlatforms = [ ]; @@ -1542,12 +1542,12 @@ final: prev: blink-copilot = buildVimPlugin { pname = "blink-copilot"; - version = "2025-03-03"; + version = "2025-03-15"; src = fetchFromGitHub { owner = "fang2hou"; repo = "blink-copilot"; - rev = "ba25d377b567232e2a2995776500fe149ca2c072"; - sha256 = "18grp9b8afrzcs95cv1mbiz030r74i7anw9yl25ckrwvibn4ppkf"; + rev = "100691cd842ff0bd957683424ad0e829f71ce262"; + sha256 = "07bmzhx053yp2ygv07d1csbdcwqzkifcd8as54fwxcmymmr7j4wf"; }; meta.homepage = "https://github.com/fang2hou/blink-copilot/"; meta.hydraPlatforms = [ ]; @@ -1581,12 +1581,12 @@ final: prev: blink-ripgrep-nvim = buildVimPlugin { pname = "blink-ripgrep.nvim"; - version = "2025-03-08"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "blink-ripgrep.nvim"; - rev = "91aee73557237b0cc1313e4ed2b32f10de6cc65e"; - sha256 = "1jg4559946rzsvvny1r7jki1gmr70yjxr8qlnsjkjyxj8h0pjjwl"; + rev = "c80675996d6c7c021a7a13dc2c8c8b9b255efdab"; + sha256 = "06c680x1ppnpz38kq0w40x732clls6403c5dx659rakksd19mif4"; }; meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/"; meta.hydraPlatforms = [ ]; @@ -1698,12 +1698,12 @@ final: prev: bufexplorer = buildVimPlugin { pname = "bufexplorer"; - version = "2025-03-05"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "0ea8aece81c3373578cf72cdcdd34a7bd64171c0"; - sha256 = "0v3fpl7jj6asx2qlnan8zkpznzg8kbn6f0ii7j8lb8nnzbahz32w"; + rev = "974252b1a3b4ba008457f178a92e1ff4f38985a6"; + sha256 = "09hxfbx76fvmbqsi4b2lpjr5vv9mx21qjvnnfi1r2dmdznnbikbd"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; meta.hydraPlatforms = [ ]; @@ -2803,12 +2803,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2025-03-12"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "385758859b6fe348f9b6c214ec35e1d9b9f46cd2"; - sha256 = "0pg5ya9qcr5iw1l9nm4pyhps1cpq5izbpavqwdni2swym5p8ba5l"; + rev = "3660d653bf24ed9555fb1ccb59b7504e7f152440"; + sha256 = "1dv1yh07d9b8f7an005am1s3n915r9xhiyv728nlxxdnsbd8cn48"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.hydraPlatforms = [ ]; @@ -2855,12 +2855,12 @@ final: prev: codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "2025-03-13"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - rev = "4f56b047f03bf5edc0d71bf0ca694243a49b912f"; - sha256 = "1mrb8qxd6mz5dlly9bh30pcd599gfy173f6pd4p8lszs3xhp598k"; + rev = "a344661b8c1eaae9a56db5c36e7f5d2101b69128"; + sha256 = "1gyakqjxxfxd27wc570c3qprinsgb7c9faq5fwx94nzybyi63ik3"; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.hydraPlatforms = [ ]; @@ -2972,12 +2972,12 @@ final: prev: command-t = buildVimPlugin { pname = "command-t"; - version = "2025-03-14"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "6033ca8e3c4ed39f8d0ca7cee134b1a4dd4ae7d9"; - sha256 = "0ic4xfhpqvxcyz9qi613hdin6mspb4abh0vfds1ck1g4mx8inwr6"; + rev = "27760ac90e0b554e3a066fe60127e45f924cc973"; + sha256 = "1rfkpzlvxh545j0s97hw138rf71a707ih4q2s70li8kqi5fissqi"; }; meta.homepage = "https://github.com/wincent/command-t/"; meta.hydraPlatforms = [ ]; @@ -3141,12 +3141,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2025-03-05"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d"; - sha256 = "13vpizk8ani64d3a9yrm0g3bz8m6m6cxnpzr2xgslbhxnkmbxq7j"; + rev = "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5"; + sha256 = "1942dsg83skxnm3jrqyxx9mvzgiq1v68i9z43hpar4bmqvggviif"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -3350,12 +3350,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2025-03-10"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "403a0abef0e2aec12749a534dc468d6fd50c6741"; - sha256 = "19ix86nbww5vljinfwfpjkz806j7dzw4pgjyjya201jb0n22lrc6"; + rev = "fd2bbca7aa588f24ffc3517831934b4c4a9588e9"; + sha256 = "1l2z447svf1ldpnsb9sn5b4q1a22g3wx126yw9hj7rcqrv50xw6i"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; meta.hydraPlatforms = [ ]; @@ -3415,12 +3415,12 @@ final: prev: csvview-nvim = buildVimPlugin { pname = "csvview.nvim"; - version = "2025-02-26"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "hat0uma"; repo = "csvview.nvim"; - rev = "ed446a55b4ff9297d9b94a955db3a2eca6cdb2b2"; - sha256 = "075qxyny89xi5awcd5blp2s8qjlafmnhw7d3vifj05g8yl76zya5"; + rev = "02edaf830c2225ec39b889173f09cbbf89da3b87"; + sha256 = "1gpw7acb2gp7xbrqkmmxwr8lldzvp4hiaqd0pv80799ny2vqr71j"; }; meta.homepage = "https://github.com/hat0uma/csvview.nvim/"; meta.hydraPlatforms = [ ]; @@ -3493,12 +3493,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2025-03-09"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "094e4eb33e7d078cbf2105604a4246092eb8046e"; - sha256 = "1nh1nxy6wqn0vlk9lpp8v8p24rlrzlcwl7y9lvhbhmlisyr5yrvj"; + rev = "339a7b1293568405847b3627247da82a6030a852"; + sha256 = "1rm1fay8r36kh32qmbsmhp1vjs9xynyqi43zn9aak6wzzpvcabmp"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; meta.hydraPlatforms = [ ]; @@ -4132,12 +4132,12 @@ final: prev: dial-nvim = buildVimPlugin { pname = "dial.nvim"; - version = "2025-01-14"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "34bbd9c387c358190e61ce71017faad3dffa7a74"; - sha256 = "0y020a3hw48ldsqaccsp5ygfb16l5i6yz718nifgds2x5cpd87m6"; + rev = "1fc4475c66b794aad3dde39414f73b2e2b26230e"; + sha256 = "0f8y11l7pxp07vdjll1vsmzi1phj05q1dwlxbsx3z25sf4hixq9h"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; meta.hydraPlatforms = [ ]; @@ -4275,12 +4275,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2025-03-05"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "009c214b6eadf49ec50fc81055ceb08ca3fcb8e1"; - sha256 = "1k969a0dycc5mkhci5v54xywmrpa97320yp2si53cza43alx9q95"; + rev = "a2f1b275fdf185567ab976d27749d4e8cc21fe4c"; + sha256 = "02a7wnkvvbivbwrfill3j97mdykb53pahhm7gqsk3lvqlxg1qfga"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; meta.hydraPlatforms = [ ]; @@ -4301,12 +4301,12 @@ final: prev: easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "2025-03-14"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "b27ec1dda7cbb0ebb224e5136005d2a48a8ad442"; - sha256 = "04js572pqwqkjcnpbpygjg3kc0cnci2j44kvij8r6yg30vnxdbab"; + rev = "dcf5d4c9a1ee634f76acfd3429b4dc2e9642042b"; + sha256 = "086khcd38d6ay0n6c1f9bhk9vn585hn7pqwprmy8ibmpynzvf0a8"; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.hydraPlatforms = [ ]; @@ -4811,12 +4811,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2025-03-06"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "nvim-flutter"; repo = "flutter-tools.nvim"; - rev = "70430c32d176f4a15c6e2c80586cd2791e3a664e"; - sha256 = "01p721ca4as9b9nn4qibb6s775fn66j13zsx2d3flhkssii06v45"; + rev = "8edcdabfe982c77482ebde2ba3f46f2adc677e64"; + sha256 = "0v8xlylc7h926wrni78m4zzlxgjnm6ff1ckx730yjg9b2rajg7kr"; }; meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; meta.hydraPlatforms = [ ]; @@ -5293,12 +5293,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2025-03-13"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "da15ca55705c57ca10de1fbc1f0b6d6327c13e55"; - sha256 = "1h5lf0ba2bpyn28wiy33gv8f9fkbjmpcz6hdsifarpgqgrfz2rby"; + rev = "f058a8c622edf24d27b8ef82fabffdbbc1d55707"; + sha256 = "1rs9frzbywlq509r33kd9rxgpn6mrdyx4byn1zbcqhj1pdfkq7rv"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; meta.hydraPlatforms = [ ]; @@ -5423,12 +5423,12 @@ final: prev: grug-far-nvim = buildVimPlugin { pname = "grug-far.nvim"; - version = "2025-03-12"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "MagicDuck"; repo = "grug-far.nvim"; - rev = "0ec6c3a9ef63703975e800d7386b6114863e1f9d"; - sha256 = "1kpilvxszp4larhw9xy663wb8sajp729iwi4jclb2sw332cr77b0"; + rev = "6b1aca6018cb6ce18a46b9e8583074a2f820b51e"; + sha256 = "156hk1mxq0v2fy2ibw1bg4n6anhg9jxgq0fq7q7kh9rms8xin6ws"; }; meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; meta.hydraPlatforms = [ ]; @@ -5671,12 +5671,12 @@ final: prev: haskell-snippets-nvim = buildVimPlugin { pname = "haskell-snippets.nvim"; - version = "2024-10-07"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "haskell-snippets.nvim"; - rev = "bd893770dd7a0c1a473601c3c919e61670745b36"; - sha256 = "1xqv1kj86rv2xmbsb4zahzvaanaha67ghwh2n24fdjx2d202f8af"; + rev = "27ac316463b9807496cd03e65289d3e79aa23528"; + sha256 = "1z49df35vzccq5jnckbmrsfpr8g6cjiq020jbwprzj8hrb769bqh"; }; meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; meta.hydraPlatforms = [ ]; @@ -6114,12 +6114,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2025-01-20"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78"; - sha256 = "1whsjd715rr59warfy7nmw0hzkxfkxgzx9c8r6k2vka4flifirnk"; + rev = "005b56001b2cb30bfa61b7986bc50657816ba4ba"; + sha256 = "1rmpi866bg7hyw620hbgmmmksxgll9ilbpigd1kk9b0lpvwxbbyj"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; meta.hydraPlatforms = [ ]; @@ -6192,12 +6192,12 @@ final: prev: intellitab-nvim = buildVimPlugin { pname = "intellitab.nvim"; - version = "2024-11-01"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "pta2002"; repo = "intellitab.nvim"; - rev = "698ea483eb91e314f472c9c119915c034479ea08"; - sha256 = "1z3vlbccwlq1z322yxnjgq8kvr3rkhj604ng6jlgccl06482vksa"; + rev = "955af8d74b07109d36729c623cb1bb232e25e16e"; + sha256 = "1cpzw7yli1ykli4ix1y2ym7qpi6m45qji4cmxns2whc5r84h84sa"; }; meta.homepage = "https://github.com/pta2002/intellitab.nvim/"; meta.hydraPlatforms = [ ]; @@ -6416,12 +6416,12 @@ final: prev: kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; - version = "2025-02-24"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "cfd67b0e1eeaa04302b8c7eb072253d24bf22d84"; - sha256 = "1qhmqn41vr496flcrji20wq6kjgsbxpzdwi8v34kd95v7b11h2d1"; + rev = "709018d5af92d2e5780bfb8a6d36e9cad01a6402"; + sha256 = "0p0bwydhpvjx5fdya10iwqkk2d0ihmkdkc1kkpi6i1cjk4ipkxws"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; meta.hydraPlatforms = [ ]; @@ -6507,12 +6507,12 @@ final: prev: kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2025-03-12"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "12f2ce784c31fbba748bf230e048e1764626f3fa"; - sha256 = "1r7b2rzb14zyyd72xbwmk80vh3ilxkfpv2b04kdir31s1466n4wj"; + rev = "7defd3663afce220c7de4fe0af6deaece90faef8"; + sha256 = "0m7c3wq5qf7n9c94lckk0ryf6p65l8j53z2n1lbrlk7mrbhsv99s"; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; meta.hydraPlatforms = [ ]; @@ -6637,12 +6637,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2025-03-12"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "c40bb6bd313b686526744b06f8e87aa71f3a2a26"; - sha256 = "1x2h8vjiv6ppdgg35xxk5qpmk29r58vxkw8k5pc0fvdm70s0jbrx"; + rev = "977c4cc16afe63c56919d296a75ea09e6d7a136c"; + sha256 = "18vi4sps7l845ldyhvrpdnqrqgjlinvb2fi5zdm43ssas1vxy7g7"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; meta.hydraPlatforms = [ ]; @@ -6702,12 +6702,12 @@ final: prev: legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2025-03-07"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "2e0c367392cb060f75f85590c2d6008aa9e31fbf"; - sha256 = "0dggn9ilv80cnrqshflv2iqcx62wph5cqn555b7pzsb3fkcycwx1"; + rev = "6de819bc285eb8c420e49e82c21d5bb696b5a727"; + sha256 = "01g87ywljszq8glzszz05hhqp83g7hfrq7fcas258fmkmdaryhp1"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; meta.hydraPlatforms = [ ]; @@ -6780,12 +6780,12 @@ final: prev: lh-vim-lib = buildVimPlugin { pname = "lh-vim-lib"; - version = "2025-02-13"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "4ad6216fff79bbda07d578cfe232f6c92110b361"; - sha256 = "0ra9pijlmxlxg9kvykq3yvhp5q0lx0xv2lrxywg9p9qsvh0q2v2y"; + rev = "4e22e197368a2e0d031489cb0f777f7c7a6c1884"; + sha256 = "1hmdn8ziin659s7pjm4z6nsvszc63iz7gp90a176xs4nsi2va3sx"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; meta.hydraPlatforms = [ ]; @@ -7001,12 +7001,12 @@ final: prev: llama-vim = buildVimPlugin { pname = "llama.vim"; - version = "2025-03-11"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.vim"; - rev = "5bc35980d3b054153eaeb19403853ed576bf4513"; - sha256 = "1p05b26w44vswz0xbq7hkj05x2x3jxs5z8i15vg8kyzj661qiqn8"; + rev = "dafa50acc4df4fe8b173c7cbfa3c5901fb7e0dec"; + sha256 = "04ksf82sfd8dnbwkk4mqzgg1xwc294im9i9isym4ziw0yman64hj"; }; meta.homepage = "https://github.com/ggml-org/llama.vim/"; meta.hydraPlatforms = [ ]; @@ -7365,12 +7365,12 @@ final: prev: markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "2025-03-14"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "8c6b0af556a3e58a831384a3b7bcca9ea77882ee"; - sha256 = "1s35qq9hsd3ah6jxmb0lmhnl7ak2vsdn4k7dmris4qsn0ppqh7wk"; + rev = "7a7d3ed0d276b32e121d791f73d850aae6d61b42"; + sha256 = "0zn7p5j8c9qp4abj6kywk6j2waf2dg9i397wxrbs8prykq2n12pn"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -7418,12 +7418,12 @@ final: prev: mason-nvim-dap-nvim = buildVimPlugin { pname = "mason-nvim-dap.nvim"; - version = "2025-02-19"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "jay-babu"; repo = "mason-nvim-dap.nvim"; - rev = "09220b99d63d5363f219daa2785242ee5fddba7f"; - sha256 = "0csay0rb2wyzx233d9ai5v38vwbqcg713rns7ldq1h63bcndsdfg"; + rev = "444aad7977ee713a4049e9d1dd9b377967d67a4c"; + sha256 = "16yfc27d02vg37ahbx9q8rjgdbqfay7p1935dh5qk7blcs510295"; }; meta.homepage = "https://github.com/jay-babu/mason-nvim-dap.nvim/"; meta.hydraPlatforms = [ ]; @@ -7457,12 +7457,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2024-12-29"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "c8ff153d2c2b22f8b2c9bcce0d741ab55c00cfed"; - sha256 = "17vcjv48fyza9gfrz4j0hdlm26ybvmf5mz0xck730n9255hp1hkv"; + rev = "96285a62923ea8e38aea7b603099752da2a97e97"; + sha256 = "1j1asmzhikwam2dvh45r0ixqznagsh1zbjq493gqwgddbx6fi6c9"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; meta.hydraPlatforms = [ ]; @@ -7717,12 +7717,12 @@ final: prev: mini-completion = buildVimPlugin { pname = "mini.completion"; - version = "2025-03-13"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.completion"; - rev = "3b14571c9febed20f386c39c07ca85c7b7a5358f"; - sha256 = "0n0pzbcmsx3qw2p17dy0vl15b6n2fml9rqfaakfqjzrkhjl3q10q"; + rev = "732b097d395e316ed5d4eeadc19837fbaf59ad7e"; + sha256 = "07ypcjw4qzqv9jjsn1qv0g1kwgv3x8590v3wkhab54529nb4rxy7"; }; meta.homepage = "https://github.com/echasnovski/mini.completion/"; meta.hydraPlatforms = [ ]; @@ -7808,12 +7808,12 @@ final: prev: mini-fuzzy = buildVimPlugin { pname = "mini.fuzzy"; - version = "2025-01-31"; + version = "2025-03-15"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.fuzzy"; - rev = "345ff7f65f50177c5567c43ec2c79973cb1278fe"; - sha256 = "18ylb8v7g21r87qkl86hng3zvw9c2q163z535m5m85dxnrxzlgcm"; + rev = "fb42763285075e316fd4250739af9b8c442503de"; + sha256 = "0hl5ygzlf73g70j7pdd1x4975368sqpynpja1zx7bc5jln698vr4"; }; meta.homepage = "https://github.com/echasnovski/mini.fuzzy/"; meta.hydraPlatforms = [ ]; @@ -7964,12 +7964,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2025-03-13"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "b21cd5b1b330844e4c4b93d65e99ecb7c79a63c9"; - sha256 = "0h5j0ppfm61iwhyrh2vqsqssw7s2ghryap9cwak9w3cbmaabmqkz"; + rev = "88f18a7d018d8bb4d32f6be4c712134a10e826d3"; + sha256 = "15sgzl2wr9pqp31qy17w4dzcrcmncavh1i8ihldhsyi4hn08zlrk"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; meta.hydraPlatforms = [ ]; @@ -8146,12 +8146,12 @@ final: prev: minuet-ai-nvim = buildVimPlugin { pname = "minuet-ai.nvim"; - version = "2025-03-08"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "milanglacier"; repo = "minuet-ai.nvim"; - rev = "b5a366a5c3d46b60eb780c9cd86cf62eb0a13891"; - sha256 = "0z8hy7gm0wipcrj0wkrb5l8bhv228fp5iihr3vr7scmn0sjd7wk2"; + rev = "a9f5269184070434669d8195a78c8f72f8229a2e"; + sha256 = "1cw43ay6n4hg6mmmfr5v00yncwm0s0w0z1x6kz4k95zw08g650y3"; }; meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/"; meta.hydraPlatforms = [ ]; @@ -8211,12 +8211,12 @@ final: prev: modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "2025-02-10"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "1f9ba82c732a49cdafc80f904286dd70f02c4310"; - sha256 = "1mlzdw5q49iggpp4r2rqqb6q2am5ds1f82d1lmz7nlk325skk48z"; + rev = "b6c46f8066b2d96cb75d5bc7202a9a4c097b5e9f"; + sha256 = "15sqscfkhy0rxycql1y2iwc6hirfvbfxww3j17586jxflj3nh0lq"; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; meta.hydraPlatforms = [ ]; @@ -8601,12 +8601,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2025-03-11"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "8c6349bceb1d8a863964dd25dc7944d588a56aaa"; - sha256 = "03lgpp5vyiyfbzig5w24ph84xbakahbfg1hqv148p0i34qf6mcbn"; + rev = "876c3298a6f822123b9b81b101d5809b1b5aa0c8"; + sha256 = "0g8hbqki1fjcqv5nzwmrdlsny9q46asvis3yw0zxq6567byyq8r4"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; meta.hydraPlatforms = [ ]; @@ -8627,12 +8627,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2025-03-14"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "5f0689934f788fc5a76a27a3873d660cea5429c9"; - sha256 = "0xkpy5mds8mj0zj3v7035hpjk8lymmav0f39kb4q95b7hparn92y"; + rev = "367600076c04a8f6b8060f61de57299c8ff0a9c3"; + sha256 = "08c0wchdmr0cg2ix42v7n2kcr6qyn9546x089rp7n83y2ml6p3zv"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.hydraPlatforms = [ ]; @@ -8679,12 +8679,12 @@ final: prev: neoformat = buildVimPlugin { pname = "neoformat"; - version = "2025-02-28"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "6a0dc851893c8bf9c932a69c4277e82b88120009"; - sha256 = "1w6bdan4hixzm26jgr9ixhvmsal5nyaa8x6rbi87j64pxrm6i0pw"; + rev = "874dcd0995db340278c41860e0209bef29d6ef87"; + sha256 = "1mgs0mgpfirn02z2ffkxv20cpffr5b3vp4np0rya5fv2v991h5x2"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; meta.hydraPlatforms = [ ]; @@ -8709,8 +8709,8 @@ final: prev: src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "0b756dd80c82da28fd7ed500eac642710ab21909"; - sha256 = "1d35xr0hm5d8gjdhg1rxqylfqkywjl6qabdgig1xbpx8l7lqfqcc"; + rev = "333968f8222fda475d3e4545a9b15fe9912ca26a"; + sha256 = "16qjyv0qcwngi9185p5bzb4xjvb2c7xpv6qnmn2hi7kald6d4wp0"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.hydraPlatforms = [ ]; @@ -8981,12 +8981,12 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2025-03-09"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "b1fec5e156a7403d12cc9d429920e492fecb0755"; - sha256 = "08wnn3z44w0qnqa9bcxj6890lhs9qgb8jx42qgfw5x728drnw781"; + rev = "ef8cdce17319ea90669066fa7e0f13729e39303c"; + sha256 = "0jxqakg6dhx49g2fhy5nxk2ap2hgj4kr6y032axw6xkn5kb79a7i"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; meta.hydraPlatforms = [ ]; @@ -9176,12 +9176,12 @@ final: prev: neotest-zig = buildVimPlugin { pname = "neotest-zig"; - version = "2024-12-27"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "lawrence-laz"; repo = "neotest-zig"; - rev = "c7a1a39626fa90e639fb640b6322739060a2acf3"; - sha256 = "095jv4m81qpgnak4rzp2y8kd4cwgfx2aw31am9m0nsv8mmp1i5w3"; + rev = "de63f3b9a182d374d2e71cf44385326682ec90e7"; + sha256 = "0bjqpxz6fa4m4gsx8qnkxy99r573hyhwj0d079m4wrg43n9n6vcx"; }; meta.homepage = "https://github.com/lawrence-laz/neotest-zig/"; meta.hydraPlatforms = [ ]; @@ -9189,12 +9189,12 @@ final: prev: neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; - version = "2024-12-29"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "283badaa983234c90e857c12c1f1c18e1544360a"; - sha256 = "16pj4pkv04ff7wx5dnkzqzv69im16bgc686qbwrs5qazph702zh0"; + rev = "f5da37a8ddd62fc3a7b28900c4d1b807a3582584"; + sha256 = "0is9gibh6lrf7x3903v06l33l8nrq1hix0sm7clc2576pk2sp050"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; meta.hydraPlatforms = [ ]; @@ -9384,12 +9384,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2025-03-09"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "43cd633951ea75cad622a881953b02094fdd4b46"; - sha256 = "1wn1r7jqz23b43qpyrmfcr4bvzfk5ajnffh9z555ca3m0zvgzsl1"; + rev = "275532b004ddda91be7626fae227aaf33302d6f0"; + sha256 = "1i7idcgw0amrrxnfr7jkh5hcdl0j4dj1zv94jvlrdkaz27hprmqi"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; meta.hydraPlatforms = [ ]; @@ -9449,12 +9449,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2025-03-11"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "a1c208fb30dc8dd0be2badf99fe076fa75284338"; - sha256 = "0digp6bmzg0gls8m5gnwci5czhmszw5m3nd8x7zq7g57dlbx46p8"; + rev = "288141e4eec5437fe2f484fce086d84f53ec88a1"; + sha256 = "0sw7dy0dqkk338n38kr2634qv3pxh619nn70ncsw9k5wnxbw99pr"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; meta.hydraPlatforms = [ ]; @@ -9696,12 +9696,12 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2025-02-14"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "68f0e5c3dab23261a945272032ee6700af86227a"; - sha256 = "1ai3s1083dx6bddhrkv7d3hyq3zsrblizbvpgl09r1w9cijxhj8m"; + rev = "6522027785b305269fa17088395dfc0f456cedd2"; + sha256 = "1i63wdgm54n3iiiix0y18mjvy2rsswc4iybqppsfpvi8cg2xjpa6"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; meta.hydraPlatforms = [ ]; @@ -9878,12 +9878,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2025-03-12"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "a720d4966f758ab22e8ec28812b6df90a53e0f02"; - sha256 = "0b979dhl5jr3kx9j5zih39jbrv22d554ws6y8g1cgsm2i3412s4h"; + rev = "6a5bba0ddea5d419a783e170c20988046376090d"; + sha256 = "0i10mybxpz0vjkyspv8jkxawph9c823ryf0khb4g8zwpixwhrpmx"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; meta.hydraPlatforms = [ ]; @@ -9956,12 +9956,12 @@ final: prev: nvim-dap-rr = buildVimPlugin { pname = "nvim-dap-rr"; - version = "2024-12-14"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "jonboh"; repo = "nvim-dap-rr"; - rev = "920e4931e383dddaa82539b4697b752fae7ff82d"; - sha256 = "1jmx08r1jrshijshls4jizhcplm1skjp1kxflm3505vz8dx4jrf7"; + rev = "9d4cb40d04b7822b075482b4fad9742aa43a87b2"; + sha256 = "1nnnk05cn7h6dv49zpwiwqzj1v3bmh56acpb6gklg28xdf4jd2v0"; }; meta.homepage = "https://github.com/jonboh/nvim-dap-rr/"; meta.hydraPlatforms = [ ]; @@ -10099,12 +10099,12 @@ final: prev: nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2025-03-14"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "af94cd45b0608755d1affa6c36851fc1e73b48bc"; - sha256 = "0v8gmnb80wgad8a24yzk03ly66lx8nj8ww06d00r4kzd5rak7gdg"; + rev = "d41a2211b8ba982c74bc190b40ba7686c2e3ffd0"; + sha256 = "0aw8vjnxydv6as5qv1sjsrj142xc4d7w1szjg6wfk7a37l24rhhm"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; meta.hydraPlatforms = [ ]; @@ -10112,12 +10112,12 @@ final: prev: nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2025-01-30"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "2bf72fbc24eecd4c32a44771dfc6c1ab5b5dbf30"; - sha256 = "0nm0jxfl8yvw7q03pl7wg18401vl6kpxbpxh5f7z9pzi5s3kq10j"; + rev = "3cb6fed3095fcc2a47c9f9843582ec0ab08736fd"; + sha256 = "1hkadfl2prh4v4npk0cyqsjdgh3b529zsvdmnng1gykjwfs06h71"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; meta.hydraPlatforms = [ ]; @@ -10307,12 +10307,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2025-02-06"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8"; - sha256 = "0b318dahzf9kd043mjsa41rj44zfbs7k8i4bz0rqhcqipr19rwhk"; + rev = "936197073214c26a347fb933c9459c8766376b23"; + sha256 = "0wvdyabxqjxm8mx07lw37j99hq4hvxhwiyzjiasi5fgq8xawb2md"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; meta.hydraPlatforms = [ ]; @@ -10359,12 +10359,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2025-03-11"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0"; - sha256 = "0l9mns71hh0jssxblr1q286z8hmxwbgyq1nw6scki9ffn23jwnz0"; + rev = "699cf2ce74e40e7c5068cf93a6bd6a74b24c5ec3"; + sha256 = "0jkqc431485rmj21pd2xahrha5dbr802ikfmjbxnax7wnqkaqbp4"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.hydraPlatforms = [ ]; @@ -10632,12 +10632,12 @@ final: prev: nvim-rip-substitute = buildVimPlugin { pname = "nvim-rip-substitute"; - version = "2025-02-28"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-rip-substitute"; - rev = "ede145f6fc318dc0e15ed9a40d2a60112eaf0b5f"; - sha256 = "1ppqig48yyhpfbghgisggcsk18q9v0yannzq48yxb4pvxnjrk52r"; + rev = "ddd3562bbd93b02eb43ddfe18af7438abe46dd98"; + sha256 = "1iwgl28pdipyk4a7hbhsm7wb1a0sglsk7zb5dgc2k2kq526yn7hr"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; meta.hydraPlatforms = [ ]; @@ -10645,12 +10645,12 @@ final: prev: nvim-scissors = buildVimPlugin { pname = "nvim-scissors"; - version = "2025-03-12"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-scissors"; - rev = "c2457e8c0163fc2d00226f78c95acb2c2bd2a549"; - sha256 = "1f7mayjgair07jia15f1ckm9adlbzrplhbhgcxix0gfa2vmzv775"; + rev = "445deedd9cc8eb91275ac15e3d6c6df5bc08bff3"; + sha256 = "1y332f5sd7fjg2kf9v8wx3dgf0c3kjdfx2s2gv90r6a7p7p83idd"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/"; meta.hydraPlatforms = [ ]; @@ -10671,12 +10671,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2025-03-12"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "24a1995392f845e8e222c1ffcaca140a9623b2a7"; - sha256 = "0qq9lzrqy0gizzn4s12hijf8f1yjdpwvh5c81f05my5nsad5h090"; + rev = "5cdf84c85b7d9664ca5b7fd6ebe5dd2c973ba876"; + sha256 = "07npxvnxhmivymns0mhzfq3i78ik5dkz8gv3d0cgpakhyj22d6sj"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; meta.hydraPlatforms = [ ]; @@ -10762,12 +10762,12 @@ final: prev: nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2025-03-13"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "f70d56275710e202af59148f52100d34b786aecb"; - sha256 = "1a20q9hfv1gh7si2ai68zf4m9jnggvvja4vqxvrimbnzx73vxrrl"; + rev = "6c54643ef42016b744888b06d2381abd23f9b7ea"; + sha256 = "1c5agqfffmjxc73bv8d4hmrnzx62ikqpv7pii19v5alfdcnh5j48"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; meta.hydraPlatforms = [ ]; @@ -10827,12 +10827,12 @@ final: prev: nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2025-03-14"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "8b79cddc708cb8549562f0101f7f509ad7cebf97"; - sha256 = "1b2sr6250gwfgakjqh48fyydq3nmdd96nfhz1rccrns1f7nqwcdy"; + rev = "ff553df2f4c5641be2b282e1a0a072c46cf03591"; + sha256 = "0xgibfj73j2241mj6vab4sbw5zxxcnfls2lahsadg0r5z7cj01lk"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.hydraPlatforms = [ ]; @@ -10840,12 +10840,12 @@ final: prev: nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2025-02-17"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "198720b4016af04c9590f375d714d5bf8afecc1a"; - sha256 = "13msw9i509ncysbgkqbl2wr1c23iw3f4mxkw30sc1yk9x9nx49ri"; + rev = "93b29a32d5f4be10e39226c6b796f28d68a8b483"; + sha256 = "12ixiqb4bj7n3kkzqi81hyhn3bjsb93250gvfy12bxya2l5bi20g"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; meta.hydraPlatforms = [ ]; @@ -10918,12 +10918,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2025-03-08"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "143856b1cee509a190cc8c17ddb0638002171235"; - sha256 = "1j5h87vrvkzgy01gijr22g6nh478naiyxw1g77gav82awgmb3pyx"; + rev = "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4"; + sha256 = "1lqxvz39d3xd6rrzazydbfg7gqd6143zz6pvq23ivgy9jan8fbfs"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; meta.hydraPlatforms = [ ]; @@ -11009,12 +11009,12 @@ final: prev: nvim-various-textobjs = buildVimPlugin { pname = "nvim-various-textobjs"; - version = "2025-02-23"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-various-textobjs"; - rev = "ea78fbdac4a2ca10e2922721233a769770afb45b"; - sha256 = "0w67k4jxp10nmkxf9b313r73j5clcpm45xqg2512lv0br6478llk"; + rev = "2788ce64fcfaa702ae3340180be592dfcd733c86"; + sha256 = "12y2j2rzxi5mfyq1qca30dznprr9db4gljmr34xwrz3v3q84dqzd"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/"; meta.hydraPlatforms = [ ]; @@ -11191,12 +11191,12 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2025-03-14"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "a4cae62fd4370f544cb597df2a767945f78a120a"; - sha256 = "0k5p66z1kb42602mh38j6vyxkawlywisn1wzydaf40zd86p8nlvr"; + rev = "3dfbc7936a9057b8370b903c9e3a115f07dae00d"; + sha256 = "1m24zzy11526vbydfl00k5z7zhmdlagckkp5lwynicsm4hz0m74m"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; meta.hydraPlatforms = [ ]; @@ -11425,12 +11425,12 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2025-03-07"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "e37053d2c6a17463e705483122eee04d41e3d4af"; - sha256 = "0sq7x2mcxl7z0j4s3a395fy0bzz13h4rxd03lp6674y6hsjxcm55"; + rev = "16fc46671b5c4e059e9f3a06d593d34d30e571c9"; + sha256 = "0k4bv870pzx5dlm16fljrmdwnw5ihda04krmcqi9pznp7harvg2g"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; meta.hydraPlatforms = [ ]; @@ -12013,12 +12013,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2025-02-20"; + version = "2025-03-14"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "93b1f5a1abc1b1da653f353947f62b294574759c"; - sha256 = "05jk3m4xxyvx90wls442fp949hij6095n8vr93dx4yyzrcghk217"; + rev = "7fd12a6c57d4575cadbf4f97552b616d62ac7e03"; + sha256 = "0r27n55bngrkcx5p0ang7yw2c0gj821sxgvawxnnp090hlb4pswi"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; meta.hydraPlatforms = [ ]; @@ -12130,12 +12130,12 @@ final: prev: range-highlight-nvim = buildVimPlugin { pname = "range-highlight.nvim"; - version = "2021-08-03"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "winston0410"; repo = "range-highlight.nvim"; - rev = "8b5e8ccb3460b2c3675f4639b9f54e64eaab36d9"; - sha256 = "1yswni0p1w7ja6cddxyd3m4hi8gsdyh8hm8rlk878b096maxkgw1"; + rev = "24078ab22d5ba8503dd8c21690db9adc3c22d28b"; + sha256 = "1f4y0hpic77bqsfxxaslqdcvv734kqpwnvgbh2rd9y2wgi44ala4"; }; meta.homepage = "https://github.com/winston0410/range-highlight.nvim/"; meta.hydraPlatforms = [ ]; @@ -12273,12 +12273,12 @@ final: prev: render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "2025-03-11"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "c065031d030955e1d071a7fcdd8c59e0fd2f0343"; - sha256 = "0yjyixvz0d239clbj8f7d09lzpz10lkvyvdwcc1g1d4ygsh6pbjr"; + rev = "62d6681332365cfddbe916c888752834d9f7ad0c"; + sha256 = "1vs9y74743dm9025sgzl27arxs50mkihyc2bbmhi7vhggwf4j0hr"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; meta.hydraPlatforms = [ ]; @@ -12756,12 +12756,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2025-03-07"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "1698623b36953cd0d6e1e648570e16e4ee8981c8"; - sha256 = "0r3a1h5adp1qjc53afjcb7jpfirrpcclrn19q513hwdwykcr86fb"; + rev = "a3ccaa1ea09e21712ded3ffdabdbdc577f784054"; + sha256 = "03sp4sd2xajnrwsj5nfby6zi8964hbvsp98rvzm5f9gknph79z8f"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.hydraPlatforms = [ ]; @@ -12808,12 +12808,12 @@ final: prev: smear-cursor-nvim = buildVimPlugin { pname = "smear-cursor.nvim"; - version = "2025-03-09"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "sphamba"; repo = "smear-cursor.nvim"; - rev = "81638007bf7bbe79a78a3bfcbe8c640ec83344c0"; - sha256 = "0sns7qpcz4lfsyxpq2r37pz6hi79wbg5n1k57jrgva3dmnlvl47k"; + rev = "483ec950ebe77ef92f3e7543945285ffb49093b6"; + sha256 = "15y8rxwfm3gwdd5p632vdbvb0njfyr70366k9g1z71if787mdzmm"; }; meta.homepage = "https://github.com/sphamba/smear-cursor.nvim/"; meta.hydraPlatforms = [ ]; @@ -13056,12 +13056,12 @@ final: prev: srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2025-03-11"; + version = "2025-03-15"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "d705764b3945d856c7867b613a4570635b8bfdcf"; - sha256 = "1szf5vi783kmpm58mymdf7swkbha2zhzyjcskhai93cz7c4gjjzc"; + rev = "11cf04466429385a63e05ccea1841f82bcfc13e0"; + sha256 = "1pmwqsykkxzsrj73s9f3nnzx6d3mfzjwcaj6a384bj6n3dz2fhfq"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; meta.hydraPlatforms = [ ]; @@ -13382,12 +13382,12 @@ final: prev: tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2025-02-19"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "d5bcb49109634720e05dd1aeff1c95578c8aa5b2"; - sha256 = "17ip40fa6vjqaygh3zvp8ij02jpc9jmnm1mv85biwgzddfzi8dgx"; + rev = "21b01d26627ee5fe94c8ae560bd1b0797dff3c40"; + sha256 = "1qfmlafp7yjby1qmfimrrxy479c0gh4biyxv38pb0ciglwl927gn"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; meta.hydraPlatforms = [ ]; @@ -13683,12 +13683,12 @@ final: prev: telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2025-03-03"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "dd6ab9b6a5a26e239f268a06ef5bb1e69928ac5b"; - sha256 = "1dgdya9g9n1gdnjakpwl24l0xq9h0jfisry22v0d5crvy6mh37gz"; + rev = "eeda21e429c86bd38ea287700e77f96058331be7"; + sha256 = "1wm70kvk1as623jdy0pgd2kgw4db0fd66f6k1z3s76mz1y8kdma1"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; meta.hydraPlatforms = [ ]; @@ -14244,12 +14244,12 @@ final: prev: tmux-nvim = buildVimPlugin { pname = "tmux.nvim"; - version = "2025-02-24"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "aserowy"; repo = "tmux.nvim"; - rev = "b2f509311e4cbdc06a93c0da66a8b7b33aa6bec9"; - sha256 = "1agqqsjv6hbga7zlldb1plwdx5ysjv33x3a2aca6gznbl6iqavg7"; + rev = "2c1c3be0ef287073cef963f2aefa31a15c8b9cd8"; + sha256 = "0md775rhl7cxkfdbrkrsirr2093dfsf6jhvn9naqb5px1alj6wpx"; }; meta.homepage = "https://github.com/aserowy/tmux.nvim/"; meta.hydraPlatforms = [ ]; @@ -14375,12 +14375,12 @@ final: prev: treewalker-nvim = buildVimPlugin { pname = "treewalker.nvim"; - version = "2025-03-08"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "aaronik"; repo = "treewalker.nvim"; - rev = "0bad88a449642fca1080930260482628b692841a"; - sha256 = "088ksm6rvj4vabrisbpg2xngc11bbqihms57rz0dw22mbr7chy6q"; + rev = "b9e6520a08dc8e62891dcb759fce29f988e68da9"; + sha256 = "0vp7kzf790qsasnrxlhx1qvqhvwski3h889lhbmm1yj8pz71jvzf"; }; meta.homepage = "https://github.com/aaronik/treewalker.nvim/"; meta.hydraPlatforms = [ ]; @@ -14688,12 +14688,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2025-03-06"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "af2ff1088ccbf98d944c9131dbddcc21c279ebf7"; - sha256 = "1nlf7pnh2rkiwapc7306knqxfqns32y2dp4iwy1q9xg6sf195qy2"; + rev = "d67de6f71353df51510a232f55390445d944c3c4"; + sha256 = "116d3s2pix6vnqi5408xfac3jhrz1z5zmnflxx5gzdmpvik2jmbp"; }; meta.homepage = "https://github.com/unisonweb/unison/"; meta.hydraPlatforms = [ ]; @@ -14805,12 +14805,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2025-02-08"; + version = "2025-03-18"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "617e3dc7c9af1f03cc664124aff2fe98fafcf1b2"; - sha256 = "0w2yhyg5m2pr8c5zjn86f2ms4vh748h503cdvgbiyk33ina3708v"; + rev = "14d81758ff57420a961c7a8d10d7d672d2e00fe4"; + sha256 = "13iv8hwd9xczdc6qraghq7bf82xkqndzndi8sk00xfiizsc1rbdm"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; meta.hydraPlatforms = [ ]; @@ -16027,12 +16027,12 @@ final: prev: vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2025-02-28"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "3f5783c12e184e4b6f05dfcbd7c1a6da05b4d66e"; - sha256 = "0vml575g6i2r5l4gwg490q2kwvkfqr45v6dqm8kl05vwip1lqqp1"; + rev = "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6"; + sha256 = "0gzhn6px019kd955di3540ngfn050hwll37wd5hdpj6i1apc5rhp"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; meta.hydraPlatforms = [ ]; @@ -16404,12 +16404,12 @@ final: prev: vim-erlang-runtime = buildVimPlugin { pname = "vim-erlang-runtime"; - version = "2024-01-24"; + version = "2025-03-16"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-runtime"; - rev = "275454182752162ac680c214675cb2a45d010cdc"; - sha256 = "0crg7sf2ziz1zkjf794fnyb5rfcc0s48g3qngc4in44d71b7gc16"; + rev = "eff3cbd3306892b23ad2e55f5252061c1aad0871"; + sha256 = "0jwny8a4rrmdqvx9i55wzpxvni3q233mmjs7kkfwb3galwddz1fn"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; meta.hydraPlatforms = [ ]; @@ -16599,12 +16599,12 @@ final: prev: vim-flog = buildVimPlugin { pname = "vim-flog"; - version = "2025-02-27"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "77c86cb5db8960d224f2a866120893e61d62f5e8"; - sha256 = "03ggb5b05wpl5axgkilgkchj91ql25fwkm9kmyqrrax95z8vsw9j"; + rev = "665b16ac8915f746bc43c9572b4581a5e9047216"; + sha256 = "1qr6ys7qapjkd9la6sqix6kfk4wy380yx9izchq48b41rfcx9iy7"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; meta.hydraPlatforms = [ ]; @@ -17823,12 +17823,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2025-01-16"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "4f8471dfd3d34a3d1547b755afed8a673b236b2c"; - sha256 = "0h08dbik2pvv90vfy2f17bi5700yxmknkvirxl8aab36mk5zy5r1"; + rev = "82cae9df8f2ffca5f66a2947fee15da575838413"; + sha256 = "06jvs613g5yb2sf2037zj6izjbydxw9r87izl8i4srvrh54v5xda"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; meta.hydraPlatforms = [ ]; @@ -18512,12 +18512,12 @@ final: prev: vim-pandoc-syntax = buildVimPlugin { pname = "vim-pandoc-syntax"; - version = "2023-11-26"; + version = "2025-03-15"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "16939cda184ff555938cc895cc62477c172997f9"; - sha256 = "1rk3iqqzckrni1qznv1rmi63lf2h2qcis6z7priqn7zi2v41jgpa"; + rev = "05ef7f44ebaea37159db8d365058c0a9e2ef14b5"; + sha256 = "0w48hmcs0dfpc28v9bxslxgvizppkcvw0zpj6sxha747bbi715fc"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; meta.hydraPlatforms = [ ]; @@ -19448,12 +19448,12 @@ final: prev: vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2025-03-13"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "a2bc578485759f79c38c6b3e573b4f5db7f354bb"; - sha256 = "19lif6z7bgm92n9bdbhvy242jp4px1ikkn4fvn913jih2r6h05gd"; + rev = "3a21e6ce512ee88bf892294bc6d05fdf1a860cb4"; + sha256 = "1xzkw0vlnpgfl59czgmylxkcvsn84ligaz6ggkypg58vgnyvbz0a"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; meta.hydraPlatforms = [ ]; @@ -20203,12 +20203,12 @@ final: prev: vim-wayland-clipboard = buildVimPlugin { pname = "vim-wayland-clipboard"; - version = "2024-01-18"; + version = "2025-03-15"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "cd4efac3e77177afdf220146948d0e06245946de"; - sha256 = "02kn9dry67jckzwan4rqd4nsycrpvg62vg23prg8wc2i9j0p389p"; + rev = "f5c1aa97c6f757c958572507ca2a6032f92974e3"; + sha256 = "14b1h18nypa6gq2123mm24adxxq0f9ljljacxg0fmkd98ipv46l6"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; meta.hydraPlatforms = [ ]; @@ -20542,12 +20542,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2025-03-11"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "691ee15e1459e4420d207cfbc4a79b383f32b411"; - sha256 = "0ylyzhdx6fpbkdba0sr7lm7w3z501x1d6x9hxpb00rfyii3cslz4"; + rev = "ae6d6ce6c962ffcabe6d1776341b055a85b18bd6"; + sha256 = "0j0n9h91v4bsr7yfkj5cnr6xvkifgzk9lpj8ngyq64wvnimysk7p"; }; meta.homepage = "https://github.com/lervag/vimtex/"; meta.hydraPlatforms = [ ]; @@ -20893,12 +20893,12 @@ final: prev: wtf-nvim = buildVimPlugin { pname = "wtf.nvim"; - version = "2024-09-19"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "piersolenski"; repo = "wtf.nvim"; - rev = "16eec1f32c3608bd8519e9e520041fe34201abb0"; - sha256 = "1clpik3z79mvxxph5z4ghiwrq560jy0zdr0yxmp9byl2r0ggfa64"; + rev = "22dac666c8847c9cb03afe99229d459f1d0822c4"; + sha256 = "0hraiw10ia93ryhfb207kha6hhhnsbmfdid6h44dsg87mkixm3c8"; }; meta.homepage = "https://github.com/piersolenski/wtf.nvim/"; meta.hydraPlatforms = [ ]; @@ -20932,12 +20932,12 @@ final: prev: yanky-nvim = buildVimPlugin { pname = "yanky.nvim"; - version = "2025-03-05"; + version = "2025-03-19"; src = fetchFromGitHub { owner = "gbprod"; repo = "yanky.nvim"; - rev = "80d9385dbebe7049fd1961d7909b835a58ce9dcc"; - sha256 = "1lg9nxc01shkazqk5g3j0iskiqbwr9sxv07sqrwkwlh36jn59rcp"; + rev = "a21a0b4f593e1fb17b17882f1ab3a3c1b943b831"; + sha256 = "1sk3acrwwmx9wfxnfymgvl88bnp0xh8a30pyx040czrj3zl5l920"; }; meta.homepage = "https://github.com/gbprod/yanky.nvim/"; meta.hydraPlatforms = [ ]; @@ -20959,12 +20959,12 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2025-03-08"; + version = "2025-03-20"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "0e4e699496a5ee1c37bdca2f216f8e956c04de56"; - sha256 = "0n3qaxldy25y0chlbvw5cvqfppfh8s47amv1jxd2763v1z1qxbmj"; + rev = "a4c14eab6787b13ab14ef1c2fbb44a0383b9c9c2"; + sha256 = "1485xpw2mg55sy9c2qpjym1f3l8xv4dmw4j7i0cbahlmpk3zgjhz"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; meta.hydraPlatforms = [ ]; @@ -21141,12 +21141,12 @@ final: prev: zotcite = buildVimPlugin { pname = "zotcite"; - version = "2025-02-20"; + version = "2025-03-17"; src = fetchFromGitHub { owner = "jalvesaq"; repo = "zotcite"; - rev = "618d44b2478defd1898d96cc8722cc9c39bd5d50"; - sha256 = "1r1r4nyv6lnfaafmgq6ysdbj2bs5mvvmkb5b0h40f838jbp5aix8"; + rev = "67d4bef627854c418dfae7ef121e8752e82d7440"; + sha256 = "0f6x1x8bwl54i2294kxcqji6f5kigj4af13gqxgpyl3apmbqxqdm"; }; meta.homepage = "https://github.com/jalvesaq/zotcite/"; meta.hydraPlatforms = [ ]; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index ffa18c0da167..9fd7bd9b7d3b 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1161,9 +1161,9 @@ in }; flutter-tools-nvim = super.flutter-tools-nvim.overrideAttrs { + # Optional dap integration + checkInputs = [ self.nvim-dap ]; dependencies = [ self.plenary-nvim ]; - # Optional nvim-dap module - nvimSkipModule = "flutter-tools.dap"; }; follow-md-links-nvim = super.follow-md-links-nvim.overrideAttrs { @@ -2382,6 +2382,11 @@ in dependencies = [ self.nvim-treesitter ]; }; + nvim-highlight-colors = super.nvim-highlight-colors.overrideAttrs { + # Test module + nvimSkipModule = [ "nvim-highlight-colors.color.converters_spec" ]; + }; + nvim-java = super.nvim-java.overrideAttrs { dependencies = with self; [ lua-async From 1461468a68619822bd16a77915b1285e6c9c8d44 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 20 Mar 2025 10:44:54 -0500 Subject: [PATCH 152/160] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 71d53fb3ab93..7d384b760c3d 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -303,12 +303,12 @@ }; commonlisp = buildGrammar { language = "commonlisp"; - version = "0.0.0+rev=bf2a65b"; + version = "0.0.0+rev=3232350"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-commonlisp"; - rev = "bf2a65b1c119898a1a17389e07f2a399c05cdc0c"; - hash = "sha256-dCrHrNfJoHfOt3sS2fUqbrw4snHMu+MoPumLYTGfoho="; + rev = "32323509b3d9fe96607d151c2da2c9009eb13a2f"; + hash = "sha256-cNGxZXoxhnXGo4yhMHDSjF/j43JNXg1ClpqN2xJgLQU="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp"; }; @@ -381,12 +381,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=757e0a6"; + version = "0.0.0+rev=014628a"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "757e0a61f9d38b3d9eaa299e8d866e8283ffc284"; - hash = "sha256-66tJ1GVAWKqXBCzBXUGdzG/Rl2vw/eJ6mQnWnnnpBcU="; + rev = "014628ae8d2df391b88ddb9fa0260fd97f770829"; + hash = "sha256-zlG7/ERVZFLRBqu7q/wjcYG+iBlDY7s/SwKyqzIA0OM="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -535,12 +535,12 @@ }; dtd = buildGrammar { language = "dtd"; - version = "0.0.0+rev=2128a0b"; + version = "0.0.0+rev=0d9a809"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "2128a0b249263e238d88cb894dad00c3168fea37"; - hash = "sha256-qGMRslGqMEZpTMHmmB0sOWNHzpOBJgVhX+oPnphLxUc="; + rev = "0d9a8099c963ed53e183425c1b47fa2622c8eaf7"; + hash = "sha256-0kqCDLCxsvrqu5pKrDZDJt9lSlxU6fzM/CxrWb/oodw="; }; location = "dtd"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; @@ -768,12 +768,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=21b7408"; + version = "0.0.0+rev=64e1100"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "21b740801794b6570a0380f8aef22bb67214ea65"; - hash = "sha256-/PEl7Cl/SIbwEo88gFppPCBjBU/dfovN5J7PXNu7CBw="; + rev = "64e11001d7ef3e8ac18e55a3a2d811fe36430923"; + hash = "sha256-6l+cfLVbs8geKIYhnfuZDac8uzmNHOZf2rFANdl4tDs="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -945,34 +945,34 @@ }; glimmer_javascript = buildGrammar { language = "glimmer_javascript"; - version = "0.0.0+rev=7e8ea8c"; + version = "0.0.0+rev=4801ac4"; src = fetchFromGitHub { owner = "NullVoxPopuli"; repo = "tree-sitter-glimmer-javascript"; - rev = "7e8ea8cf39fc360cb97bd253442cd48e4f7a9ce3"; - hash = "sha256-gqadIB5tB7aIOl3g6pxDeOsuENAwzb5RLVFn4d0G9MY="; + rev = "4801ac4d0a611502001035f45d1cba5cb57d272f"; + hash = "sha256-wK8buxg2Yil6eS4u+m/iursdx9GHcj6CTCRz1nhdCNs="; }; meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript"; }; glimmer_typescript = buildGrammar { language = "glimmer_typescript"; - version = "0.0.0+rev=4006128"; + version = "0.0.0+rev=c011b05"; src = fetchFromGitHub { owner = "NullVoxPopuli"; repo = "tree-sitter-glimmer-typescript"; - rev = "4006128790efb58ca82a4492d8ef0983b260fc6a"; - hash = "sha256-oOF36q09hcOCdFWrFQlhDX79tS9xBNVgcp1vmxjRdGM="; + rev = "c011b053626f27a0fe5cc99eeae4185399a572f9"; + hash = "sha256-vRxR86NmIVv5iO1C5xb/n8k3qaILaUnnWne5Hnszgyk="; }; meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript"; }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=66aec57"; + version = "0.0.0+rev=24a6c8e"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "66aec57f7119c7e8e40665b723cd7af5594f15ee"; - hash = "sha256-EO8p3BhoyemCXlWq4BI5Y1KqU04F9KpEwbn8HoZd4z4="; + rev = "24a6c8ef698e4480fecf8340d771fbcb5de8fbb4"; + hash = "sha256-TjF79WH3bX4nueYr8CbPptkNb2lNkHQNB0VZoMB35Nk="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -1809,12 +1809,12 @@ }; meson = buildGrammar { language = "meson"; - version = "0.0.0+rev=03fd221"; + version = "0.0.0+rev=9c74e8e"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-meson"; - rev = "03fd2216bc52976c9b92ca64b5ec2e1f06408f7e"; - hash = "sha256-EhpqSS0R8aCqUnmDHtmfwzyMZMsqkGC/6U3zJpjuVAc="; + rev = "9c74e8e8917b83d90e38ac040949079437ec0043"; + hash = "sha256-uxJfDIsqTROc5YSZkVwr2zZEcpqt3IEdGVkzwp59gnI="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson"; }; @@ -1999,12 +1999,12 @@ }; ocamllex = buildGrammar { language = "ocamllex"; - version = "0.0.0+rev=5da5bb7"; + version = "0.0.0+rev=c5cf996"; src = fetchFromGitHub { owner = "atom-ocaml"; repo = "tree-sitter-ocamllex"; - rev = "5da5bb7508ac9fd3317561670ef18c126a0fe2aa"; - hash = "sha256-qfmIfcZ3zktYzuNNYP7Z6u6c7XoKsKD86MRMxe/qkpY="; + rev = "c5cf996c23e38a1537069fbe2d4bb83a75fc7b2f"; + hash = "sha256-eDJRTLYKHcL7yAgFL8vZQh9zp5fBxcZRsWChp8y3Am0="; }; generate = true; meta.homepage = "https://github.com/atom-ocaml/tree-sitter-ocamllex"; @@ -2156,12 +2156,12 @@ }; powershell = buildGrammar { language = "powershell"; - version = "0.0.0+rev=e904962"; + version = "0.0.0+rev=66d5e61"; src = fetchFromGitHub { owner = "airbus-cert"; repo = "tree-sitter-powershell"; - rev = "e904962e25858b7e8e19c653e737ad3b7d1c55bd"; - hash = "sha256-RlzGW09DE6gLM1G+y57gkEDPzMHc5Vi1jTHROUxMOt8="; + rev = "66d5e61126989c0aca57ff77d19b2064919b51e1"; + hash = "sha256-M2vOS2UleHpZC8PbUf+PHxjWz4BMBhyVxcuUsuMx34Q="; }; meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell"; }; @@ -2357,12 +2357,12 @@ }; query = buildGrammar { language = "query"; - version = "0.0.0+rev=0555ac0"; + version = "0.0.0+rev=930202c"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; - rev = "0555ac0da902abff06076e40501102cee3ba68bd"; - hash = "sha256-2JxX4KntUP/DvoCik0NYzfrU/qzs43uDwy21JkU8Hjc="; + rev = "930202c2a80965a7a9ca018b5b2a08b25dfa7f12"; + hash = "sha256-uXApakOZy9Gd/fl9C9qFZgptlT6rUlOmT6KW8sWP5Ag="; }; meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query"; }; @@ -2599,12 +2599,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=ed939ed"; + version = "0.0.0+rev=041dea1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "ed939ed550ebff7d4ad8aafb4d5aad44de69965d"; - hash = "sha256-OR0GIC7bDOkUZZvbvd1XdyOdYnjUAXhbYnOhNddH8wU="; + rev = "041dea1ca8b25f20fa564854922ac6a99c050ec6"; + hash = "sha256-hK4/FeB11H2x1c2rbYH2IoejgDSyrvlnObgeN3TVASU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2856,12 +2856,12 @@ }; superhtml = buildGrammar { language = "superhtml"; - version = "0.0.0+rev=91d9284"; + version = "0.0.0+rev=fc7c594"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; - rev = "91d92846e8baaafc8854d2b9d0ac436bc16234db"; - hash = "sha256-vBquZJOfE4HBsUKIG3o/Wo9s6wMSJ8U77u7e8n2Gc0M="; + rev = "fc7c594f52528e4a4a08671137850143d55a5bf2"; + hash = "sha256-SEaefbbQFd+Viks55eijUT3YHaEZJMvmZcXm3V6R05I="; }; location = "tree-sitter-superhtml"; meta.homepage = "https://github.com/kristoff-it/superhtml"; @@ -2901,12 +2901,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=02db52e"; + version = "0.0.0+rev=6b1ebb8"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "02db52e14bc303322d22019fff7823d72904dfe5"; - hash = "sha256-Uh1YVc871KdYXeAhF/lRDv58NW/XdHqasfZw0jDUSBE="; + rev = "6b1ebb86c97fca00835e7fce4a95c5069172145e"; + hash = "sha256-VR6GmMWueFa/4PXRtnTNWeI0N19vD1qd5XBM+e9HalM="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -3327,12 +3327,12 @@ }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=d2e4b5c"; + version = "0.0.0+rev=2694c3d"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "d2e4b5c172a109966c2ce0378f73df6cede39400"; - hash = "sha256-Vrl4/cZL+TWlUMEeWZoHCAWhvlefcl3ajGcwyTNKOhI="; + rev = "2694c3d27e2ca98a0ccde72f33887394300d524e"; + hash = "sha256-DAHOhNqd9DQ9KNkJdjbUmSV6qhTOmPrIaC/7rBNCqzY="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -3415,12 +3415,12 @@ }; xml = buildGrammar { language = "xml"; - version = "0.0.0+rev=2128a0b"; + version = "0.0.0+rev=0d9a809"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "2128a0b249263e238d88cb894dad00c3168fea37"; - hash = "sha256-qGMRslGqMEZpTMHmmB0sOWNHzpOBJgVhX+oPnphLxUc="; + rev = "0d9a8099c963ed53e183425c1b47fa2622c8eaf7"; + hash = "sha256-0kqCDLCxsvrqu5pKrDZDJt9lSlxU6fzM/CxrWb/oodw="; }; location = "xml"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; @@ -3493,24 +3493,24 @@ }; ziggy = buildGrammar { language = "ziggy"; - version = "0.0.0+rev=00958fa"; + version = "0.0.0+rev=8a29017"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "ziggy"; - rev = "00958faeaeb97d9b7beb76f128a5401441182204"; - hash = "sha256-G1Wo3Az5qQdSQU5OXE5GaahgXFjuj43o3UfmUXjjSF4="; + rev = "8a29017169f43dc2c3526817e98142eb9a335087"; + hash = "sha256-w4qq/SBlRQw3r9iIZ2RY3infa/ysopOQX5QDS7+8kt8="; }; location = "tree-sitter-ziggy"; meta.homepage = "https://github.com/kristoff-it/ziggy"; }; ziggy_schema = buildGrammar { language = "ziggy_schema"; - version = "0.0.0+rev=00958fa"; + version = "0.0.0+rev=8a29017"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "ziggy"; - rev = "00958faeaeb97d9b7beb76f128a5401441182204"; - hash = "sha256-G1Wo3Az5qQdSQU5OXE5GaahgXFjuj43o3UfmUXjjSF4="; + rev = "8a29017169f43dc2c3526817e98142eb9a335087"; + hash = "sha256-w4qq/SBlRQw3r9iIZ2RY3infa/ysopOQX5QDS7+8kt8="; }; location = "tree-sitter-ziggy-schema"; meta.homepage = "https://github.com/kristoff-it/ziggy"; From cb30883c59bd46fe3f10c93ecdc7421ff8a6bf55 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 20 Mar 2025 11:51:53 +0100 Subject: [PATCH 153/160] ngn-k: remove unused argument --- pkgs/by-name/ng/ngn-k/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ng/ngn-k/package.nix b/pkgs/by-name/ng/ngn-k/package.nix index 4268f816f087..7ba248eb34ed 100644 --- a/pkgs/by-name/ng/ngn-k/package.nix +++ b/pkgs/by-name/ng/ngn-k/package.nix @@ -1,6 +1,5 @@ { lib , stdenv -, stdenvNoLibs , fetchFromGitea , runtimeShell }: From 46a13b407fe3cba41b1f074749d903e02d595683 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 20 Mar 2025 12:07:44 -0400 Subject: [PATCH 154/160] OWNERS: set ZFS owners We are not being notified for PRs to some of these files, presumably because maintainers are specified in a non-standard way and we have multiple versions. See e.g. https://github.com/NixOS/nixpkgs/pull/389010#issuecomment-2715134629 --- ci/OWNERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/OWNERS b/ci/OWNERS index ace82519d0d1..3b54070c55d9 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -399,6 +399,10 @@ pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange /pkgs/development/compilers/ocaml @ulrikstrid /pkgs/development/ocaml-modules @ulrikstrid +# ZFS +/nixos/tests/zfs.nix @adamcstephens @amarshall +/pkgs/os-specific/linux/zfs @adamcstephens @amarshall + # Zig /pkgs/development/compilers/zig @figsoda @RossComputerGuy /doc/hooks/zig.section.md @figsoda @RossComputerGuy From b17c2972b4270aafa192b658019e7b3b307ad969 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 20 Mar 2025 17:23:17 +0100 Subject: [PATCH 155/160] typstyle: 0.13.0 -> 0.13.1 Diff: https://github.com/Enter-tainer/typstyle/compare/refs/tags/v0.13.0...v0.13.1 Changelog: https://github.com/Enter-tainer/typstyle/blob/v0.13.1/CHANGELOG.md --- pkgs/by-name/ty/typstyle/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index 4419a621f759..7714a10691f3 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -6,19 +6,19 @@ versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "typstyle"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; - tag = "v${version}"; - hash = "sha256-lrGqNc9SJ6TlTTqiwzVWrHndY/oxY8t3mOfGBMF7vac="; + tag = "v${finalAttrs.version}"; + hash = "sha256-dYhdrxyyndGhJID0WKwvW6KFQ3ubC917UG9rhDnrAfM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-V79jKheEms0CBTzt9h7+9/+F+TXSTlp8NGXe5OeFCX4="; + cargoHash = "sha256-Eb+qN7hBECESlTElN0uQtOg4uyuaWQw3ikFb8po+ubQ="; # Disabling tests requiring network access checkFlags = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; passthru = { @@ -36,11 +36,11 @@ rustPlatform.buildRustPackage rec { }; meta = { - changelog = "https://github.com/Enter-tainer/typstyle/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Enter-tainer/typstyle/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "Format your typst source code"; homepage = "https://github.com/Enter-tainer/typstyle"; license = lib.licenses.asl20; mainProgram = "typstyle"; maintainers = with lib.maintainers; [ drupol ]; }; -} +}) From 9c024b01aeb718e103521cca457a74f8191a54d5 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 20 Mar 2025 19:29:33 +0300 Subject: [PATCH 156/160] mesa: 25.0.1 -> 25.0.2 Diff: https://gitlab.freedesktop.org/mesa/mesa/-/compare/mesa-25.0.1...mesa-25.0.2 Changelog: https://docs.mesa3d.org/relnotes/25.0.2.html --- pkgs/development/libraries/mesa/common.nix | 4 ++-- pkgs/development/libraries/mesa/default.nix | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index 23e5104ffcf6..eed15cbcbc93 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "25.0.1"; + version = "25.0.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-9D4d7EEdZysvXDRcmpbyt85Lo64sldNRomp6/HUVORo="; + hash = "sha256-NW2Xntdpt4Iec3z0E8j+omNRH/46IMYNuyD2MIFMs2M="; }; meta = { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1e2d92f1b7f6..c636a32cf13f 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -6,7 +6,6 @@ , expat , fetchCrate , fetchFromGitLab -, fetchpatch , file , flex , glslang @@ -142,12 +141,6 @@ in stdenv.mkDerivation { patches = [ ./opencl.patch ./system-gbm.patch - # Fix graphical corruption in FFXIV - # Remove when updating to 25.0.2 - (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/0ec174afd56fe48bcfa071d4b8ed704106f46f91.patch"; - hash = "sha256-6A9AkCa+DeUO683hlsNTvSWGFJJ+zfqYA2BThaqCEoU="; - }) ]; postPatch = '' From b2ec32b3c3fcfdfbf6c96d039d92aa60a677b4d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Cl=C3=A9roux?= <73357644+gcleroux@users.noreply.github.com> Date: Thu, 20 Mar 2025 13:06:47 -0400 Subject: [PATCH 157/160] river: 0.3.7 -> 0.3.9 https://codeberg.org/river/river/releases/tag/v0.3.9 --- pkgs/by-name/ri/river/build.zig.zon.nix | 72 ++++++++++++------------- pkgs/by-name/ri/river/package.nix | 10 ++-- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/pkgs/by-name/ri/river/build.zig.zon.nix b/pkgs/by-name/ri/river/build.zig.zon.nix index 38529cfe603b..99979073f69d 100644 --- a/pkgs/by-name/ri/river/build.zig.zon.nix +++ b/pkgs/by-name/ri/river/build.zig.zon.nix @@ -16,15 +16,11 @@ with lib; let unpackZigArtifact = { name, artifact }: - runCommandLocal name - { - nativeBuildInputs = [ zig ]; - } - '' - hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})" - mv "$TMPDIR/p/$hash" "$out" - chmod 755 "$out" - ''; + runCommandLocal name { nativeBuildInputs = [ zig ]; } '' + hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})" + mv "$TMPDIR/p/$hash" "$out" + chmod 755 "$out" + ''; fetchZig = { @@ -42,13 +38,12 @@ let name, url, hash, + rev ? throw "rev is required, remove and regenerate the zon2json-lock file", }: let parts = splitString "#" url; url_base = elemAt parts 0; url_without_query = elemAt (splitString "?" url_base) 0; - rev_base = elemAt parts 1; - rev = if match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}"; in fetchgit { inherit name rev hash; @@ -61,20 +56,25 @@ let name, url, hash, - }: + ... + }@args: let parts = splitString "://" url; proto = elemAt parts 0; path = elemAt parts 1; fetcher = { - "git+http" = fetchGitZig { - inherit name hash; - url = "http://${path}"; - }; - "git+https" = fetchGitZig { - inherit name hash; - url = "https://${path}"; - }; + "git+http" = fetchGitZig ( + args + // { + url = "http://${path}"; + } + ); + "git+https" = fetchGitZig ( + args + // { + url = "https://${path}"; + } + ); http = fetchZig { inherit name hash; url = "http://${path}"; @@ -89,35 +89,35 @@ let in linkFarm name [ { - name = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56"; + name = "pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX"; path = fetchZigArtifact { - name = "zig-pixman"; - url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz"; - hash = "sha256-CYgFIOR9H5q8UUpFglaixOocCMT6FGpcKQQBUVWpDKQ="; + name = "pixman"; + url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.3.0.tar.gz"; + hash = "sha256-zX/jQV1NWGhalP3t0wjpmUo38BKCiUDPtgNGHefyxq0="; }; } { - name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242"; + name = "wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl"; path = fetchZigArtifact { - name = "zig-wayland"; - url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz"; - hash = "sha256-gxzkHLCq2NqX3l4nEly92ARU5dqP1SqnjpGMDgx4TXA="; + name = "wayland"; + url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.3.0.tar.gz"; + hash = "sha256-xU8IrETSFOKKQQMgwVyRKLwGaek4USaKXg49S9oHSTQ="; }; } { - name = "122083317b028705b5d27be12976feebf17066a4e51802b3b5e9f970bec580e433e1"; + name = "wlroots-0.18.2-jmOlchnIAwBq45_cxU1V3OWErxxJjQZlc9PyJfR-l3uk"; path = fetchZigArtifact { - name = "zig-wlroots"; - url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.1.tar.gz"; - hash = "sha256-S77/Own9/GjhLCCE/eI56pdpmhlvMVP41WZ27b+Sook="; + name = "wlroots"; + url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.2.tar.gz"; + hash = "sha256-4/MGFCCgMeN6+oCaj0Z5dsbVo3s88oYk1+q0mMXrj8I="; }; } { - name = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f"; + name = "xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr"; path = fetchZigArtifact { - name = "zig-xkbcommon"; - url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz"; - hash = "sha256-f5oEJU5i2qeVN3GBrnQcqzEJCiOT7l4ak7GQ6gw5cH0="; + name = "xkbcommon"; + url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.3.0.tar.gz"; + hash = "sha256-HhhUI+ayPtlylhTmZ1GrdSLbRIffTg3MeisGN1qs2iM="; }; } ] diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix index fb24693c0b45..22272a9cc550 100644 --- a/pkgs/by-name/ri/river/package.nix +++ b/pkgs/by-name/ri/river/package.nix @@ -17,14 +17,14 @@ wayland-scanner, wlroots_0_18, xwayland, - zig_0_13, + zig_0_14, withManpages ? true, xwaylandSupport ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "river"; - version = "0.3.7"; + version = "0.3.9"; outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; @@ -34,18 +34,18 @@ stdenv.mkDerivation (finalAttrs: { repo = "river"; rev = "refs/tags/v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-4ac0LGQtLldHyXJ2GIRMHV+VZfUrRFdBYLiAHX5lWcw="; + hash = "sha256-g6qjSkvcA2Ud4W+/NVzYZjiWoWkAuKvuD20KlO/zGhE="; }; deps = callPackage ./build.zig.zon.nix { - zig = zig_0_13; + zig = zig_0_14; }; nativeBuildInputs = [ pkg-config wayland-scanner xwayland - zig_0_13.hook + zig_0_14.hook ] ++ lib.optional withManpages scdoc; buildInputs = [ From f8e07853eaaef6f0ff64baf8bbe7b21806560361 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 20 Mar 2025 14:46:34 +0000 Subject: [PATCH 158/160] vimPlugins.kitty-scrollback-nvim: init at 2025-03-20 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 76b1ecbdd148..c0e8acb32c49 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6453,6 +6453,19 @@ final: prev: meta.hydraPlatforms = [ ]; }; + kitty-scrollback-nvim = buildVimPlugin { + pname = "kitty-scrollback.nvim"; + version = "2025-03-20"; + src = fetchFromGitHub { + owner = "mikesmithgh"; + repo = "kitty-scrollback.nvim"; + rev = "9b70b5f73b653745ddca4a8e49b9477fc33b817f"; + sha256 = "0570ng60dzwdbbq76vpkdrww6jnm15vbcyy79885fvb0sjwcpf1a"; + }; + meta.homepage = "https://github.com/mikesmithgh/kitty-scrollback.nvim/"; + meta.hydraPlatforms = [ ]; + }; + kmonad-vim = buildVimPlugin { pname = "kmonad-vim"; version = "2022-03-20"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index cb5f07e43aa3..8079b2b5e95a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -494,6 +494,7 @@ https://github.com/GCBallesteros/jupytext.nvim/,HEAD, https://github.com/rebelot/kanagawa.nvim/,, https://github.com/imsnif/kdl.vim/,HEAD, https://github.com/anuvyklack/keymap-layer.nvim/,HEAD, +https://github.com/mikesmithgh/kitty-scrollback.nvim/,HEAD, https://github.com/kmonad/kmonad-vim/,, https://github.com/frabjous/knap/,HEAD, https://github.com/b3nj5m1n/kommentary/,, From d55697c370be5210541961c3f1a2e135cb693abc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 21 Mar 2025 03:33:14 +1000 Subject: [PATCH 159/160] melonDS: 1.0rc-unstable-2025-02-21 -> 1.0rc-unstable-2025-03-09 (#391198) --- pkgs/by-name/me/melonDS/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 94db2dd0f64a..8c8159dec617 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "1.0rc-unstable-2025-02-21"; + version = "1.0rc-unstable-2025-03-09"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "63b468927e1c744e21057ccb4c5677f52502b442"; - hash = "sha256-LylUfcgYC3CZTycfq/qqEAZ4ajrj90bUSXAkA9SbMqE="; + rev = "0fcf1f6e3a443cb249f85d948ff6e58dc58501d6"; + hash = "sha256-llRmW596UHs/q/DjqG8qQ1RqjvmGMsOO1IUkpjPW4h4="; }; nativeBuildInputs = [ From dd45b0fd9e1df3565f4e14daf0e8cd9eb16fcb9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 12:38:01 +0000 Subject: [PATCH 160/160] gdmap: 1.2.0 -> 1.3.1 --- pkgs/by-name/gd/gdmap/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gd/gdmap/package.nix b/pkgs/by-name/gd/gdmap/package.nix index 8e64fad0d086..0704b6ae8dc9 100644 --- a/pkgs/by-name/gd/gdmap/package.nix +++ b/pkgs/by-name/gd/gdmap/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { pname = "gdmap"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitLab { owner = "sjohannes"; repo = "gdmap"; - tag = "v1.2.0"; - sha256 = "1p96pps4yflj6a42g61pcqpllx7vcjlh417kwjy0b4mqp16vmrzr"; + tag = "v1.3.1"; + sha256 = "sha256-dgZ+EDk7O+nuqrBsTPVW7BHufvkqLnWbXrIOOn7YlW4="; }; nativeBuildInputs = [