From f010e1d47a3123a9362f98ad19c361bfcdf71d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 12 Jul 2025 21:43:30 +0700 Subject: [PATCH 01/56] =?UTF-8?q?h2o:=202.3.0.20250519=20=E2=86=92=202.3.0?= =?UTF-8?q?.20250716?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index f1a10981f88f..ed0c57e97d88 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0.20250519"; + version = "2.3.0.20250716"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "87e2aa634f2c0d9f3d9429f7a3cf273f98db0058"; - sha256 = "sha256-/9YnaOqvYmFme4/mFq8Sx78FMDyGwnErEW45qPVELjU="; + rev = "a7ee72ea84815f393353e66c02181832fcd8dbb3"; + sha256 = "sha256-vym1oF/oFjrcQaKJWqwOYxNRHDsrX0vVh5Li0Zl96KY="; }; outputs = [ From eb360fbe6efdcfee8a7bcc5f3b414f2bd81db770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Thu, 17 Jul 2025 19:12:48 +0700 Subject: [PATCH 02/56] =?UTF-8?q?h2o:=202.3.0.20250716=20=E2=86=92=202.3.0?= =?UTF-8?q?.20250717?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index ed0c57e97d88..27f65230600c 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0.20250716"; + version = "2.3.0.20250717"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "a7ee72ea84815f393353e66c02181832fcd8dbb3"; - sha256 = "sha256-vym1oF/oFjrcQaKJWqwOYxNRHDsrX0vVh5Li0Zl96KY="; + rev = "db98b59ba7abfcd1dc9b43ea4b9ad1052aba775e"; + sha256 = "sha256-vBA5TWyvtaaBZV4RmfAAA7F34fXNkROS0rbZRpEJgrc="; }; outputs = [ From 923a41ab44668d7c410d625796debac15406fad0 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 25 Jul 2025 17:54:24 +0200 Subject: [PATCH 03/56] linuxPackages.nvidiaPackages.legacy_535: 535.216.01 -> 535.261.03 Release notes: https://www.nvidia.com/en-us/drivers/details/249931/ Security bulletin: https://nvidia.custhelp.com/app/answers/detail/a_id/5670 Addresses CVE-2025-23286 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f5ec93274b9e..029e5232bd3f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -147,12 +147,12 @@ rec { # Last one without the bug reported here: # https://bbs.archlinux.org/viewtopic.php?pid=2155426#p2155426 legacy_535 = generic { - version = "535.216.01"; - sha256_64bit = "sha256-Xd6hFHgQAS4zlnwxgTQbzWYkvT1lTGP4Rd+DO07Oavc="; - sha256_aarch64 = "sha256-SGmuA0W1iSsqUK7VZsgibT4HgT0RkKpGb+ul6eIbM7k="; - openSha256 = "sha256-ey96oMbY32ahcHSOj1+MykvJrep6mhHPVl+V8+B2ZDk="; - settingsSha256 = "sha256-9PgaYJbP1s7hmKCYmkuLQ58nkTruhFdHAs4W84KQVME="; - persistencedSha256 = "sha256-ckF/BgDA6xSFqFk07rn3HqXuR0iGfwA4PRxpP38QZgw="; + version = "535.261.03"; + sha256_64bit = "sha256-10th0R6cm5BS9AQtbsRDfxPR3vMOlk4jLUfl1lnRHWg="; + sha256_aarch64 = "sha256-mkEtOsAcmdLKAhAKcTlZf86IBMUr9TPRG2BDcoaDSpM="; + openSha256 = "sha256-qUn0Kk9t6TZA6ZmUSPzqclOsU6n4Tp4dXkgGa1ZF+OA="; + settingsSha256 = "sha256-E05oCGuMdE3KhVrDl2ZQspaPqPHoVSwdaftoPKItYTE"; + persistencedSha256 = "sha256-pnOq9+6l3BbIEKHboGeTwEcEcYhtESzmroUfCahqn0U="; }; # Last one supporting Kepler architecture From 4ebd1ea7b46a3e9fb32dc44ccfaaaddebe3d832b Mon Sep 17 00:00:00 2001 From: Michael Evans Date: Sat, 26 Jul 2025 14:57:38 +0200 Subject: [PATCH 04/56] deja-dup: 48.2 -> 48.3 --- pkgs/by-name/de/deja-dup/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/deja-dup/package.nix b/pkgs/by-name/de/deja-dup/package.nix index 80b7a04c6fc9..3a57f319e647 100644 --- a/pkgs/by-name/de/deja-dup/package.nix +++ b/pkgs/by-name/de/deja-dup/package.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "deja-dup"; - version = "48.2"; + version = "48.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "deja-dup"; rev = finalAttrs.version; - hash = "sha256-g6bGOlpiEMJ9d+xe2GJyTBWAuGlY9EZTlJaYhB/5Ldw="; + hash = "sha256-3tjJljCdugfjfysd0afUYY7Gc1UcaP4w4jgxVDr5tBM="; }; patches = [ @@ -92,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: { and uses duplicity as the backend. ''; homepage = "https://apps.gnome.org/DejaDup/"; + changelog = "https://gitlab.gnome.org/World/deja-dup/-/releases/${finalAttrs.version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; teams = [ teams.gnome-circle ]; From 137488b80c4eb31270af10735e84e74128c08639 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Mon, 28 Jul 2025 09:48:41 +0530 Subject: [PATCH 05/56] skim: 0.20.2 -> 0.20.3 Diff: https://github.com/skim-rs/skim/compare/refs/tags/v0.20.2...v0.20.3 Changelog: https://github.com/skim-rs/skim/releases/tag/v0.20.3 Signed-off-by: Muhammad Falak R Wani --- pkgs/by-name/sk/skim/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix index fadcc57b098f..2381bb3967e2 100644 --- a/pkgs/by-name/sk/skim/package.nix +++ b/pkgs/by-name/sk/skim/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.20.2"; + version = "0.20.3"; outputs = [ "out" @@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec { owner = "skim-rs"; repo = "skim"; tag = "v${version}"; - hash = "sha256-fEd6t+adYI1jpRapZ/XHpxVWtX0nwUl9ZurIwywSFgk="; + hash = "sha256-DyrndFT4gPLLdBtvS/QI0UDMtKKeK8oX2K2h4/6xvb0="; }; postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim ''; - cargoHash = "sha256-oRcqaXWa/eh5QQtTk0NQr90aL/Q0zgxQbPIoMLMtHe8="; + cargoHash = "sha256-BcWszU7S0imGlXgQ5e1L9yLfXzYzseK0z2BnqIqKkzg="; nativeBuildInputs = [ installShellFiles ]; From 008adf53f92ae0eba9e04fadd7cd5428dc1d7bf1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 28 Jul 2025 16:04:45 +0200 Subject: [PATCH 06/56] python3Packages.tokenizers: 0.21.3 -> 0.21.4 Diff: https://github.com/huggingface/tokenizers/compare/refs/tags/v0.21.3...refs/tags/v0.21.4 Changelog: https://github.com/huggingface/tokenizers/releases/tag/v0.21.4 --- .../python-modules/tokenizers/Cargo.lock | 1334 ----------------- .../python-modules/tokenizers/default.nix | 17 +- 2 files changed, 10 insertions(+), 1341 deletions(-) delete mode 100644 pkgs/development/python-modules/tokenizers/Cargo.lock diff --git a/pkgs/development/python-modules/tokenizers/Cargo.lock b/pkgs/development/python-modules/tokenizers/Cargo.lock deleted file mode 100644 index f03afca9b75f..000000000000 --- a/pkgs/development/python-modules/tokenizers/Cargo.lock +++ /dev/null @@ -1,1334 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "ahash" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "serde", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.6.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" - -[[package]] -name = "anstyle-parse" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" -dependencies = [ - "anstyle", - "once_cell_polyfill", - "windows-sys 0.59.0", -] - -[[package]] -name = "autocfg" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bitflags" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" - -[[package]] -name = "bumpalo" -version = "3.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" - -[[package]] -name = "castaway" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" -dependencies = [ - "rustversion", -] - -[[package]] -name = "cc" -version = "1.2.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad45f4f74e4e20eaa392913b7b33a7091c87e59628f4dd27888205ad888843c" -dependencies = [ - "shlex", -] - -[[package]] -name = "cfg-if" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" - -[[package]] -name = "colorchoice" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" - -[[package]] -name = "compact_str" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a" -dependencies = [ - "castaway", - "cfg-if", - "itoa", - "rustversion", - "ryu", - "serde", - "static_assertions", -] - -[[package]] -name = "console" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" -dependencies = [ - "encode_unicode", - "libc", - "once_cell", - "unicode-width", - "windows-sys 0.59.0", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" - -[[package]] -name = "darling" -version = "0.20.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.20.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[package]] -name = "dary_heap" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04d2cd9c18b9f454ed67da600630b021a8a80bf33f8c95896ab33aaf1c26b728" -dependencies = [ - "serde", -] - -[[package]] -name = "derive_builder" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" -dependencies = [ - "derive_builder_core", - "syn", -] - -[[package]] -name = "either" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" - -[[package]] -name = "encode_unicode" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" - -[[package]] -name = "env_filter" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "jiff", - "log", -] - -[[package]] -name = "errno" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" -dependencies = [ - "libc", - "windows-sys 0.60.2", -] - -[[package]] -name = "esaxx-rs" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" -dependencies = [ - "cc", -] - -[[package]] -name = "fastrand" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "getrandom" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" -dependencies = [ - "cfg-if", - "libc", - "r-efi", - "wasi", -] - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "indicatif" -version = "0.17.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" -dependencies = [ - "console", - "number_prefix", - "portable-atomic", - "unicode-width", - "web-time", -] - -[[package]] -name = "indoc" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - -[[package]] -name = "itertools" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" - -[[package]] -name = "jiff" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49" -dependencies = [ - "jiff-static", - "log", - "portable-atomic", - "portable-atomic-util", - "serde", -] - -[[package]] -name = "jiff-static" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "js-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" -dependencies = [ - "once_cell", - "wasm-bindgen", -] - -[[package]] -name = "libc" -version = "0.2.174" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" - -[[package]] -name = "linux-raw-sys" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" - -[[package]] -name = "log" -version = "0.4.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" - -[[package]] -name = "macro_rules_attribute" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65049d7923698040cd0b1ddcced9b0eb14dd22c5f86ae59c3740eab64a676520" -dependencies = [ - "macro_rules_attribute-proc_macro", - "paste", -] - -[[package]] -name = "macro_rules_attribute-proc_macro" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670fdfda89751bc4a84ac13eaa63e205cf0fd22b4c9a5fbfa085b63c1f1d3a30" - -[[package]] -name = "matrixmultiply" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06de3016e9fae57a36fd14dba131fccf49f74b40b7fbdb472f96e361ec71a08" -dependencies = [ - "autocfg", - "rawpointer", -] - -[[package]] -name = "memchr" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "monostate" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe1be9d0c75642e3e50fedc7ecadf1ef1cbce6eb66462153fc44245343fbee" -dependencies = [ - "monostate-impl", - "serde", -] - -[[package]] -name = "monostate-impl" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c402a4092d5e204f32c9e155431046831fa712637043c58cb73bc6bc6c9663b5" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ndarray" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882ed72dce9365842bf196bdeedf5055305f11fc8c03dee7bb0194a6cad34841" -dependencies = [ - "matrixmultiply", - "num-complex", - "num-integer", - "num-traits", - "portable-atomic", - "portable-atomic-util", - "rawpointer", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-complex" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "numpy" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f1dee9aa8d3f6f8e8b9af3803006101bb3653866ef056d530d53ae68587191" -dependencies = [ - "libc", - "ndarray", - "num-complex", - "num-integer", - "num-traits", - "pyo3", - "pyo3-build-config", - "rustc-hash", -] - -[[package]] -name = "once_cell" -version = "1.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" - -[[package]] -name = "once_cell_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" - -[[package]] -name = "onig" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0" -dependencies = [ - "bitflags", - "libc", - "once_cell", - "onig_sys", -] - -[[package]] -name = "onig_sys" -version = "69.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc" -dependencies = [ - "cc", - "pkg-config", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pkg-config" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" - -[[package]] -name = "portable-atomic" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" - -[[package]] -name = "portable-atomic-util" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" -dependencies = [ - "portable-atomic", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "proc-macro2" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "pyo3" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a" -dependencies = [ - "indoc", - "libc", - "memoffset", - "once_cell", - "portable-atomic", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598" -dependencies = [ - "once_cell", - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c" -dependencies = [ - "libc", - "pyo3-build-config", -] - -[[package]] -name = "pyo3-macros" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50" -dependencies = [ - "proc-macro2", - "pyo3-macros-backend", - "quote", - "syn", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc" -dependencies = [ - "heck", - "proc-macro2", - "pyo3-build-config", - "quote", - "syn", -] - -[[package]] -name = "quote" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "r-efi" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - -[[package]] -name = "rand" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" -dependencies = [ - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rawpointer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-cond" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2964d0cf57a3e7a06e8183d14a8b527195c706b7983549cd5462d5aa3747438f" -dependencies = [ - "either", - "itertools", - "rayon", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "regex" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - -[[package]] -name = "rustc-hash" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" - -[[package]] -name = "rustix" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.59.0", -] - -[[package]] -name = "rustversion" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" - -[[package]] -name = "ryu" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" - -[[package]] -name = "serde" -version = "1.0.219" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.219" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.140" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "smallvec" -version = "1.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" - -[[package]] -name = "spm_precompiled" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" -dependencies = [ - "base64", - "nom", - "serde", - "unicode-segmentation", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "syn" -version = "2.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "target-lexicon" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" - -[[package]] -name = "tempfile" -version = "3.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" -dependencies = [ - "fastrand", - "getrandom", - "once_cell", - "rustix", - "windows-sys 0.59.0", -] - -[[package]] -name = "thiserror" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokenizers" -version = "0.21.4-dev.0" -dependencies = [ - "ahash", - "aho-corasick", - "compact_str", - "dary_heap", - "derive_builder", - "esaxx-rs", - "getrandom", - "indicatif", - "itertools", - "log", - "macro_rules_attribute", - "monostate", - "onig", - "paste", - "rand", - "rayon", - "rayon-cond", - "regex", - "regex-syntax", - "serde", - "serde_json", - "spm_precompiled", - "thiserror", - "unicode-normalization-alignments", - "unicode-segmentation", - "unicode_categories", -] - -[[package]] -name = "tokenizers-python" -version = "0.21.4-dev.0" -dependencies = [ - "ahash", - "env_logger", - "itertools", - "libc", - "ndarray", - "numpy", - "pyo3", - "rayon", - "serde", - "serde_json", - "tempfile", - "tokenizers", -] - -[[package]] -name = "unicode-ident" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" - -[[package]] -name = "unicode-normalization-alignments" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" -dependencies = [ - "smallvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" - -[[package]] -name = "unicode-width" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "unindent" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" -dependencies = [ - "wit-bindgen-rt", -] - -[[package]] -name = "wasm-bindgen" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.2", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" -dependencies = [ - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_i686_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" - -[[package]] -name = "wit-bindgen-rt" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" -dependencies = [ - "bitflags", -] - -[[package]] -name = "zerocopy" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 3238d04dc860..724fcc3df3af 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -75,21 +75,24 @@ let in buildPythonPackage rec { pname = "tokenizers"; - version = "0.21.3"; + version = "0.21.4"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "tokenizers"; tag = "v${version}"; - hash = "sha256-8z1jgH0Nj7D+joN42AA2ORNSLvcfWiYHn4dpTq1HWB0="; + hash = "sha256-HJUycrNDpy2FOYi6aZ76orLewZCuLC1MoJ57peYJqvI="; }; - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit + pname + version + src + sourceRoot + ; + hash = "sha256-0olujhOOO/BAH4JvnmXd1kE7T/sp5Vr3Z3P2X2jhZKs="; }; sourceRoot = "${src.name}/bindings/python"; From 6155cb1401ba40049fad460b2b23d005a52b6c3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 22:24:47 +0000 Subject: [PATCH 07/56] fluxcd-operator-mcp: 0.24.1 -> 0.26.0 --- pkgs/by-name/fl/fluxcd-operator-mcp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix index 6b4c08df6737..d23c79d8512f 100644 --- a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "fluxcd-operator-mcp"; - version = "0.24.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = "controlplaneio-fluxcd"; repo = "fluxcd-operator"; tag = "v${finalAttrs.version}"; - hash = "sha256-/a/k2q1Qu/0Zz7qxBtGB27CZ5vKhqAAIDUknRT8dK04="; + hash = "sha256-OT2H2veijX5l0QCpecLsq1vBR8+912MR3kojMICfFAg="; }; - vendorHash = "sha256-tyYE/OdVUxqNP3Csukc2ctDchB9x2BdBYXYq9EsiFkg="; + vendorHash = "sha256-w7WEckmoajsR4sKCrheq34T0XC2ubnZhz6cVQmzHzN0="; ldflags = [ "-s" From e91a1270c2a3ab76243a4016f54e88b96c8a697c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Aug 2025 11:50:35 +0000 Subject: [PATCH 08/56] containerd: 2.1.3 -> 2.1.4 --- pkgs/by-name/co/containerd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix index cac2dfd530a7..f6d10b64b689 100644 --- a/pkgs/by-name/co/containerd/package.nix +++ b/pkgs/by-name/co/containerd/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { pname = "containerd"; - version = "2.1.3"; + version = "2.1.4"; outputs = [ "out" @@ -28,7 +28,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; tag = "v${version}"; - hash = "sha256-MqHcwomsVYbjziO0vIpGAcREChe5mbJVGsvM96bszLA="; + hash = "sha256-eC9mfB/FWDxOGucNizHBiRkhkEFDdSxu9vRnXZp5Tug="; }; postPatch = "patchShebangs ."; From 3d98a4985618ad4c76c006b3c4942beb1a9aabfb Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Tue, 22 Jul 2025 22:04:21 +0300 Subject: [PATCH 09/56] greetd.*: move to 'pkgs/by-name' and top level --- doc/release-notes/rl-2511.section.md | 2 ++ .../services/display-managers/greetd.nix | 4 ++-- nixos/tests/greetd-no-shadow.nix | 2 +- .../gr/greetd/package.nix} | 19 +++++++++++++++++++ .../gt/gtkgreet/package.nix} | 0 .../qt/qtgreet/package.nix} | 0 .../re/regreet/package.nix} | 0 .../tu/tuigreet/package.nix} | 0 .../wl/wlgreet/package.nix} | 0 pkgs/top-level/all-packages.nix | 14 -------------- 10 files changed, 24 insertions(+), 17 deletions(-) rename pkgs/{applications/display-managers/greetd/default.nix => by-name/gr/greetd/package.nix} (77%) rename pkgs/{applications/display-managers/greetd/gtkgreet.nix => by-name/gt/gtkgreet/package.nix} (100%) rename pkgs/{applications/display-managers/greetd/qtgreet.nix => by-name/qt/qtgreet/package.nix} (100%) rename pkgs/{applications/display-managers/greetd/regreet.nix => by-name/re/regreet/package.nix} (100%) rename pkgs/{applications/display-managers/greetd/tuigreet.nix => by-name/tu/tuigreet/package.nix} (100%) rename pkgs/{applications/display-managers/greetd/wlgreet.nix => by-name/wl/wlgreet/package.nix} (100%) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index bb8943416017..47d89812633e 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -35,6 +35,8 @@ - `stalwart-mail` since `0.13.0` "introduces a significant redesign of the MTA’s delivery and queueing subsystem". See [the upgrading announcement for the `0.13.0` release](https://github.com/stalwartlabs/stalwart/blob/89b561b5ca1c5a11f2a768b4a2cfef0f473b7a01/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x). +- Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases. + - The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld. - `navidrome` 0.58.0 introduces [multi-library support](https://www.navidrome.org/docs/usage/multi-library/) diff --git a/nixos/modules/services/display-managers/greetd.nix b/nixos/modules/services/display-managers/greetd.nix index 8d0580187d0e..9c967ac71696 100644 --- a/nixos/modules/services/display-managers/greetd.nix +++ b/nixos/modules/services/display-managers/greetd.nix @@ -21,14 +21,14 @@ in options.services.greetd = { enable = lib.mkEnableOption "greetd, a minimal and flexible login manager daemon"; - package = lib.mkPackageOption pkgs [ "greetd" "greetd" ] { }; + package = lib.mkPackageOption pkgs "greetd" { }; settings = lib.mkOption { type = settingsFormat.type; example = lib.literalExpression '' { default_session = { - command = "''${pkgs.greetd.greetd}/bin/agreety --cmd sway"; + command = "''${pkgs.greetd}/bin/agreety --cmd sway"; }; } ''; diff --git a/nixos/tests/greetd-no-shadow.nix b/nixos/tests/greetd-no-shadow.nix index c4cb028ff6eb..947271716b0b 100644 --- a/nixos/tests/greetd-no-shadow.nix +++ b/nixos/tests/greetd-no-shadow.nix @@ -27,7 +27,7 @@ enable = true; settings = { default_session = { - command = "${pkgs.greetd.greetd}/bin/agreety --cmd bash"; + command = "${pkgs.greetd}/bin/agreety --cmd bash"; }; }; }; diff --git a/pkgs/applications/display-managers/greetd/default.nix b/pkgs/by-name/gr/greetd/package.nix similarity index 77% rename from pkgs/applications/display-managers/greetd/default.nix rename to pkgs/by-name/gr/greetd/package.nix index b1e1dca24f6e..52a9d87f9c5e 100644 --- a/pkgs/applications/display-managers/greetd/default.nix +++ b/pkgs/by-name/gr/greetd/package.nix @@ -5,6 +5,13 @@ pam, scdoc, installShellFiles, + # legacy passthrus + greetd, + gtkgreet, + qtgreet, + regreet, + tuigreet, + wlgreet, }: rustPlatform.buildRustPackage rec { @@ -37,6 +44,18 @@ rustPlatform.buildRustPackage rec { installManPage man/* ''; + # Added 2025-07-23. To be deleted on 26.05 + passthru = lib.mapAttrs (k: lib.warnOnInstantiate "`greetd.${k}` was renamed to `${k}`") { + inherit + greetd + gtkgreet + qtgreet + regreet + tuigreet + wlgreet + ; + }; + meta = with lib; { description = "Minimal and flexible login manager daemon"; longDescription = '' diff --git a/pkgs/applications/display-managers/greetd/gtkgreet.nix b/pkgs/by-name/gt/gtkgreet/package.nix similarity index 100% rename from pkgs/applications/display-managers/greetd/gtkgreet.nix rename to pkgs/by-name/gt/gtkgreet/package.nix diff --git a/pkgs/applications/display-managers/greetd/qtgreet.nix b/pkgs/by-name/qt/qtgreet/package.nix similarity index 100% rename from pkgs/applications/display-managers/greetd/qtgreet.nix rename to pkgs/by-name/qt/qtgreet/package.nix diff --git a/pkgs/applications/display-managers/greetd/regreet.nix b/pkgs/by-name/re/regreet/package.nix similarity index 100% rename from pkgs/applications/display-managers/greetd/regreet.nix rename to pkgs/by-name/re/regreet/package.nix diff --git a/pkgs/applications/display-managers/greetd/tuigreet.nix b/pkgs/by-name/tu/tuigreet/package.nix similarity index 100% rename from pkgs/applications/display-managers/greetd/tuigreet.nix rename to pkgs/by-name/tu/tuigreet/package.nix diff --git a/pkgs/applications/display-managers/greetd/wlgreet.nix b/pkgs/by-name/wl/wlgreet/package.nix similarity index 100% rename from pkgs/applications/display-managers/greetd/wlgreet.nix rename to pkgs/by-name/wl/wlgreet/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15b7b79653f4..a25f98d102d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12086,20 +12086,6 @@ with pkgs; }; gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs; - greetd = recurseIntoAttrs ( - { - greetd = callPackage ../applications/display-managers/greetd { }; - gtkgreet = callPackage ../applications/display-managers/greetd/gtkgreet.nix { }; - qtgreet = callPackage ../applications/display-managers/greetd/qtgreet.nix { }; - regreet = callPackage ../applications/display-managers/greetd/regreet.nix { }; - tuigreet = callPackage ../applications/display-managers/greetd/tuigreet.nix { }; - wlgreet = callPackage ../applications/display-managers/greetd/wlgreet.nix { }; - } - // lib.optionalAttrs config.allowAliases { - dlm = throw "greetd.dlm has been removed as it is broken and abandoned upstream"; # Added 2024-07-15 - } - ); - goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; goldendict-ng = qt6Packages.callPackage ../applications/misc/goldendict-ng { }; From 78e7bb6ad583bb5e9f0d3a58a175a1c7f018b543 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 23 Jul 2025 20:11:46 +0300 Subject: [PATCH 10/56] greetd: clean up and modernize - removed `with lib;` - replaced `rec` with `finalAttrs` - removed redundant `useFetchCargoVendor` - updated fetcher attrs --- pkgs/by-name/gr/greetd/package.nix | 45 +++++++++++++++++------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/gr/greetd/package.nix b/pkgs/by-name/gr/greetd/package.nix index 52a9d87f9c5e..2cc5aa18ad13 100644 --- a/pkgs/by-name/gr/greetd/package.nix +++ b/pkgs/by-name/gr/greetd/package.nix @@ -6,7 +6,6 @@ scdoc, installShellFiles, # legacy passthrus - greetd, gtkgreet, qtgreet, regreet, @@ -14,15 +13,15 @@ wlgreet, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "greetd"; version = "0.10.3"; src = fetchFromSourcehut { owner = "~kennylevinsen"; - repo = pname; - rev = version; - sha256 = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg="; + repo = "greetd"; + rev = finalAttrs.version; + hash = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg="; }; cargoHash = "sha256-JwTLZawY9+M09IDbMPoNUcNrnW1C2OVlEVn1n7ol6dY="; @@ -45,18 +44,24 @@ rustPlatform.buildRustPackage rec { ''; # Added 2025-07-23. To be deleted on 26.05 - passthru = lib.mapAttrs (k: lib.warnOnInstantiate "`greetd.${k}` was renamed to `${k}`") { - inherit - greetd - gtkgreet - qtgreet - regreet - tuigreet - wlgreet - ; - }; + passthru = + let + warnPassthru = name: lib.warnOnInstantiate "`greetd.${name}` was renamed to `${name}`"; + in + lib.mapAttrs warnPassthru { + inherit + gtkgreet + qtgreet + regreet + tuigreet + wlgreet + ; + } + // { + greetd = warnPassthru "greetd" finalAttrs.finalPackage; + }; - meta = with lib; { + meta = { description = "Minimal and flexible login manager daemon"; longDescription = '' greetd is a minimal and flexible login manager daemon @@ -65,8 +70,8 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://sr.ht/~kennylevinsen/greetd/"; mainProgram = "greetd"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; -} +}) From b4704ef13e2fc440e453ebcf29c6dbe60b86655d Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 23 Jul 2025 21:29:06 +0300 Subject: [PATCH 11/56] greetd: add update script --- pkgs/by-name/gr/greetd/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/gr/greetd/package.nix b/pkgs/by-name/gr/greetd/package.nix index 2cc5aa18ad13..06642f98b4a1 100644 --- a/pkgs/by-name/gr/greetd/package.nix +++ b/pkgs/by-name/gr/greetd/package.nix @@ -5,6 +5,7 @@ pam, scdoc, installShellFiles, + nix-update-script, # legacy passthrus gtkgreet, qtgreet, @@ -59,6 +60,7 @@ rustPlatform.buildRustPackage (finalAttrs: { } // { greetd = warnPassthru "greetd" finalAttrs.finalPackage; + updateScript = nix-update-script { }; }; meta = { From 478930a7126a919b0494c4380d252f24413ad85b Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 23 Jul 2025 20:42:55 +0300 Subject: [PATCH 12/56] gtkgreet: clean up and modernize - removed `with lib;` - replaced `rec` with `finalAttrs` - updated fetcher attrs --- pkgs/by-name/gt/gtkgreet/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/gt/gtkgreet/package.nix b/pkgs/by-name/gt/gtkgreet/package.nix index 425e4c1790b3..27fa029536c7 100644 --- a/pkgs/by-name/gt/gtkgreet/package.nix +++ b/pkgs/by-name/gt/gtkgreet/package.nix @@ -14,15 +14,15 @@ scdoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtkgreet"; version = "0.8"; src = fetchFromSourcehut { owner = "~kennylevinsen"; - repo = pname; - rev = version; - sha256 = "sha256-GKBYql0hzqB6uY87SsAqHwf3qLAr7xznMnAjRtP4HS8="; + repo = "gtkgreet"; + rev = finalAttrs.version; + hash = "sha256-GKBYql0hzqB6uY87SsAqHwf3qLAr7xznMnAjRtP4HS8="; }; depsBuildBuild = [ pkg-config ]; @@ -54,12 +54,12 @@ stdenv.mkDerivation rec { # G_APPLICATION_FLAGS_NONE is deprecated in GLib 2.73.3+. env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - meta = with lib; { + meta = { description = "GTK based greeter for greetd, to be run under cage or similar"; homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; mainProgram = "gtkgreet"; }; -} +}) From 32d4d81c957ab0ccf7c70467f2f4cdf2ca57901d Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 23 Jul 2025 21:28:04 +0300 Subject: [PATCH 13/56] gtkgreet: add update script --- pkgs/by-name/gt/gtkgreet/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/gt/gtkgreet/package.nix b/pkgs/by-name/gt/gtkgreet/package.nix index 27fa029536c7..bffb651c16d8 100644 --- a/pkgs/by-name/gt/gtkgreet/package.nix +++ b/pkgs/by-name/gt/gtkgreet/package.nix @@ -12,6 +12,7 @@ json_c, librsvg, scdoc, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -54,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: { # G_APPLICATION_FLAGS_NONE is deprecated in GLib 2.73.3+. env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + passthru.updateScript = nix-update-script { }; + meta = { description = "GTK based greeter for greetd, to be run under cage or similar"; homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet"; From e487dee12f50ed7ba6337f0d4d03c7c3f22838ce Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 23 Jul 2025 20:54:37 +0300 Subject: [PATCH 14/56] regreet: clean up and modernize - removed `with lib;` - replaced `rec` with `finalAttrs` - removed redundant `useFetchCargoVendor` --- pkgs/by-name/re/regreet/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/re/regreet/package.nix b/pkgs/by-name/re/regreet/package.nix index 0872941b8cb3..580939bfda3e 100644 --- a/pkgs/by-name/re/regreet/package.nix +++ b/pkgs/by-name/re/regreet/package.nix @@ -10,14 +10,14 @@ librsvg, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "regreet"; version = "0.2.0"; src = fetchFromGitHub { owner = "rharish101"; repo = "ReGreet"; - rev = version; + rev = finalAttrs.version; hash = "sha256-f8Xvno5QqmWz4SUiFYDvs8lFU1ZaqQ8gpTaVzWxW4T8="; }; @@ -36,12 +36,12 @@ rustPlatform.buildRustPackage rec { librsvg ]; - meta = with lib; { + meta = { description = "Clean and customizable greeter for greetd"; homepage = "https://github.com/rharish101/ReGreet"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ fufexan ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ fufexan ]; + platforms = lib.platforms.linux; mainProgram = "regreet"; }; -} +}) From 3f53712e6e17e45c4db198118249e35d8d5a2efe Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 23 Jul 2025 21:12:56 +0300 Subject: [PATCH 15/56] regreet: add update script --- pkgs/by-name/re/regreet/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/re/regreet/package.nix b/pkgs/by-name/re/regreet/package.nix index 580939bfda3e..0f673686620f 100644 --- a/pkgs/by-name/re/regreet/package.nix +++ b/pkgs/by-name/re/regreet/package.nix @@ -8,6 +8,7 @@ gtk4, pango, librsvg, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -36,6 +37,8 @@ rustPlatform.buildRustPackage (finalAttrs: { librsvg ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Clean and customizable greeter for greetd"; homepage = "https://github.com/rharish101/ReGreet"; From 525b40ebed4d4bcd70decab1e332190ab51b4168 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 23 Jul 2025 21:04:48 +0300 Subject: [PATCH 16/56] tuigreet: clean up and modernize - removed `with lib;` - replaced `rec` with `finalAttrs` - removed redundant `useFetchCargoVendor` - updated fetcher attrs --- pkgs/by-name/tu/tuigreet/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/tu/tuigreet/package.nix b/pkgs/by-name/tu/tuigreet/package.nix index 19ca3c8b592d..ef5f2320decb 100644 --- a/pkgs/by-name/tu/tuigreet/package.nix +++ b/pkgs/by-name/tu/tuigreet/package.nix @@ -6,15 +6,15 @@ installShellFiles, scdoc, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "tuigreet"; version = "0.9.1"; src = fetchFromGitHub { owner = "apognu"; repo = "tuigreet"; - rev = "refs/tags/${version}"; - sha256 = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY="; + tag = finalAttrs.version; + hash = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY="; }; cargoHash = "sha256-w6ZOqpwogKoN4oqqI1gFqY8xAnfvhEBVaL8/6JXpKXs="; @@ -32,10 +32,10 @@ rustPlatform.buildRustPackage rec { meta = { description = "Graphical console greeter for greetd"; homepage = "https://github.com/apognu/tuigreet"; - changelog = "https://github.com/apognu/tuigreet/releases/tag/${version}"; + changelog = "https://github.com/apognu/tuigreet/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "tuigreet"; }; -} +}) From d4bc74646acffd6c7c42e4c3ea1b0467cc672064 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 23 Jul 2025 21:10:26 +0300 Subject: [PATCH 17/56] tuigreet: add update script --- pkgs/by-name/tu/tuigreet/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/tu/tuigreet/package.nix b/pkgs/by-name/tu/tuigreet/package.nix index ef5f2320decb..0a42d42e91d9 100644 --- a/pkgs/by-name/tu/tuigreet/package.nix +++ b/pkgs/by-name/tu/tuigreet/package.nix @@ -2,9 +2,9 @@ lib, rustPlatform, fetchFromGitHub, - installShellFiles, scdoc, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "tuigreet"; @@ -29,6 +29,8 @@ rustPlatform.buildRustPackage (finalAttrs: { installManPage tuigreet.1 ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Graphical console greeter for greetd"; homepage = "https://github.com/apognu/tuigreet"; From b61108a776c6030aa53397ff4546f89f4d134358 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 23 Jul 2025 21:07:14 +0300 Subject: [PATCH 18/56] wlgreet: clean up and modernize - removed `with lib;` - replaced `rec` with `finalAttrs` - removed redundant `useFetchCargoVendor` --- pkgs/by-name/wl/wlgreet/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/wl/wlgreet/package.nix b/pkgs/by-name/wl/wlgreet/package.nix index 9f5820148b32..0d103173d015 100644 --- a/pkgs/by-name/wl/wlgreet/package.nix +++ b/pkgs/by-name/wl/wlgreet/package.nix @@ -8,14 +8,14 @@ libxkbcommon, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wlgreet"; version = "0.5.0"; src = fetchFromSourcehut { owner = "~kennylevinsen"; - repo = pname; - rev = version; + repo = "wlgreet"; + rev = finalAttrs.version; hash = "sha256-TQTHFBOTxtSuzrAG4cjZ9oirl80xc0rPdYeLJ0t39DQ="; }; @@ -30,12 +30,12 @@ rustPlatform.buildRustPackage rec { libxkbcommon ]; - meta = with lib; { + meta = { description = "Raw wayland greeter for greetd, to be run under sway or similar"; mainProgram = "wlgreet"; homepage = "https://git.sr.ht/~kennylevinsen/wlgreet"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; -} +}) From 3b1824f7032cf7ebd2b5cd6bcdf2d5d3ec18c603 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 23 Jul 2025 21:09:35 +0300 Subject: [PATCH 19/56] wlgreet: add update script --- pkgs/by-name/wl/wlgreet/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/wl/wlgreet/package.nix b/pkgs/by-name/wl/wlgreet/package.nix index 0d103173d015..d73e1da53d75 100644 --- a/pkgs/by-name/wl/wlgreet/package.nix +++ b/pkgs/by-name/wl/wlgreet/package.nix @@ -6,6 +6,7 @@ gcc-unwrapped, wayland, libxkbcommon, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -30,6 +31,8 @@ rustPlatform.buildRustPackage (finalAttrs: { libxkbcommon ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Raw wayland greeter for greetd, to be run under sway or similar"; mainProgram = "wlgreet"; From 25750b264d73f8ccc169c7f5c5eb6864bb78b5f8 Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Sat, 2 Aug 2025 18:11:06 +0200 Subject: [PATCH 20/56] nixos/i2pd: add ssu2 options --- nixos/modules/services/networking/i2pd.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 054970d59e53..d93f8c61629e 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -184,6 +184,10 @@ let (boolOpt "enabled" cfg.ntcp2.enable) (boolOpt "published" cfg.ntcp2.published) (intOpt "port" cfg.ntcp2.port) + (sec "ssu2") + (boolOpt "enabled" cfg.ssu2.enable) + (boolOpt "published" cfg.ssu2.published) + (intOpt "port" cfg.ssu2.port) (sec "addressbook") (strOpt "defaulturl" cfg.addressbook.defaulturl) ] @@ -540,6 +544,18 @@ in ''; }; + ssu2 = { + enable = mkEnableTrueOption "SSU2"; + published = mkEnableOption "SSU2 publication"; + port = mkOption { + type = types.port; + default = 0; + description = '' + Port to listen for incoming SSU2 connections (0=auto). + ''; + }; + }; + limits.transittunnels = mkOption { type = types.int; default = 2500; From 7068fb8b30af78b774e7adbed28e69591afe7ec6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Aug 2025 23:08:33 +0000 Subject: [PATCH 21/56] garnet: 1.0.78 -> 1.0.79 --- pkgs/by-name/ga/garnet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index b9e34afaeed6..211eff07fb64 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "garnet"; - version = "1.0.78"; + version = "1.0.79"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; tag = "v${version}"; - hash = "sha256-V/h0X4CZ9FOcUetyyvo9umYS+VqJbYehg3QS/yp4OBM="; + hash = "sha256-EXI/6yctbAX2tcUYsb9sHXed5pik/uttXoY0gCnH9H8="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; From 02eb6d057194cd9670bfe669617161d9e7736f5a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 7 Jun 2025 09:08:50 +0100 Subject: [PATCH 22/56] gcc13: 13.3.0 -> 13.4.0 Changes: https://sourceware.org/pipermail/gcc/2025-June/246131.html --- pkgs/development/compilers/gcc/patches/default.nix | 6 ++---- pkgs/development/compilers/gcc/versions.nix | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 9a55332ade9b..0b57ecab691f 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -245,11 +245,9 @@ in "13" = [ (fetchpatch { name = "gcc-13-darwin-aarch64-support.patch"; - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/bda0faddfbfb392e7b9c9101056b2c5ab2500508/gcc/gcc-13.3.0.diff"; - sha256 = "sha256-RBTCBXIveGwuQGJLzMW/UexpUZdDgdXprp/G2NHkmQo="; + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/698885df7f624d0ce15bceb79a4d9760a473b502/gcc/gcc-13.4.0.diff"; + hash = "sha256-xqkBDFYZ6fdowtqR3kV7bR8a4Cu11RDokSzGn1k3a1w="; }) - # Needed to build LLVM>18 - ./cfi_startproc-reorder-label-2.diff ]; # Patches from https://github.com/iains/gcc-12-branch/compare/2bada4bc59bed4be34fab463bdb3c3ebfd2b41bb..gcc-12-4-darwin "12" = [ diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix index 63921abef84d..e47a4160f8ba 100644 --- a/pkgs/development/compilers/gcc/versions.nix +++ b/pkgs/development/compilers/gcc/versions.nix @@ -2,7 +2,7 @@ let majorMinorToVersionMap = { "15" = "15.1.0"; "14" = "14.3.0"; - "13" = "13.3.0"; + "13" = "13.4.0"; "12" = "12.4.0"; "11" = "11.5.0"; "10" = "10.5.0"; @@ -19,7 +19,7 @@ let # 4 digits: snapshots (14.2.1.20250322) "15.1.0" = "sha256-4rCewhZg8B/s/7cV4BICZSFpQ/A40OSKmGhxPlTwbOo="; "14.3.0" = "sha256-4Nx3KXYlYxrI5Q+pL//v6Jmk63AlktpcMu8E4ik6yjo="; - "13.3.0" = "sha256-CEXpYhyVQ6E/SE6UWEpJ/8ASmXDpkUYkI1/B0GGgwIM="; + "13.4.0" = "sha256-nEzm27BAVo/cVFWIrAPFy8lajb8MeqSQFwhDr7WcqPU="; "12.4.0" = "sha256-cE9lJgTMvMsUvavzR4yVEciXiLEss7v/3tNzQZFqkXU="; "11.5.0" = "sha256-puIYaOrVRc+H8MAfhCduS1KB1nIJhZHByJYkHwk2NHg="; "10.5.0" = "sha256-JRCVQ/30bzl8NHtdi3osflaUpaUczkucbh6opxyjB8E="; From 8cdb0f159a3c368c3aa729c642944f4b2be70c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 3 Aug 2025 10:29:06 +0200 Subject: [PATCH 23/56] gnat13Packages.gnatprove: fixup build after gcc13 update --- pkgs/development/ada-modules/gnatprove/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix index ae4ef6fa930d..18772e8cac6d 100644 --- a/pkgs/development/ada-modules/gnatprove/default.nix +++ b/pkgs/development/ada-modules/gnatprove/default.nix @@ -52,6 +52,10 @@ let hash = "sha256-mZWP9yF1O4knCiXx8CqolnS+93bM+hTQy40cd0HZmwI="; }; commit_date = "2023-01-05"; + patches = [ + # Changes to the GNAT frontend: https://github.com/AdaCore/spark2014/issues/58 + ./0003-Adjust-after-category-change-for-N_Formal_Package_De.patch + ]; }; "14" = { src = fetchSpark2014 { From 78545d5ec031c6d294d5d7960009220943df9d08 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sun, 3 Aug 2025 11:08:45 +0200 Subject: [PATCH 24/56] komikku: 1.83.0 -> 1.84.0 --- pkgs/by-name/ko/komikku/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index 83603a29bb42..3a86a338e38b 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.83.0"; + version = "1.84.0"; pyproject = false; src = fetchFromGitea { @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; tag = "v${version}"; - hash = "sha256-cwNSjzCy4lv71O3XAcDXVF+75MhQ6gMrMz/IuePCdak="; + hash = "sha256-bzz49ILpqzOStBdRGMhBKkxI4RlVuDjCqhcIjQGGQmk="; }; nativeBuildInputs = [ From 8998b35826e27c3a59e74275b36349bcded5fabe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Aug 2025 10:55:09 +0000 Subject: [PATCH 25/56] mkvtoolnix: 93.0 -> 94.0 --- pkgs/by-name/mk/mkvtoolnix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mk/mkvtoolnix/package.nix b/pkgs/by-name/mk/mkvtoolnix/package.nix index 925dc5a5ef59..5a6677827b0e 100644 --- a/pkgs/by-name/mk/mkvtoolnix/package.nix +++ b/pkgs/by-name/mk/mkvtoolnix/package.nix @@ -52,14 +52,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mkvtoolnix"; - version = "93.0"; + version = "94.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "mbunkus"; repo = "mkvtoolnix"; tag = "release-${finalAttrs.version}"; - hash = "sha256-xCO5wKZO2fcO6+KhPO5+OpOvAFuqOuQ2A3V+LzFYLNY="; + hash = "sha256-BEvb0+e1ugGPkj6MnX1uOvQ2k+zvlqLXFiBHFt3a5qw="; }; passthru = { From 1b2242f4c36421c78a440dc8dde223506e6d15fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Aug 2025 23:09:15 +0000 Subject: [PATCH 26/56] lock: 1.6.6 -> 1.6.7 --- pkgs/by-name/lo/lock/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix index 31a853a85ce8..26985e209485 100644 --- a/pkgs/by-name/lo/lock/package.nix +++ b/pkgs/by-name/lo/lock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lock"; - version = "1.6.6"; + version = "1.6.7"; src = fetchFromGitHub { owner = "konstantintutsch"; repo = "Lock"; tag = "v${finalAttrs.version}"; - hash = "sha256-JAtQxmcLFNj6epk3ipVaa/u7fQ4E2maHZN+7jk+ktmE="; + hash = "sha256-5wbt+zZANWNbKJtcptovkPsGMUjGHmiX2vniLRqrQNc="; }; strictDeps = true; From 970dbf51a8d5ea741eb4f246430e129255ebdf16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Aug 2025 22:08:26 +0000 Subject: [PATCH 27/56] dokieli: 0-unstable-2025-07-11 -> 0-unstable-2025-08-04 --- pkgs/by-name/do/dokieli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/dokieli/package.nix b/pkgs/by-name/do/dokieli/package.nix index f37464438c9a..5aed586fdfc5 100644 --- a/pkgs/by-name/do/dokieli/package.nix +++ b/pkgs/by-name/do/dokieli/package.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dokieli"; - version = "0-unstable-2025-07-11"; + version = "0-unstable-2025-08-04"; src = fetchFromGitHub { owner = "dokieli"; repo = "dokieli"; - rev = "13c0c2d2d307ab1f391aca9aec4efc4ac4ba43c5"; - hash = "sha256-V9tKoSu1r8LZaIZUu1JSyZ0dM7/zblTDQZHu86/V3LE="; + rev = "64374c6b9a53b68ae7921604a1fbe231d3e4f067"; + hash = "sha256-5baBKXmOxS0BOKNedMSbmw21rDBONZwmim9hlXn5OzQ="; }; missingHashes = ./missing-hashes.json; From 46c3e3d1a05542620e2f6a03c0f1c5f696125092 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 4 Aug 2025 08:09:57 -0400 Subject: [PATCH 28/56] newsflash: 4.1.2 -> 4.1.3 --- pkgs/by-name/ne/newsflash/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix index 9a3084cfca86..1029670813c0 100644 --- a/pkgs/by-name/ne/newsflash/package.nix +++ b/pkgs/by-name/ne/newsflash/package.nix @@ -27,18 +27,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "4.1.2"; + version = "4.1.3"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; tag = "v.${finalAttrs.version}"; - hash = "sha256-yNO9ju5AQzMeZlQN1f3FRiFA6hq89mSuQClrJkoM+xE="; + hash = "sha256-Ll1w6gWwlGq7pG/S/PZYujG6SqhThg4gLkdBdu/8czI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-gF1wHLM5t0jYm/nWQQeAbDlExsPYNV0/YYH0yfQuetM="; + hash = "sha256-GJzBdJIa1KNZax4FSns/IfNLnAdpOfkEi/lFLuNmHVs="; }; postPatch = '' From bf5a68e0beaddf8d15bd7a8d9a5bc02aa915cb67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Aug 2025 00:35:09 +0000 Subject: [PATCH 29/56] shotman: 0.4.7 -> 0.4.10 --- pkgs/by-name/sh/shotman/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shotman/package.nix b/pkgs/by-name/sh/shotman/package.nix index 69ba71e325a5..255f30406a51 100644 --- a/pkgs/by-name/sh/shotman/package.nix +++ b/pkgs/by-name/sh/shotman/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "shotman"; - version = "0.4.7"; + version = "0.4.10"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = "shotman"; rev = "v${version}"; - hash = "sha256-kf/qloCaptxPzPEgd8fkzTfgqsI/PC3KJfHpBQWadjQ="; + hash = "sha256-j9HNqRJnGiy720uS0zC6Tt1WjF4b6+XqPEMTqTEOD6w="; }; - cargoHash = "sha256-ZL0dKvCX/cvMzJi05qPULlwWuUcXH/bY84sDH67UFHg="; + cargoHash = "sha256-+PpNf79yz5e5Mr6HAqE9Wg/0S8JO4rWrMT7JtQYAWPs="; nativeBuildInputs = [ pkg-config From e066e4eee474bf651fbc3220ecaccaa547d04bdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Aug 2025 04:39:23 +0000 Subject: [PATCH 30/56] asterisk: 20.15.0 -> 20.15.1 --- pkgs/servers/asterisk/versions.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json index 3b8142f6e35d..87be36fffdc9 100644 --- a/pkgs/servers/asterisk/versions.json +++ b/pkgs/servers/asterisk/versions.json @@ -1,18 +1,18 @@ { "asterisk_18": { - "sha256": "745689c84d63ae94dfa0b3d4bdde3c6907b72472018532f757d9c0d169705964", - "version": "18.26.2" + "sha256": "0df8be2f57779019895628363a11f74ea356068cca983462ec0feb72528fc8e9", + "version": "18.26.3" }, "asterisk_20": { - "sha256": "7c45cf254c7442748fa14ba4e31ae8f09cd2ad958168577de091c0bf0b0a2d2e", - "version": "20.15.0" + "sha256": "fa286ac7a024e685233af6fde54a68a21c8e9934b438da878fb3cff080a6346c", + "version": "20.15.1" }, "asterisk_21": { - "sha256": "16051efbcc6fb95c0408f0ecc9dcf2d78a9346323f5d1fcd9723faedcb0f3fd8", - "version": "21.10.0" + "sha256": "811c5b8c501004ee378e77efd009892b366a03a508cfc51eead52396cbf65b2c", + "version": "21.10.1" }, "asterisk_22": { - "sha256": "944967288ec01587feeef42869a97baa37ab635bea7d539df16f70d3af48c613", - "version": "22.5.0" + "sha256": "cbe67229f813ccf5e545fbda1fc05eb221897bf03393917390f8f6235cc62179", + "version": "22.5.1" } } From 98cbe9651906ab059c41aed9f4629ecbe420e53c Mon Sep 17 00:00:00 2001 From: secufoe <135814375+secufoe@users.noreply.github.com> Date: Tue, 5 Aug 2025 12:21:09 +0200 Subject: [PATCH 31/56] nixos/udev: use udevadm from buildPackages to fix cross --- nixos/modules/services/hardware/udev.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index c7890d11dd2d..ca9464d091c1 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -60,7 +60,7 @@ let # We only include the out output here to avoid needing to include all # other outputs in the installer tests as well # We only need the udevadm command anyway - pkgs.systemdMinimal.out + pkgs.buildPackages.systemdMinimal.out ]; } '' From 8f2a71ff49f8da7bda8f8456075e98d859821417 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 5 Aug 2025 07:47:19 -0400 Subject: [PATCH 32/56] nixos/tuned: enable upower with tuned-ppd Fixes: #431105 --- nixos/modules/services/hardware/tuned.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/hardware/tuned.nix b/nixos/modules/services/hardware/tuned.nix index 877170605ab1..1ce62f6ff011 100644 --- a/nixos/modules/services/hardware/tuned.nix +++ b/nixos/modules/services/hardware/tuned.nix @@ -172,6 +172,11 @@ in assertion = cfg.settings.dynamic_tuning -> cfg.settings.daemon; message = "`services.tuned.settings.dynamic_tuning` requires `services.tuned.settings.daemon` to be `true`."; } + + { + assertion = cfg.ppdSupport -> config.services.upower.enable; + message = "`services.tuned.ppdSupport` requires `services.upower` to be enabled."; + } ] # Declare service conflicts, also sourced from `tuned.service` ++ @@ -218,6 +223,11 @@ in # Many DEs (like GNOME and KDE Plasma) enable PPD by default # Let's try to make it easier to transition by only enabling this module power-profiles-daemon.enable = false; + + # NOTE: Required by `tuned-ppd` for handling power supply changes + # (i.e., `services.tuned.ppdSettings.main.battery_detection`) + # https://github.com/NixOS/nixpkgs/issues/431105 + upower.enable = lib.mkIf cfg.ppdSupport true; }; systemd = { From ddaa16d8249cdd8ef1b6e6800ee792fd3ae878d9 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 5 Aug 2025 19:02:05 +0200 Subject: [PATCH 33/56] magma: cleanup package now that we do not ship multiple versions of magma we can cleanup the package --- .../libraries/science/math/magma/default.nix | 427 ++++++++++++++++-- .../libraries/science/math/magma/generic.nix | 381 ---------------- .../libraries/science/math/magma/releases.nix | 38 -- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 386 insertions(+), 462 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/magma/generic.nix delete mode 100644 pkgs/development/libraries/science/math/magma/releases.nix diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index e23728abf203..d290f3f67c97 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -1,56 +1,399 @@ -args@{ - callPackage, +{ + autoPatchelfHook, + blas, + cmake, + cudaPackages_11 ? null, + cudaPackages, + cudaSupport ? config.cudaSupport, + fetchurl, + fetchpatch, + gfortran, + gpuTargets ? [ ], # Non-CUDA targets, that is HIP + rocmPackages, + lapack, lib, - ... + libpthreadstubs, + ninja, + python3, + config, + # At least one back-end has to be enabled, + # and we can't default to CUDA since it's unfree + rocmSupport ? !cudaSupport, + runCommand, + static ? stdenv.hostPlatform.isStatic, + stdenv, + writeShellApplication, }: -# Type aliases -# Release = { -# version: String -# hash: String -# supportedGpuTargets: List String -# } - let - inherit (lib) lists strings trivial; + inherit (lib) + getLib + lists + strings + trivial + ; - computeName = version: "magma_${strings.replaceStrings [ "." ] [ "_" ] version}"; + inherit (cudaPackages) cudaAtLeast flags cudaOlder; - # buildMagmaPackage :: Release -> Derivation - buildMagmaPackage = - magmaRelease: - callPackage ./generic.nix ( - (builtins.removeAttrs args [ "callPackage" ]) - // { - inherit magmaRelease; - } - ); + supportedGpuTargets = [ + "700" + "701" + "702" + "703" + "704" + "705" + "801" + "802" + "803" + "805" + "810" + "900" + "902" + "904" + "906" + "908" + "909" + "90c" + "1010" + "1011" + "1012" + "1030" + "1031" + "1032" + "1033" + ]; - # Reverse the list to have the latest release first - # magmaReleases :: List Release - magmaReleases = lists.reverseList (builtins.import ./releases.nix); + # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements + # of the first list *from* the second list. That means: + # lists.subtractLists a b = b - a - # The latest release is the first element of the list and will be our default choice - # latestReleaseName :: String - latestReleaseName = computeName (builtins.head magmaReleases).version; + # For ROCm + # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like flags.realArches. + # For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must + # remove it. + rocmArches = lists.map (x: strings.removePrefix "gfx" x) rocmPackages.clr.gpuTargets; + supportedRocmArches = lists.intersectLists rocmArches supportedGpuTargets; + unsupportedRocmArches = lists.subtractLists supportedRocmArches rocmArches; - # Function to transform our releases into build attributes - # toBuildAttrs :: Release -> { name: String, value: Derivation } - toBuildAttrs = release: { - name = computeName release.version; - value = buildMagmaPackage release; - }; + supportedCustomGpuTargets = lists.intersectLists gpuTargets supportedGpuTargets; + unsupportedCustomGpuTargets = lists.subtractLists supportedCustomGpuTargets gpuTargets; - # Add all supported builds as attributes - # allBuilds :: AttrSet String Derivation - allBuilds = builtins.listToAttrs (lists.map toBuildAttrs magmaReleases); + # Use trivial.warnIf to print a warning if any unsupported GPU targets are specified. + gpuArchWarner = + supported: unsupported: + trivial.throwIf (supported == [ ]) ( + "No supported GPU targets specified. Requested GPU targets: " + + strings.concatStringsSep ", " unsupported + ) supported; - # The latest release will be our default build - # defaultBuild :: AttrSet String Derivation - defaultBuild.magma = allBuilds.${latestReleaseName}; + gpuTargetString = strings.concatStringsSep "," ( + if gpuTargets != [ ] then + # If gpuTargets is specified, it always takes priority. + gpuArchWarner supportedCustomGpuTargets unsupportedCustomGpuTargets + else if rocmSupport then + gpuArchWarner supportedRocmArches unsupportedRocmArches + else if cudaSupport then + [ ] # It's important we pass explicit -DGPU_TARGET to reset magma's defaults + else + throw "No GPU targets specified" + ); + + cudaArchitecturesString = flags.cmakeCudaArchitecturesString; + minArch = + let + # E.g. [ "80" "86" "90" ] + cudaArchitectures = (builtins.map flags.dropDots flags.cudaCapabilities); + minArch' = builtins.head (builtins.sort strings.versionOlder cudaArchitectures); + in + # "75" -> "750" Cf. https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L200-L201 + "${minArch'}0"; - # builds :: AttrSet String Derivation - builds = allBuilds // defaultBuild; in -builds +assert (builtins.match "[^[:space:]]*" gpuTargetString) != null; + +stdenv.mkDerivation (finalAttrs: { + pname = "magma"; + version = "2.9.0"; + + src = fetchurl { + url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${finalAttrs.version}.tar.gz"; + hash = "sha256-/3f9Nyaz3+w7+1V5CwZICqXMOEOWwts1xW/a5KgsZBw="; + }; + + # Magma doesn't have anything which could be run under doCheck, but it does build test suite executables. + # These are moved to $test/bin/ and $test/lib/ in postInstall. + outputs = [ + "out" + "test" + ]; + + postPatch = '' + # For rocm version script invoked by cmake + patchShebangs tools/ + # Fixup for the python test runners + patchShebangs ./testing/run_{tests,summarize}.py + ''; + + nativeBuildInputs = [ + autoPatchelfHook + cmake + ninja + gfortran + ] + ++ lists.optionals cudaSupport [ + cudaPackages.cuda_nvcc + ]; + + buildInputs = [ + libpthreadstubs + lapack + blas + python3 + (getLib gfortran.cc) # libgfortran.so + ] + ++ lists.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cccl # and + cuda_cudart # cuda_runtime.h + libcublas # cublas_v2.h + libcusparse # cusparse.h + ] + ++ lists.optionals (cudaOlder "11.8") [ + cuda_nvprof # + ] + ++ lists.optionals (cudaAtLeast "11.8") [ + cuda_profiler_api # + ] + ) + ++ lists.optionals rocmSupport ( + with rocmPackages; + [ + clr + hipblas + hipsparse + llvm.openmp + ] + ); + + cmakeFlags = [ + (strings.cmakeFeature "GPU_TARGET" gpuTargetString) + (strings.cmakeBool "MAGMA_ENABLE_CUDA" cudaSupport) + (strings.cmakeBool "MAGMA_ENABLE_HIP" rocmSupport) + (strings.cmakeBool "BUILD_SHARED_LIBS" (!static)) + # Set the Fortran name mangling scheme explicitly. We must set FORTRAN_CONVENTION manually because it will + # otherwise not be set in NVCC_FLAGS or DEVCCFLAGS (which we cannot modify). + # See https://github.com/NixOS/nixpkgs/issues/281656#issuecomment-1902931289 + (strings.cmakeBool "USE_FORTRAN" true) + (strings.cmakeFeature "CMAKE_C_FLAGS" "-DADD_") + (strings.cmakeFeature "CMAKE_CXX_FLAGS" "-DADD_") + (strings.cmakeFeature "FORTRAN_CONVENTION" "-DADD_") + ] + ++ lists.optionals cudaSupport [ + (strings.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) + (strings.cmakeFeature "MIN_ARCH" minArch) # Disarms magma's asserts + ] + ++ lists.optionals rocmSupport [ + # Can be removed once https://github.com/icl-utk-edu/magma/pull/27 is merged + # Can't easily apply the PR as a patch because we rely on the tarball with pregenerated + # hipified files ∴ fetchpatch of the PR will apply cleanly but fail to build + (strings.cmakeFeature "ROCM_CORE" "${rocmPackages.clr}") + (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clr}/bin/hipcc") + (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clr}/bin/hipcc") + ]; + + # Magma doesn't have a test suite we can easily run, just loose executables, all of which require a GPU. + doCheck = false; + + # Copy the files to the test output and fix the RPATHs. + postInstall = + # NOTE: The python scripts aren't copied by CMake into the build directory, so we must copy them from the source. + # TODO(@connorbaker): This should be handled by having CMakeLists.txt install them, but such a patch is + # out of the scope of the PR which introduces the `test` output: https://github.com/NixOS/nixpkgs/pull/283777. + # See https://github.com/NixOS/nixpkgs/pull/283777#discussion_r1482125034 for more information. + # Such work is tracked by https://github.com/NixOS/nixpkgs/issues/296286. + '' + install -Dm755 ../testing/run_{tests,summarize}.py -t "$test/bin/" + '' + # Copy core test executables and libraries over to the test output. + # NOTE: Magma doesn't provide tests for sparse solvers for ROCm, but it does for CUDA -- we put them both in the same + # install command to avoid the case where a glob would fail to find any files and cause the install command to fail + # because it has no files to install. + + '' + install -Dm755 ./testing/testing_* ./sparse/testing/testing_* -t "$test/bin/" + install -Dm755 ./lib/lib*test*.* -t "$test/lib/" + '' + # All of the test executables and libraries will have a reference to the build directory in their RPATH, which we + # must remove. We do this by shrinking the RPATH to only include the Nix store. The autoPatchelfHook will take care + # of supplying the correct RPATH for needed libraries (like `libtester.so`). + + '' + find "$test" -type f -exec \ + patchelf \ + --shrink-rpath \ + --allowed-rpath-prefixes "$NIX_STORE" \ + {} \; + ''; + + passthru = { + inherit + cudaPackages + cudaSupport + rocmSupport + gpuTargets + ; + testers = { + all = + let + magma = finalAttrs.finalPackage; + in + writeShellApplication { + derivationArgs = { + __structuredAttrs = true; + strictDeps = true; + }; + name = "magma-testers-all"; + text = '' + logWithDate() { + printf "%s: %s\n" "$(date --utc --iso-8601=seconds)" "$*" + } + + isIgnoredTest() { + case $1 in + # Skip the python scripts + *.py) return 0 ;; + + # These test require files, so we skip them + testing_?io) ;& + testing_?madd) ;& + testing_?matrix) ;& + testing_?matrixcapcup) ;& + testing_?matrixinfo) ;& + testing_?mcompressor) ;& + testing_?mconverter) ;& + testing_?preconditioner) ;& + testing_?solver) ;& + testing_?solver_rhs) ;& + testing_?solver_rhs_scaling) ;& + testing_?sort) ;& + testing_?spmm) ;& + testing_?spmv) ;& + testing_?spmv_check) ;& + testing_?sptrsv) ;& + testing_dsspmv_mixed) ;& + testing_zcspmv_mixed) + logWithDate "skipping $1 because it requires input" + return 0 + ;; + + # These test require outputing to files, so we skip them + testing_?print) + logWithDate "skipping $1 because it requires creating output" + return 0 + ;; + + # These test succeed but exit with a non-zero code + testing_[cdz]gglse) ;& + testing_sgemm_fp16) + logWithDate "skipping $1 because has a non-zero exit code" + return 0 + ;; + + # These test have memory freeing/allocation errors: + testing_?mdotc) + logWithDate "skipping $1 because it fails to allocate or free memory" + return 0 + ;; + + # Test is not ignored otherwise. + *) return 1 ;; + esac + } + + runTests() { + local -nr outputArray="$1" + local -i programExitCode=0 + local file + + # TODO: Collect and sort filenames prior to iterating so the order isn't dependent on the filesystem. + for file in "${magma.test}"/bin/*; do + if isIgnoredTest "$(basename "$file")"; then + continue + fi + + logWithDate "Starting $file" + + # Since errexit is set, we need to reset programExitCode every iteration and use an OR + # to set it only when the test fails (which should not fail, avoiding tripping errexit). + programExitCode=0 + + # A number of test cases require an input <=128, so we set the range to include [128, 1024]. + # Batch is kept small to keep tests fast. + "$file" --range 128:1024:896 --batch 32 || programExitCode=$? + + logWithDate "Finished $file with exit code $programExitCode" + + if ((programExitCode)); then + outputArray+=("$file") + fi + done + } + + main() { + local -a failedPrograms=() + runTests failedPrograms + + if ((''${#failedPrograms[@]})); then + logWithDate "The following programs had non-zero exit codes:" + for file in "''${failedPrograms[@]}"; do + # Using echo to avoid printing the date + echo "- $file" + done + logWithDate "Exiting with code 1 because at least one test failed." + exit 1 + fi + + logWithDate "All tests passed!" + exit 0 + } + + main + ''; + runtimeInputs = [ magma.test ]; + }; + }; + tests = { + all = + runCommand "magma-tests-all" + { + __structuredAttrs = true; + strictDeps = true; + nativeBuildInputs = [ finalAttrs.passthru.testers.all ]; + requiredSystemFeatures = lib.optionals cudaSupport [ "cuda" ]; + } + '' + if magma-testers-all; then + touch "$out" + else + exit 1 + fi + ''; + }; + }; + + meta = with lib; { + description = "Matrix Algebra on GPU and Multicore Architectures"; + license = licenses.bsd3; + homepage = "https://icl.utk.edu/magma/"; + changelog = "https://github.com/icl-utk-edu/magma/blob/v${version}/ReleaseNotes"; + platforms = platforms.linux; + maintainers = with maintainers; [ connorbaker ]; + + # Cf. https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L24-L31 + broken = + # dynamic CUDA support is broken https://github.com/NixOS/nixpkgs/issues/239237 + (cudaSupport && !static) + || !(cudaSupport || rocmSupport) # At least one back-end enabled + || (cudaSupport && rocmSupport); # Mutually exclusive + }; +}) diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix deleted file mode 100644 index 0ef5e1abed08..000000000000 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ /dev/null @@ -1,381 +0,0 @@ -# Type aliases -# Release = { -# version: String -# hash: String -# supportedGpuTargets: List String -# } - -{ - autoPatchelfHook, - blas, - cmake, - cudaPackages_11 ? null, - cudaPackages, - cudaSupport ? config.cudaSupport, - fetchurl, - fetchpatch, - gfortran, - gpuTargets ? [ ], # Non-CUDA targets, that is HIP - rocmPackages, - lapack, - lib, - libpthreadstubs, - magmaRelease, - ninja, - python3, - config, - # At least one back-end has to be enabled, - # and we can't default to CUDA since it's unfree - rocmSupport ? !cudaSupport, - runCommand, - static ? stdenv.hostPlatform.isStatic, - stdenv, - writeShellApplication, -}: - -let - inherit (lib) - getLib - lists - strings - trivial - ; - inherit (magmaRelease) version hash supportedGpuTargets; - - inherit (cudaPackages) cudaAtLeast flags cudaOlder; - - # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements - # of the first list *from* the second list. That means: - # lists.subtractLists a b = b - a - - # For ROCm - # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like flags.realArches. - # For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must - # remove it. - rocmArches = lists.map (x: strings.removePrefix "gfx" x) rocmPackages.clr.gpuTargets; - supportedRocmArches = lists.intersectLists rocmArches supportedGpuTargets; - unsupportedRocmArches = lists.subtractLists supportedRocmArches rocmArches; - - supportedCustomGpuTargets = lists.intersectLists gpuTargets supportedGpuTargets; - unsupportedCustomGpuTargets = lists.subtractLists supportedCustomGpuTargets gpuTargets; - - # Use trivial.warnIf to print a warning if any unsupported GPU targets are specified. - gpuArchWarner = - supported: unsupported: - trivial.throwIf (supported == [ ]) ( - "No supported GPU targets specified. Requested GPU targets: " - + strings.concatStringsSep ", " unsupported - ) supported; - - gpuTargetString = strings.concatStringsSep "," ( - if gpuTargets != [ ] then - # If gpuTargets is specified, it always takes priority. - gpuArchWarner supportedCustomGpuTargets unsupportedCustomGpuTargets - else if rocmSupport then - gpuArchWarner supportedRocmArches unsupportedRocmArches - else if cudaSupport then - [ ] # It's important we pass explicit -DGPU_TARGET to reset magma's defaults - else - throw "No GPU targets specified" - ); - - cudaArchitecturesString = flags.cmakeCudaArchitecturesString; - minArch = - let - # E.g. [ "80" "86" "90" ] - cudaArchitectures = (builtins.map flags.dropDots flags.cudaCapabilities); - minArch' = builtins.head (builtins.sort strings.versionOlder cudaArchitectures); - in - # "75" -> "750" Cf. https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L200-L201 - "${minArch'}0"; - -in - -assert (builtins.match "[^[:space:]]*" gpuTargetString) != null; - -stdenv.mkDerivation (finalAttrs: { - pname = "magma"; - inherit version; - - src = fetchurl { - name = "magma-${version}.tar.gz"; - url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; - inherit hash; - }; - - # Magma doesn't have anything which could be run under doCheck, but it does build test suite executables. - # These are moved to $test/bin/ and $test/lib/ in postInstall. - outputs = [ - "out" - "test" - ]; - - postPatch = '' - # For rocm version script invoked by cmake - patchShebangs tools/ - # Fixup for the python test runners - patchShebangs ./testing/run_{tests,summarize}.py - ''; - - nativeBuildInputs = [ - autoPatchelfHook - cmake - ninja - gfortran - ] - ++ lists.optionals cudaSupport [ - cudaPackages.cuda_nvcc - ]; - - buildInputs = [ - libpthreadstubs - lapack - blas - python3 - (getLib gfortran.cc) # libgfortran.so - ] - ++ lists.optionals cudaSupport ( - with cudaPackages; - [ - cuda_cccl # and - cuda_cudart # cuda_runtime.h - libcublas # cublas_v2.h - libcusparse # cusparse.h - ] - ++ lists.optionals (cudaOlder "11.8") [ - cuda_nvprof # - ] - ++ lists.optionals (cudaAtLeast "11.8") [ - cuda_profiler_api # - ] - ) - ++ lists.optionals rocmSupport ( - with rocmPackages; - [ - clr - hipblas - hipsparse - llvm.openmp - ] - ); - - cmakeFlags = [ - (strings.cmakeFeature "GPU_TARGET" gpuTargetString) - (strings.cmakeBool "MAGMA_ENABLE_CUDA" cudaSupport) - (strings.cmakeBool "MAGMA_ENABLE_HIP" rocmSupport) - (strings.cmakeBool "BUILD_SHARED_LIBS" (!static)) - # Set the Fortran name mangling scheme explicitly. We must set FORTRAN_CONVENTION manually because it will - # otherwise not be set in NVCC_FLAGS or DEVCCFLAGS (which we cannot modify). - # See https://github.com/NixOS/nixpkgs/issues/281656#issuecomment-1902931289 - (strings.cmakeBool "USE_FORTRAN" true) - (strings.cmakeFeature "CMAKE_C_FLAGS" "-DADD_") - (strings.cmakeFeature "CMAKE_CXX_FLAGS" "-DADD_") - (strings.cmakeFeature "FORTRAN_CONVENTION" "-DADD_") - ] - ++ lists.optionals cudaSupport [ - (strings.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) - (strings.cmakeFeature "MIN_ARCH" minArch) # Disarms magma's asserts - ] - ++ lists.optionals rocmSupport [ - # Can be removed once https://github.com/icl-utk-edu/magma/pull/27 is merged - # Can't easily apply the PR as a patch because we rely on the tarball with pregenerated - # hipified files ∴ fetchpatch of the PR will apply cleanly but fail to build - (strings.cmakeFeature "ROCM_CORE" "${rocmPackages.clr}") - (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clr}/bin/hipcc") - (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clr}/bin/hipcc") - ]; - - # Magma doesn't have a test suite we can easily run, just loose executables, all of which require a GPU. - doCheck = false; - - # Copy the files to the test output and fix the RPATHs. - postInstall = - # NOTE: The python scripts aren't copied by CMake into the build directory, so we must copy them from the source. - # TODO(@connorbaker): This should be handled by having CMakeLists.txt install them, but such a patch is - # out of the scope of the PR which introduces the `test` output: https://github.com/NixOS/nixpkgs/pull/283777. - # See https://github.com/NixOS/nixpkgs/pull/283777#discussion_r1482125034 for more information. - # Such work is tracked by https://github.com/NixOS/nixpkgs/issues/296286. - '' - install -Dm755 ../testing/run_{tests,summarize}.py -t "$test/bin/" - '' - # Copy core test executables and libraries over to the test output. - # NOTE: Magma doesn't provide tests for sparse solvers for ROCm, but it does for CUDA -- we put them both in the same - # install command to avoid the case where a glob would fail to find any files and cause the install command to fail - # because it has no files to install. - + '' - install -Dm755 ./testing/testing_* ./sparse/testing/testing_* -t "$test/bin/" - install -Dm755 ./lib/lib*test*.* -t "$test/lib/" - '' - # All of the test executables and libraries will have a reference to the build directory in their RPATH, which we - # must remove. We do this by shrinking the RPATH to only include the Nix store. The autoPatchelfHook will take care - # of supplying the correct RPATH for needed libraries (like `libtester.so`). - + '' - find "$test" -type f -exec \ - patchelf \ - --shrink-rpath \ - --allowed-rpath-prefixes "$NIX_STORE" \ - {} \; - ''; - - passthru = { - inherit - cudaPackages - cudaSupport - rocmSupport - gpuTargets - ; - testers = { - all = - let - magma = finalAttrs.finalPackage; - in - writeShellApplication { - derivationArgs = { - __structuredAttrs = true; - strictDeps = true; - }; - name = "magma-testers-all"; - text = '' - logWithDate() { - printf "%s: %s\n" "$(date --utc --iso-8601=seconds)" "$*" - } - - isIgnoredTest() { - case $1 in - # Skip the python scripts - *.py) return 0 ;; - - # These test require files, so we skip them - testing_?io) ;& - testing_?madd) ;& - testing_?matrix) ;& - testing_?matrixcapcup) ;& - testing_?matrixinfo) ;& - testing_?mcompressor) ;& - testing_?mconverter) ;& - testing_?preconditioner) ;& - testing_?solver) ;& - testing_?solver_rhs) ;& - testing_?solver_rhs_scaling) ;& - testing_?sort) ;& - testing_?spmm) ;& - testing_?spmv) ;& - testing_?spmv_check) ;& - testing_?sptrsv) ;& - testing_dsspmv_mixed) ;& - testing_zcspmv_mixed) - logWithDate "skipping $1 because it requires input" - return 0 - ;; - - # These test require outputing to files, so we skip them - testing_?print) - logWithDate "skipping $1 because it requires creating output" - return 0 - ;; - - # These test succeed but exit with a non-zero code - testing_[cdz]gglse) ;& - testing_sgemm_fp16) - logWithDate "skipping $1 because has a non-zero exit code" - return 0 - ;; - - # These test have memory freeing/allocation errors: - testing_?mdotc) - logWithDate "skipping $1 because it fails to allocate or free memory" - return 0 - ;; - - # Test is not ignored otherwise. - *) return 1 ;; - esac - } - - runTests() { - local -nr outputArray="$1" - local -i programExitCode=0 - local file - - # TODO: Collect and sort filenames prior to iterating so the order isn't dependent on the filesystem. - for file in "${magma.test}"/bin/*; do - if isIgnoredTest "$(basename "$file")"; then - continue - fi - - logWithDate "Starting $file" - - # Since errexit is set, we need to reset programExitCode every iteration and use an OR - # to set it only when the test fails (which should not fail, avoiding tripping errexit). - programExitCode=0 - - # A number of test cases require an input <=128, so we set the range to include [128, 1024]. - # Batch is kept small to keep tests fast. - "$file" --range 128:1024:896 --batch 32 || programExitCode=$? - - logWithDate "Finished $file with exit code $programExitCode" - - if ((programExitCode)); then - outputArray+=("$file") - fi - done - } - - main() { - local -a failedPrograms=() - runTests failedPrograms - - if ((''${#failedPrograms[@]})); then - logWithDate "The following programs had non-zero exit codes:" - for file in "''${failedPrograms[@]}"; do - # Using echo to avoid printing the date - echo "- $file" - done - logWithDate "Exiting with code 1 because at least one test failed." - exit 1 - fi - - logWithDate "All tests passed!" - exit 0 - } - - main - ''; - runtimeInputs = [ magma.test ]; - }; - }; - tests = { - all = - runCommand "magma-tests-all" - { - __structuredAttrs = true; - strictDeps = true; - nativeBuildInputs = [ finalAttrs.passthru.testers.all ]; - requiredSystemFeatures = lib.optionals cudaSupport [ "cuda" ]; - } - '' - if magma-testers-all; then - touch "$out" - else - exit 1 - fi - ''; - }; - }; - - meta = with lib; { - description = "Matrix Algebra on GPU and Multicore Architectures"; - license = licenses.bsd3; - homepage = "https://icl.utk.edu/magma/"; - changelog = "https://github.com/icl-utk-edu/magma/blob/v${version}/ReleaseNotes"; - platforms = platforms.linux; - maintainers = with maintainers; [ connorbaker ]; - - # Cf. https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L24-L31 - broken = - # dynamic CUDA support is broken https://github.com/NixOS/nixpkgs/issues/239237 - (cudaSupport && !static) - || !(cudaSupport || rocmSupport) # At least one back-end enabled - || (cudaSupport && rocmSupport); # Mutually exclusive - }; -}) diff --git a/pkgs/development/libraries/science/math/magma/releases.nix b/pkgs/development/libraries/science/math/magma/releases.nix deleted file mode 100644 index 2d0566300330..000000000000 --- a/pkgs/development/libraries/science/math/magma/releases.nix +++ /dev/null @@ -1,38 +0,0 @@ -# NOTE: Order matters! Put the oldest version first, and the newest version last. -# NOTE: Make sure the supportedGpuTargets are in order of oldest to newest. -# You can update the supportedGpuTargets by looking at the CMakeLists.txt file. -# HIP is here: https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L290 -# CUDA works around magma's wrappers and uses FindCUDAToolkit directly -[ - { - version = "2.9.0"; - hash = "sha256-/3f9Nyaz3+w7+1V5CwZICqXMOEOWwts1xW/a5KgsZBw="; - supportedGpuTargets = [ - "700" - "701" - "702" - "703" - "704" - "705" - "801" - "802" - "803" - "805" - "810" - "900" - "902" - "904" - "906" - "908" - "909" - "90c" - "1010" - "1011" - "1012" - "1030" - "1031" - "1032" - "1033" - ]; - } -] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f64bfcdaa731..c68b3c77fee4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15093,7 +15093,7 @@ with pkgs; # standard BLAS and LAPACK. openblasCompat = openblas.override { blas64 = false; }; - inherit (callPackage ../development/libraries/science/math/magma { }) magma; + magma = callPackage ../development/libraries/science/math/magma { }; magma-cuda = magma.override { cudaSupport = true; From 93a72b31a24253b2a2615038a183ee0c2a82acdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Aug 2025 19:09:23 +0000 Subject: [PATCH 34/56] lunatask: 2.1.3 -> 2.1.5 --- pkgs/by-name/lu/lunatask/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix index 9b10af3ab239..364250a0e5ac 100644 --- a/pkgs/by-name/lu/lunatask/package.nix +++ b/pkgs/by-name/lu/lunatask/package.nix @@ -6,12 +6,12 @@ }: let - version = "2.1.3"; + version = "2.1.5"; pname = "lunatask"; src = fetchurl { url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage"; - hash = "sha256-kVNuCtUyY8UkalXlIpfenjB4JApDZVabawLOhFxToyY="; + hash = "sha256-kuf3NE7or7zCcefShhKzVoCX7WsnHwtleZRafKYhWrM="; }; appimageContents = appimageTools.extract { From ba4e30cb287ec51ef130a113219d137fc7f64566 Mon Sep 17 00:00:00 2001 From: David Pesticcio Date: Mon, 4 Aug 2025 23:11:42 +0100 Subject: [PATCH 35/56] squid: Include missing file in installPhase, log_file_daemon --- pkgs/by-name/sq/squid/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix index 569c9f556f2e..56bb9d698eb8 100644 --- a/pkgs/by-name/sq/squid/package.nix +++ b/pkgs/by-name/sq/squid/package.nix @@ -88,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: { cp src/squid $out/bin cp src/unlinkd $out/libexec cp src/mime.conf.default $out/etc/mime.conf + cp src/log/file/log_file_daemon $out/libexec cp -r icons $out/share cp -r errors $out/share runHook postInstall From cb87b383763150caa2669edcb497059aea21dd1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 00:59:16 +0000 Subject: [PATCH 36/56] blackfire: 2.28.29 -> 2.28.31 --- pkgs/by-name/bl/blackfire/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/bl/blackfire/package.nix b/pkgs/by-name/bl/blackfire/package.nix index cbf5e5d26ee3..fc6896b8c19a 100644 --- a/pkgs/by-name/bl/blackfire/package.nix +++ b/pkgs/by-name/bl/blackfire/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.29"; + version = "2.28.31"; src = passthru.sources.${stdenv.hostPlatform.system} @@ -60,23 +60,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "WIL8Y2pQq9vYuSI2fq2+T21HvjAd6PJPWKi4phKB5pw="; + sha256 = "v2MkLqTNG9creNZBBshTuhrMxlF4OIDlzQOgrEyKmMY="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "hcTVPb1zGrR3C1b5F2bgIzwH/lZV0ujeERNx0qt00Pc="; + sha256 = "hFJdO/YFxwCpWBmR8jZwmak2Fc9wgMwLax5puaLVEbs="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "7Qs47SjAhsOAIcCCCJk7jjDD1ab7CyjbPHfXl25z9mE="; + sha256 = "RDk4DE0x24m5yBBezlGuLQ/l7yugyd5SYvfYoDFfJuI="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "v4ApyuA9kMfqZAGVXPSSJJS0fm9lP2zz0iD8lf9VGa0="; + sha256 = "Xq0G0w2FJXEGVmXmyhbdzXY9OiZn4+5i8GypMOdeAhA="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "t78kpafSfbCA/0Kzhn/+/wjAet2qne33CYqFvRT0XUM="; + sha256 = "cHmh1JyPa2u2c6KGlZC1/hlDlxMSrDKY1jwaEcJVq0M="; }; }; From c206e6c1b19118f0695b5ed488582728ccf40e7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 01:34:39 +0000 Subject: [PATCH 37/56] libretro.flycast: 0-unstable-2025-07-11 -> 0-unstable-2025-08-01 --- pkgs/applications/emulators/libretro/cores/flycast.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix index 087c4bde3baa..2fbae3a49af2 100644 --- a/pkgs/applications/emulators/libretro/cores/flycast.nix +++ b/pkgs/applications/emulators/libretro/cores/flycast.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "flycast"; - version = "0-unstable-2025-07-11"; + version = "0-unstable-2025-08-01"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "48c58dbd18501fae92e641b6ee6ca5ca9de0d5c3"; - hash = "sha256-AlvNh+tDY7FEqUm5zgm7072Z1zIXn54tvLGzLbTjLXo="; + rev = "40e400ab084175d3bd0f9e10cf8d6ac78c8b9544"; + hash = "sha256-k/w1tmuGuRD98bR/kmc/9pLFGeobHMhKQapJOv8qVJo="; fetchSubmodules = true; }; From 467bcafe13e422eea20aaa39d263d5847dd5d027 Mon Sep 17 00:00:00 2001 From: botnk Date: Wed, 6 Aug 2025 01:56:41 +0000 Subject: [PATCH 38/56] zed-editor: 0.197.5 -> 0.197.6 Changelog: https://github.com/zed-industries/zed/releases/tag/v0.197.6 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index fb8d2e1f7b0d..b651ddd6dff1 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.197.5"; + version = "0.197.6"; outputs = [ "out" @@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-IbyM7iM9ErzVSb07NgTpgRI2VH1y+DJeKKiFYLyOqpk="; + hash = "sha256-+QynG2YvAxl3v6Rb89+wv4wSSrBKYKeYfmoQ6pGLa4w="; }; patches = [ @@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)" ''; - cargoHash = "sha256-ECtVsZiOEYsax8Zp4EFqbtCo/w6FfjJCnPWJ7YnmQ0U="; + cargoHash = "sha256-O5HUOVtaxUdanh83JjauUskMnEv+y7BWY6S7T4WbgyE="; nativeBuildInputs = [ cmake From 6fe8527c2c8c4a776d92e2bc1d4fa9119fe93025 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 02:48:28 +0000 Subject: [PATCH 39/56] renode-dts2repl: 0-unstable-2025-07-24 -> 0-unstable-2025-08-01 --- pkgs/by-name/re/renode-dts2repl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 0f783ed5cb4d..78c1a5e44bbb 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2025-07-24"; + version = "0-unstable-2025-08-01"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "b94aaad8ad6cd3252160a11ac37f2bde8280d1b0"; - hash = "sha256-Cdg3uyZC55ajUlghHkqoGGN/kZnjuHVxIEvo2LDua1Q="; + rev = "c281274af377459710de24eb44672bb9a37d10b1"; + hash = "sha256-K2dlQHBKDNh5ndGvbRr35AMG/g1Bvmsumr9uBuRxHZ8="; }; nativeBuildInputs = [ From cb66c5af0d35563d917776d88efe7b830233c212 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 04:53:52 +0000 Subject: [PATCH 40/56] vimPlugins.avante-nvim: 0.0.27-unstable-2025-07-28 -> 0.0.27-unstable-2025-08-06 --- .../vim/plugins/non-generated/avante-nvim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index 2d087f10ba6c..ba0190c093d1 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -12,12 +12,12 @@ pkgs, }: let - version = "0.0.27-unstable-2025-07-28"; + version = "0.0.27-unstable-2025-08-06"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - rev = "5e4eb8652b4776f139282a343f04a3a8c7f23cb0"; - hash = "sha256-rmpBI2j7zwU5tIUjK7fMhfle5LVksk/kuCnwN9WQkic="; + rev = "2fc63d4128d2dc2fef0913c7480b4586959ebe4e"; + hash = "sha256-hHa300Ldszsnp6AuYVJwOFc5FfuRTd3phyM6/qBUIQo="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; From a4eecb097601b1ad337ec540fefbf6d67a911970 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Tue, 5 Aug 2025 22:38:30 -0700 Subject: [PATCH 41/56] wayland-bongocat: add versionCheckHook Signed-off-by: awwpotato --- pkgs/by-name/wa/wayland-bongocat/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/wa/wayland-bongocat/package.nix b/pkgs/by-name/wa/wayland-bongocat/package.nix index 6079709e47f3..01c5429075ed 100644 --- a/pkgs/by-name/wa/wayland-bongocat/package.nix +++ b/pkgs/by-name/wa/wayland-bongocat/package.nix @@ -6,6 +6,7 @@ wayland, wayland-protocols, wayland-scanner, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "wayland-bongocat"; @@ -45,6 +46,9 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + # Package information meta = { description = "Delightful Wayland overlay that displays an animated bongo cat reacting to keyboard input"; From 630305f8532a742638b0b0e0aee79f1052c7f073 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Tue, 5 Aug 2025 22:42:27 -0700 Subject: [PATCH 42/56] inspec: remove with lib Signed-off-by: awwpotato --- pkgs/tools/misc/inspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/inspec/default.nix b/pkgs/tools/misc/inspec/default.nix index e020191a3a79..eb3f3c2530ad 100644 --- a/pkgs/tools/misc/inspec/default.nix +++ b/pkgs/tools/misc/inspec/default.nix @@ -15,11 +15,11 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "inspec"; - meta = with lib; { + meta = { description = "Inspec is an open-source testing framework for infrastructure with a human- and machine-readable language for specifying compliance, security and policy requirements"; homepage = "https://inspec.io/"; - license = licenses.asl20; - maintainers = with maintainers; [ dylanmtaylor ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dylanmtaylor ]; mainProgram = "inspec"; }; } From 174bac31abd00b2575111387247b2a652a5a4a3c Mon Sep 17 00:00:00 2001 From: awwpotato Date: Tue, 5 Aug 2025 22:43:23 -0700 Subject: [PATCH 43/56] inspec: move to by-name Signed-off-by: awwpotato --- pkgs/{tools/misc => by-name/in}/inspec/Gemfile | 0 pkgs/{tools/misc => by-name/in}/inspec/Gemfile.lock | 0 pkgs/{tools/misc => by-name/in}/inspec/gemset.nix | 0 .../misc/inspec/default.nix => by-name/in/inspec/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{tools/misc => by-name/in}/inspec/Gemfile (100%) rename pkgs/{tools/misc => by-name/in}/inspec/Gemfile.lock (100%) rename pkgs/{tools/misc => by-name/in}/inspec/gemset.nix (100%) rename pkgs/{tools/misc/inspec/default.nix => by-name/in/inspec/package.nix} (100%) diff --git a/pkgs/tools/misc/inspec/Gemfile b/pkgs/by-name/in/inspec/Gemfile similarity index 100% rename from pkgs/tools/misc/inspec/Gemfile rename to pkgs/by-name/in/inspec/Gemfile diff --git a/pkgs/tools/misc/inspec/Gemfile.lock b/pkgs/by-name/in/inspec/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/inspec/Gemfile.lock rename to pkgs/by-name/in/inspec/Gemfile.lock diff --git a/pkgs/tools/misc/inspec/gemset.nix b/pkgs/by-name/in/inspec/gemset.nix similarity index 100% rename from pkgs/tools/misc/inspec/gemset.nix rename to pkgs/by-name/in/inspec/gemset.nix diff --git a/pkgs/tools/misc/inspec/default.nix b/pkgs/by-name/in/inspec/package.nix similarity index 100% rename from pkgs/tools/misc/inspec/default.nix rename to pkgs/by-name/in/inspec/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7841c216b74f..9d47d9f1e734 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -383,8 +383,6 @@ with pkgs; inherit (gridlock) nyarr; - inspec = callPackage ../tools/misc/inspec { }; - lshw-gui = lshw.override { withGUI = true; }; kdePackages = callPackage ../kde { }; From b0075b9ee1e8ab9fbfc91ec0f7b5f07dae814673 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Tue, 5 Aug 2025 22:47:46 -0700 Subject: [PATCH 44/56] gitlab-triage: move to by-name --- .../version-management => by-name/gi}/gitlab-triage/Gemfile | 0 .../gi}/gitlab-triage/Gemfile.lock | 0 .../version-management => by-name/gi}/gitlab-triage/gemset.nix | 0 .../default.nix => by-name/gi/gitlab-triage/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{applications/version-management => by-name/gi}/gitlab-triage/Gemfile (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab-triage/Gemfile.lock (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab-triage/gemset.nix (100%) rename pkgs/{applications/version-management/gitlab-triage/default.nix => by-name/gi/gitlab-triage/package.nix} (100%) diff --git a/pkgs/applications/version-management/gitlab-triage/Gemfile b/pkgs/by-name/gi/gitlab-triage/Gemfile similarity index 100% rename from pkgs/applications/version-management/gitlab-triage/Gemfile rename to pkgs/by-name/gi/gitlab-triage/Gemfile diff --git a/pkgs/applications/version-management/gitlab-triage/Gemfile.lock b/pkgs/by-name/gi/gitlab-triage/Gemfile.lock similarity index 100% rename from pkgs/applications/version-management/gitlab-triage/Gemfile.lock rename to pkgs/by-name/gi/gitlab-triage/Gemfile.lock diff --git a/pkgs/applications/version-management/gitlab-triage/gemset.nix b/pkgs/by-name/gi/gitlab-triage/gemset.nix similarity index 100% rename from pkgs/applications/version-management/gitlab-triage/gemset.nix rename to pkgs/by-name/gi/gitlab-triage/gemset.nix diff --git a/pkgs/applications/version-management/gitlab-triage/default.nix b/pkgs/by-name/gi/gitlab-triage/package.nix similarity index 100% rename from pkgs/applications/version-management/gitlab-triage/default.nix rename to pkgs/by-name/gi/gitlab-triage/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7841c216b74f..62d69b871864 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2996,8 +2996,6 @@ with pkgs; gitlabEnterprise = true; }; - gitlab-triage = callPackage ../applications/version-management/gitlab-triage { }; - gitlab-workhorse = callPackage ../by-name/gi/gitlab/gitlab-workhorse { }; glogg = libsForQt5.callPackage ../tools/text/glogg { }; From 11ef0d0e5e6f9bbb40cda8728aeaea744169cfc2 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sun, 3 Aug 2025 21:46:46 +0200 Subject: [PATCH 45/56] linuxPackages.perf: remove perl dependency remove installed test files, they are unused in nixpkgs. If anyone actually cares about them, they can be reinstated in their own output. --- pkgs/os-specific/linux/kernel/perf/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index d0caa28e1432..7a3f5160bf5f 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -6,7 +6,6 @@ kernelModuleMakeFlags, elfutils, python3, - perl, newt, slang, asciidoc, @@ -137,7 +136,6 @@ stdenv.mkDerivation { openssl numactl python3 - perl babeltrace ] ++ ( @@ -177,7 +175,7 @@ stdenv.mkDerivation { doCheck = false; # requires "sparse" installTargets = [ - "install" + "install-tools" # don't install tests, as those depend on perl "install-man" ]; From 8ee7cb99fb78981733c64e2e0c60b957261843f0 Mon Sep 17 00:00:00 2001 From: katrinafyi <39479354+katrinafyi@users.noreply.github.com> Date: Mon, 28 Jul 2025 15:55:32 +1000 Subject: [PATCH 46/56] ocamlPackages.ppx_deriving: propagate `ppxlib` dependency this fixes an error when using `ppx_deriving` in a downstream project. ``` ocaml5.3.0-basil_lsp> File "/nix/store/x-ocaml5.3.0-ppx_deriving-6.0.3/lib/ocaml/5.3.0/site-lib/ppx_deriving/META", line 1, characters 0-0: ocaml5.3.0-basil_lsp> Error: Library "ppxlib.ast" not found. ocaml5.3.0-basil_lsp> -> required by library "ppx_deriving.show" in ocaml5.3.0-basil_lsp> /nix/store/x-ocaml5.3.0-ppx_deriving-6.0.3/lib/ocaml/5.3.0/site-lib/ppx_deriving/show ``` --- pkgs/development/ocaml-modules/ppx_deriving/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index ce8df2188702..c71994967efd 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -47,12 +47,12 @@ buildDunePackage rec { nativeBuildInputs = [ cppo ]; buildInputs = [ findlib - ppxlib ]; propagatedBuildInputs = lib.optional (lib.versionOlder version "5.2") ocaml-migrate-parsetree ++ [ ppx_derivers + ppxlib ] ++ lib.optional (lib.versionOlder version "6.0") result; From c3a108d3cddfac32eedbc3c1d707ce1f38a927fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 07:24:17 +0000 Subject: [PATCH 47/56] sgt-puzzles: 20250722.dbe6378 -> 20250730.a7c7826 --- pkgs/games/sgt-puzzles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index a73fbf15372e..ea194ebedc76 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20250722.dbe6378"; + version = "20250730.a7c7826"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-ayNBRAAIForVZgHQJ1fr3m1aZ3bG9YNQxHTeO0YcwTA="; + hash = "sha256-oGk0HOXqXNxEVWixS6rptEF0bZYIkJeJzYhL3TSVhic="; }; sgt-puzzles-menu = fetchurl { From 1648103cba75ac083f1e63376684f9b668c1d927 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 07:38:48 +0000 Subject: [PATCH 48/56] hyprls: 0.7.0 -> 0.8.0 --- pkgs/by-name/hy/hyprls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyprls/package.nix b/pkgs/by-name/hy/hyprls/package.nix index 3815066a55ae..a22bd0ff2214 100644 --- a/pkgs/by-name/hy/hyprls/package.nix +++ b/pkgs/by-name/hy/hyprls/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "hyprls"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "hyprland-community"; repo = "hyprls"; rev = "v${version}"; - hash = "sha256-cJDDyF44nD/XvxtaGPYCk2MC574HDBHP1ByhVwqatvQ="; + hash = "sha256-txJSqXIkIYmjg/k5enChHHwJaoAhJ2c6hMHjS/i4v5c="; }; - vendorHash = "sha256-WTdwIAC3gDWgCKlVuOtMyl0ZfdZ9RhlpqUl2S2d65HA="; + vendorHash = "sha256-a2OdESOXrinALzC2AJ0cudMsDwzdi1Jl2kckI0OratA="; checkFlags = [ # Not yet implemented From 6c5f7adf5360eacb5320b5763d2996400d843880 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 6 Aug 2025 09:41:31 +0200 Subject: [PATCH 49/56] ollama: 0.11.0 -> 0.11.3 --- pkgs/by-name/ol/ollama/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index a0c2d6afabb7..445031a11df5 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -116,14 +116,13 @@ in goBuild (finalAttrs: { pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.11.0"; + version = "0.11.3"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-po7BxJAj9eOpOaXsLDmw6/1RyjXPtXza0YUv0pVojZ0="; - fetchSubmodules = true; + hash = "sha256-FghgCtVQIxc9qB5vZZlblugk6HLnxoT8xanZK+N8qEc="; }; vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4="; From dbb02214c92e61783940e3de2dd2ad76d9466d0c Mon Sep 17 00:00:00 2001 From: Merlin Humml Date: Wed, 6 Aug 2025 09:42:40 +0200 Subject: [PATCH 50/56] apache-jena: widened linux to unix compatability The tools are all sh scripts around Java executables so they work on all unix based systems with a JRE --- pkgs/servers/nosql/apache-jena/binary.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 43aa42f24dc9..df62ae38885a 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "RDF database"; license = licenses.asl20; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; homepage = "https://jena.apache.org"; downloadPage = "https://archive.apache.org/dist/jena/binaries/"; }; From 0aac58e8d28a1e67f5451ab2038cbfb7f68fb947 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 6 Aug 2025 09:43:49 +0200 Subject: [PATCH 51/56] magma: move to by-name --- .../math/magma/default.nix => by-name/ma/magma/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/science/math/magma/default.nix => by-name/ma/magma/package.nix} (100%) diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/by-name/ma/magma/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/magma/default.nix rename to pkgs/by-name/ma/magma/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6df7ccbf7b4..a4e46ab997d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15059,8 +15059,6 @@ with pkgs; # standard BLAS and LAPACK. openblasCompat = openblas.override { blas64 = false; }; - magma = callPackage ../development/libraries/science/math/magma { }; - magma-cuda = magma.override { cudaSupport = true; rocmSupport = false; From 68fe474447444aee679af03a63435f7390abdaf2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 6 Aug 2025 09:44:50 +0200 Subject: [PATCH 52/56] magma: cleanup --- pkgs/by-name/ma/magma/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ma/magma/package.nix b/pkgs/by-name/ma/magma/package.nix index d290f3f67c97..2e6a94e91990 100644 --- a/pkgs/by-name/ma/magma/package.nix +++ b/pkgs/by-name/ma/magma/package.nix @@ -6,7 +6,6 @@ cudaPackages, cudaSupport ? config.cudaSupport, fetchurl, - fetchpatch, gfortran, gpuTargets ? [ ], # Non-CUDA targets, that is HIP rocmPackages, @@ -381,13 +380,13 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "Matrix Algebra on GPU and Multicore Architectures"; - license = licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://icl.utk.edu/magma/"; - changelog = "https://github.com/icl-utk-edu/magma/blob/v${version}/ReleaseNotes"; - platforms = platforms.linux; - maintainers = with maintainers; [ connorbaker ]; + changelog = "https://github.com/icl-utk-edu/magma/blob/v${finalAttrs.version}/ReleaseNotes"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ connorbaker ]; # Cf. https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L24-L31 broken = From 76fcdf42745b4034eae512a5f61e6389160dd96a Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Wed, 6 Aug 2025 10:06:31 +0200 Subject: [PATCH 53/56] claude-code: 1.0.67 -> 1.0.69 (#431362) Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md - Upgraded Opus to version 4.1 - Fixed incorrect model names for certain commands like "/pr-comments" - Improved Windows permissions checks for allow/deny tools and project trust - Enhanced Windows sub-process spawning to eliminate "No such file or directory" errors - Added enhanced "/doctor" command with CLAUDE.md and MCP tool context - Added SDK support for tool confirmation callbacks - Added "disableAllHooks" setting - Improved file suggestions performance in large repositories --- pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++---- pkgs/by-name/cl/claude-code/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 769bd17e8ba9..9c756ed22392 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -6,13 +6,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^1.0.67" + "@anthropic-ai/claude-code": "^1.0.69" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "1.0.67", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.67.tgz", - "integrity": "sha512-r7CfhbKBXgaL5Wo0BIh08SOahFYQPcbHCNnMLtse7iDd2IVBWeOxqoiqQvzRQ0wTCiqLTshRbnmLWHyP4AbuyQ==", + "version": "1.0.69", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.69.tgz", + "integrity": "sha512-kF86lNI9o6rt14cEDw16G89rHz4pL0lv/sASztV8XenEeQ/6VUZ5Jk+icYg6XTQKe33BsdtNKFS3IL3iLyzQyw==", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 1265a1d2128b..0fcca8929992 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "claude-code"; - version = "1.0.67"; + version = "1.0.69"; nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-NZgv0nGsq+RuPTJcX0GsE1NWs/PFge2A0ek3BL1fJeY="; + hash = "sha256-uZbe7N3FSAVxNxL7npujJcBFH6ZjnwDz327bZWN2IEM="; }; - npmDepsHash = "sha256-v994F0x0LCh+QbIfCywk5agxn7tNhhi+uo/3ka5Iuww="; + npmDepsHash = "sha256-a06NT96pVOiz06ZZ9r+1s+oF9U/I7SRJFFAw1e0NkMY="; postPatch = '' cp ${./package-lock.json} package-lock.json From ffb03c81d204c090768024f76424d7bb05113577 Mon Sep 17 00:00:00 2001 From: "user.email" Date: Wed, 6 Aug 2025 06:50:59 -0400 Subject: [PATCH 54/56] cargo-tauri: unbreak test app --- pkgs/by-name/ca/cargo-tauri/test-app.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix index bfc6cac5eaae..fd5f5f359972 100644 --- a/pkgs/by-name/ca/cargo-tauri/test-app.nix +++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix @@ -16,6 +16,7 @@ let pnpm = pnpm_9; in + stdenv.mkDerivation (finalAttrs: { pname = "test-app"; inherit (cargo-tauri) version src; @@ -35,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ; fetcherVersion = 1; - hash = "sha256-I++iYwqSxACmXFvfPYAnY/0WSWSY6ElJYnylJDC03D8="; + hash = "sha256-7F2vk6WUeXunTuXX9J0rVhl2I0ENYagRdqTy+WAXBB8="; }; nativeBuildInputs = [ From 51345f343a93f16b0a752ab07030859a10af3541 Mon Sep 17 00:00:00 2001 From: Rintaro Okamura Date: Wed, 6 Aug 2025 20:03:47 +0900 Subject: [PATCH 55/56] open-policy-agent: fix opa 1.6.0 build on darwin (#423747) * open-policy-agent: fix opa 1.6.0 build on darwin Signed-off-by: Rintaro Okamura * open-policy-agent: add skipped tests for darwin Signed-off-by: Rintaro Okamura * open-policy-agent: skip flaky tests on darwin Signed-off-by: Rintaro Okamura --------- Signed-off-by: Rintaro Okamura --- pkgs/by-name/op/open-policy-agent/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix index 6138c0e579f3..f06daaa968a3 100644 --- a/pkgs/by-name/op/open-policy-agent/package.nix +++ b/pkgs/by-name/op/open-policy-agent/package.nix @@ -61,6 +61,13 @@ buildGoModule (finalAttrs: { # Skip tests that require network, not available in the darwin sandbox "TestHTTPSClient" "TestHTTPSNoClientCerts" + "TestSocketHTTPGetRequest" + + # Flaky + "TestBenchMainWithBundleRegoVersion" + "TestClientTLSWithCustomCACert" + "TestECR" + "TestManagerWithOPATelemetryUpdateLoop" ] ++ lib.optionals (!enableWasmEval) [ "TestRegoTargetWasmAndTargetPluginDisablesIndexingTopdownStages" @@ -81,6 +88,7 @@ buildGoModule (finalAttrs: { # remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra + lib.optionalString stdenv.hostPlatform.isDarwin '' rm v1/server/server_test.go + rm v1/server/server_bench_test.go ''; postInstall = '' From a07a5df79564534831e8f94ab0c875f2a91004f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 11:13:29 +0000 Subject: [PATCH 56/56] nest-cli: 11.0.8 -> 11.0.10 --- pkgs/by-name/ne/nest-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nest-cli/package.nix b/pkgs/by-name/ne/nest-cli/package.nix index c5f1a457218d..18a09e2c6aee 100644 --- a/pkgs/by-name/ne/nest-cli/package.nix +++ b/pkgs/by-name/ne/nest-cli/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "nest-cli"; - version = "11.0.8"; + version = "11.0.10"; src = fetchFromGitHub { owner = "nestjs"; repo = "nest-cli"; tag = version; - hash = "sha256-vqu5eUtr8oO2HgQhXIHel92qHhHJSqyAJmI2+Oc5VoY="; + hash = "sha256-mNnEbZv6LG5YDYZj7kAiPcg2Se9wJidON+9Tp/TIpd4="; }; - npmDepsHash = "sha256-QLJBqVHEvOhRRGU9x/5hCvRSi0xKYMDXeqMi6yWNHbU="; + npmDepsHash = "sha256-dEg0WmNNNLMQj+9bHkwf0uz9Vyx+QFSHrQv7fk1DxjQ="; npmFlags = [ "--legacy-peer-deps" ]; env = {