From 0050e4fdae9809712da1c4396485df74ec598ded Mon Sep 17 00:00:00 2001 From: yaya Date: Wed, 13 May 2026 12:42:54 +0200 Subject: [PATCH 01/51] gitlab-runner: 18.11.2 -> 18.11.3 - Changelog: https://gitlab.com/gitlab-org/gitlab-runner/blob/v18.11.3/CHANGELOG.md - Diff: https://gitlab.com/gitlab-org/gitlab-runner/-/compare/v18.11.2...v18.11.3 --- pkgs/by-name/gi/gitlab-runner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index da2c49252ccf..0e5e6e72474f 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "gitlab-runner"; - version = "18.11.2"; + version = "18.11.3"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-TWpIu6LxFX5ssijlYQA/dmAiPrB0nrHtlS2MWEk6C30="; + hash = "sha256-/QMmBDZz6nWmc9hODS3yVe9iyNERbebGysZ1Z4B5Gw8="; }; vendorHash = "sha256-xEvvYAVIwHwQDd38P2i6GcgFqf8FPnflWh5IEqmWQdE="; From 1309675d1cc66a07f61da62e3925db5e511566c5 Mon Sep 17 00:00:00 2001 From: yaya Date: Wed, 13 May 2026 14:27:10 +0200 Subject: [PATCH 02/51] gitlab-runner: add `meta.changelog` --- pkgs/by-name/gi/gitlab-runner/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index 0e5e6e72474f..3fd603a4ce6e 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -123,6 +123,7 @@ buildGoModule (finalAttrs: { meta = { description = "GitLab Runner the continuous integration executor of GitLab"; homepage = "https://docs.gitlab.com/runner"; + changelog = "https://gitlab.com/gitlab-org/gitlab-runner/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; mainProgram = "gitlab-runner"; maintainers = with lib.maintainers; [ zimbatm ]; From 13e00792bcdc8250a899b850484ea324803a9f8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 May 2026 03:51:23 +0000 Subject: [PATCH 03/51] gelly: 1.1.2 -> 1.3.0 --- pkgs/by-name/ge/gelly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/gelly/package.nix b/pkgs/by-name/ge/gelly/package.nix index d2a6d9266c28..a043039552d0 100644 --- a/pkgs/by-name/ge/gelly/package.nix +++ b/pkgs/by-name/ge/gelly/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gelly"; - version = "1.1.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Fingel"; repo = "gelly"; tag = "v${finalAttrs.version}"; - hash = "sha256-oEDpfpOkA0J9fSF+haEvhmZGSZIRCaN2qHa2pHUujBs="; + hash = "sha256-BnBfz9gE3pz6cL7uAnzSEdI0h7rXCcsFZ8oB5uw5zjY="; }; - cargoHash = "sha256-YpFeu5re+kYjjv6Id9kvus3oGmz3qExD8ofLFObAZdI="; + cargoHash = "sha256-2gkW+GJQ5TjOP4Me/g3le4/bxLgOoFlHOl/cVk/2lpM="; nativeBuildInputs = [ pkg-config From cb20eff9b702b559d1db10e49a525986471afa3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 May 2026 14:18:23 +0000 Subject: [PATCH 04/51] nvc: 1.20.1 -> 1.21.0 --- pkgs/by-name/nv/nvc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix index f0b3bd6e859f..1b8902f723c6 100644 --- a/pkgs/by-name/nv/nvc/package.nix +++ b/pkgs/by-name/nv/nvc/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nvc"; - version = "1.20.1"; + version = "1.21.0"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; tag = "r${finalAttrs.version}"; - hash = "sha256-IFuJvNOHE5qOjWgTbi5Ba5fUgEbM4FzNJRoZApnoaKw="; + hash = "sha256-aGRN12QL+ODcCpxRXK8RtjT7Zk+rd1ld1gjxlubPFgI="; }; nativeBuildInputs = [ From 1fd98b2b07e9e2e0e4e60f47ffd87b49a6f4a4a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 00:04:10 +0000 Subject: [PATCH 05/51] gefyra: 2.4.3 -> 2.4.4 --- pkgs/by-name/ge/gefyra/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/gefyra/package.nix b/pkgs/by-name/ge/gefyra/package.nix index 3d831bb775e7..410e03f0d7f6 100644 --- a/pkgs/by-name/ge/gefyra/package.nix +++ b/pkgs/by-name/ge/gefyra/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gefyra"; - version = "2.4.3"; + version = "2.4.4"; src = fetchzip { url = "https://github.com/gefyrahq/gefyra/releases/download/${finalAttrs.version}/gefyra-${finalAttrs.version}-linux-amd64.zip"; - hash = "sha256-HWcW4JX8XglcB3OkJKdaKtZ6D9Mdg3jff0nqHOS4ESg="; + hash = "sha256-uYXHmaJ+g13Jw1p910HpQf2382C08Or99kdyTLDOXtI="; stripRoot = false; }; From aebf2566611d7bb27b08bab6a44fefdaadc11c4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 May 2026 19:05:30 +0000 Subject: [PATCH 06/51] sarasa-gothic: 1.0.37 -> 1.0.39 --- pkgs/by-name/sa/sarasa-gothic/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix index cdb49d0adf24..b7ca247ad54a 100644 --- a/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.37"; + version = "1.0.39"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-YIupzXfSAnep7qKQ4sNtxABUiDwJvzX5QtiUduYEHb4="; + hash = "sha256-tVmPag6X7W54xEkbo6ClnGrMQuCmYhwX5++LJsaTDsc="; }; sourceRoot = "."; From 59394490a316a80b0f42245d0f509b3745c9c1ec Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Sun, 24 May 2026 15:18:05 -0700 Subject: [PATCH 07/51] knewave: use installFonts --- pkgs/by-name/kn/knewave/package.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/kn/knewave/package.nix b/pkgs/by-name/kn/knewave/package.nix index 6127db35e770..3f42503893c8 100644 --- a/pkgs/by-name/kn/knewave/package.nix +++ b/pkgs/by-name/kn/knewave/package.nix @@ -2,12 +2,18 @@ lib, fetchFromGitHub, stdenvNoCC, + installFonts, }: stdenvNoCC.mkDerivation { pname = "knewave"; version = "2012-07-30"; + outputs = [ + "out" + "webfont" + ]; + src = fetchFromGitHub { owner = "theleagueof"; repo = "knewave"; @@ -15,14 +21,7 @@ stdenvNoCC.mkDerivation { hash = "sha256-SaJU2GlxU7V3iJNQzFKg1YugaPsiJuSZpC8NCqtWyz0="; }; - installPhase = '' - runHook preInstall - - install -D -m444 -t $out/share/fonts/truetype $src/*.ttf - install -D -m444 -t $out/share/fonts/opentype $src/*.otf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Bold, painted face for the rocker within"; From 20a0686130289a6090b1cb63a4ae968014023850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 24 May 2026 20:34:26 -0700 Subject: [PATCH 08/51] a2ps: 4.15.7 -> 4.15.8 --- pkgs/by-name/a2/a2ps/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/a2/a2ps/package.nix b/pkgs/by-name/a2/a2ps/package.nix index 3e4510996abc..9a8383ac4132 100644 --- a/pkgs/by-name/a2/a2ps/package.nix +++ b/pkgs/by-name/a2/a2ps/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "a2ps"; - version = "4.15.7"; + version = "4.15.8"; src = fetchurl { url = "mirror://gnu/a2ps/a2ps-${finalAttrs.version}.tar.gz"; - hash = "sha256-cV84Zwr9lQtMpxwB9Gj+760mXKUtPxEpNMY8Cov7uK8="; + hash = "sha256-jRORWjbrv6jnsjazUMyBrccUrLIXoY6NjGB0fArTU/k="; }; postPatch = '' @@ -39,6 +39,8 @@ stdenv.mkDerivation (finalAttrs: { libpaper ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=format-security"; + strictDeps = true; meta = { From 0955e394c810accecc8cff8f4d7d61f4108e4b1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 07:52:09 +0000 Subject: [PATCH 09/51] python3Packages.eigenpy: 3.12.0 -> 3.13.0 --- pkgs/development/python-modules/eigenpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index 9edac97dd23f..6d518ff7e734 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "eigenpy"; - version = "3.12.0"; + version = "3.13.0"; pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; tag = "v${version}"; - hash = "sha256-U4uL0knGJFpD14Gc32lgTZlw7QlXHMEqTnp0bmHJRU8="; + hash = "sha256-05G0U1RjVwggfnABxZH+9kxDIo7M9rgxHCcTvNgTZCQ="; }; outputs = [ From fde782a9eb0f93fa3face863d1ed2f47e688cf5d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 25 May 2026 12:45:45 +0200 Subject: [PATCH 10/51] roundcube: 1.7.0 -> 1.7.1 ChangeLog: https://github.com/roundcube/roundcubemail/releases/tag/1.7.1 --- pkgs/servers/roundcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 6ed84bd702e4..80cf515acfdf 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-o0w2baK3okrUpjgrS7mmd8tYHuCL/GME0KmnIQmOepg="; + sha256 = "sha256-HgOCvO/WJ6sLYoXTGB3fultET9z21J8z9eoV+/l4ZO8="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; From cffa0be3270f0f090b7063dcc24ba4824834df81 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 25 May 2026 14:58:45 +0200 Subject: [PATCH 11/51] zod: move env variables into env --- pkgs/by-name/zo/zod/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zo/zod/package.nix b/pkgs/by-name/zo/zod/package.nix index 161bf682b19e..577a0804e424 100644 --- a/pkgs/by-name/zo/zod/package.nix +++ b/pkgs/by-name/zo/zod/package.nix @@ -39,7 +39,9 @@ let coreutils ]; hardeningDisable = [ "format" ]; - NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql"; + env = { + NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql"; + }; zod_engine = stdenv.mkDerivation { inherit version @@ -48,7 +50,7 @@ let nativeBuildInputs buildInputs hardeningDisable - NIX_LDFLAGS + env ; pname = "zod-engine-engine"; enableParallelBuilding = true; @@ -67,7 +69,7 @@ let nativeBuildInputs buildInputs hardeningDisable - NIX_LDFLAGS + env ; pname = "zod-engine-map_editor"; enableParallelBuilding = true; From 8efa56d8d7d7b794b1d59c91fbce6005708d0b9b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 25 May 2026 15:01:33 +0000 Subject: [PATCH 12/51] python3Packages.numpy-quaternion: init at 2024.0.13 --- .../numpy-quaternion/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/numpy-quaternion/default.nix diff --git a/pkgs/development/python-modules/numpy-quaternion/default.nix b/pkgs/development/python-modules/numpy-quaternion/default.nix new file mode 100644 index 000000000000..639875be1c4c --- /dev/null +++ b/pkgs/development/python-modules/numpy-quaternion/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + numpy, + setuptools, + + # dependencies + scipy, + + # tests + pytest-cov-stub, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "numpy-quaternion"; + version = "2024.0.13"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "moble"; + repo = "quaternion"; + tag = "v${finalAttrs.version}"; + hash = "sha256-W35R+S6yzcKTpKtemjiLzH9v5owduUtos9DyoY28qbc="; + }; + + build-system = [ + hatchling + numpy + setuptools + ]; + + dependencies = [ + numpy + scipy + ]; + + pythonImportsCheck = [ "quaternion" ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + + meta = { + description = "Built-in support for quaternions in numpy"; + homepage = "https://github.com/moble/quaternion"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ce801b6ce8ef..c5358f2dac0d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11427,6 +11427,8 @@ self: super: with self; { numpy-groupies = callPackage ../development/python-modules/numpy-groupies { }; + numpy-quaternion = callPackage ../development/python-modules/numpy-quaternion { }; + numpy-stl = callPackage ../development/python-modules/numpy-stl { }; numpy-typing-compat = callPackage ../development/python-modules/numpy-typing-compat { }; From 6dd5a5d1bc84e365d79bcef174d7f8610434b65d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 25 May 2026 18:13:38 +0000 Subject: [PATCH 13/51] faiss: 1.14.1 -> 1.14.2 Diff: https://github.com/facebookresearch/faiss/compare/v1.14.1...v1.14.2 Changelog: https://github.com/facebookresearch/faiss/blob/v1.14.2/CHANGELOG.md --- pkgs/by-name/fa/faiss/package.nix | 11 +++++++---- pkgs/development/python-modules/faiss/default.nix | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fa/faiss/package.nix b/pkgs/by-name/fa/faiss/package.nix index 962d35ab0792..b4b74a815cfc 100644 --- a/pkgs/by-name/fa/faiss/package.nix +++ b/pkgs/by-name/fa/faiss/package.nix @@ -5,6 +5,7 @@ stdenv, capiSupport ? true, cmake, + swig, cudaPackages ? { }, cudaSupport ? config.cudaSupport, pythonSupport ? true, @@ -12,7 +13,6 @@ sharedLibrarySupport ? false, llvmPackages, blas, - swig, autoAddDriverRunpath, optLevel ? let @@ -42,7 +42,10 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "faiss"; - version = "1.14.1"; + version = "1.14.2"; + + __structuredAttrs = true; + strictDeps = true; outputs = [ "out" ] ++ lib.optionals pythonSupport [ "dist" ]; @@ -50,11 +53,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookresearch"; repo = "faiss"; tag = "v${finalAttrs.version}"; - hash = "sha256-p1YncYUUxld9iwFXXZ+lTxYgku8l+/K6dbxZx2EcJ6k="; + hash = "sha256-g8URLqh7VXlb5vvpkiUUfE6cgtkMwYNGzs26iUtg28A="; }; nativeBuildInputs = [ cmake + swig ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc @@ -68,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ blas - swig ] ++ lib.optionals pythonSupport [ python3Packages.numpy ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ] diff --git a/pkgs/development/python-modules/faiss/default.nix b/pkgs/development/python-modules/faiss/default.nix index 76bb135148f8..bf0f5dcdad32 100644 --- a/pkgs/development/python-modules/faiss/default.nix +++ b/pkgs/development/python-modules/faiss/default.nix @@ -12,6 +12,7 @@ buildPythonPackage { inherit (faiss-build) pname version; pyproject = true; + __structuredAttrs = true; src = "${lib.getOutput "dist" faiss-build}"; From 3b042d8236f05567e2f43fc88db8a73083c8f416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= Date: Mon, 25 May 2026 23:09:47 +0200 Subject: [PATCH 14/51] gonic: 0.20.1 -> 0.21.0 --- pkgs/by-name/go/gonic/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gonic/package.nix b/pkgs/by-name/go/gonic/package.nix index e5470be8825b..d25aab43dd58 100644 --- a/pkgs/by-name/go/gonic/package.nix +++ b/pkgs/by-name/go/gonic/package.nix @@ -20,15 +20,15 @@ buildGoModule rec { pname = "gonic"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "sentriz"; repo = "gonic"; rev = "v${version}"; - sha256 = "sha256-tW+GuNMMeiPf5XInR1BN2L7ommWh1SPClbRew8/2+cA="; + sha256 = "sha256-+plbpqaWWr3gA3grfl5yawEyrQyw6h6rvATqGxEO09c="; }; - vendorHash = "sha256-ynoIR4S02v3qec7447feuu/igFWR20VQVbL0GbTBpqM="; + vendorHash = "sha256-OynYgtqWNMyrUvysi9cNqL0nAfUXP8cOEx02lSP6E7E="; # TODO(Profpatsch): write a test for transcoding support, # since it is prone to break From 27f098e56ebd960409f2b3de4865e5130499860e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 21:11:42 +0000 Subject: [PATCH 15/51] vunnel: 0.57.0 -> 0.58.0 --- pkgs/by-name/vu/vunnel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index 7b384b67eb9e..a97fb6503978 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "vunnel"; - version = "0.57.0"; + version = "0.58.0"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; tag = "v${finalAttrs.version}"; - hash = "sha256-ofxc4Mbd5MUoIQ+iAUPF54rxWuwQEA2t3T+vjO3UUgA="; + hash = "sha256-9rxQ96PVbU5GCSpp3BDW1p/1jBnZzkmPkwblERv9CCc="; leaveDotGit = true; }; From 738acf24b8e1f5fe3a2e4ac3ee02b3144a33fd3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= Date: Mon, 25 May 2026 23:14:00 +0200 Subject: [PATCH 16/51] gonic: use finalAttrs --- pkgs/by-name/go/gonic/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gonic/package.nix b/pkgs/by-name/go/gonic/package.nix index d25aab43dd58..228922950b82 100644 --- a/pkgs/by-name/go/gonic/package.nix +++ b/pkgs/by-name/go/gonic/package.nix @@ -18,13 +18,13 @@ mpv, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gonic"; version = "0.21.0"; src = fetchFromGitHub { owner = "sentriz"; repo = "gonic"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-+plbpqaWWr3gA3grfl5yawEyrQyw6h6rvATqGxEO09c="; }; @@ -68,4 +68,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ autrimpo ]; mainProgram = "gonic"; }; -} +}) From cdb7b3d5927002c425851125ade06269791165c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= Date: Mon, 25 May 2026 23:16:38 +0200 Subject: [PATCH 17/51] doc/rl-2605: add a note about recommended gonic library rescan --- doc/release-notes/rl-2605.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index b3d4ce569f09..3b4c274609f8 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -366,6 +366,8 @@ - We now use the upstream wrapper script for Gradle, supporting both the `JAVA_HOME` and `GRADLE_OPTS` environment variables. +- Updated `gonic` to 0.21.0. A full ("slow") scan is recommended after upgrading to v0.21.0 to pick up the newly scanned fields (contributors, ISRCs, record labels, per-track years, ARTIST_CREDIT). + - the `autossh-ng` NixOS module was introduced as a simpler alternative to the existing `autossh` module. - Added `haskell.packages.microhs`, a set of Haskell packages built with MicroHs. From d66f1459a5fb38d0f583dee5ed2589e12d52b0e1 Mon Sep 17 00:00:00 2001 From: kyehn Date: Fri, 22 May 2026 00:49:16 +0000 Subject: [PATCH 18/51] vouch-proxy: 0.45.1 -> 0.47.2 --- pkgs/by-name/vo/vouch-proxy/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vo/vouch-proxy/package.nix b/pkgs/by-name/vo/vouch-proxy/package.nix index a61b99f7790f..0eb1021d060c 100644 --- a/pkgs/by-name/vo/vouch-proxy/package.nix +++ b/pkgs/by-name/vo/vouch-proxy/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "vouch-proxy"; - version = "0.45.1"; + version = "0.47.2"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; tag = "v${finalAttrs.version}"; - hash = "sha256-xI9xucRb2D2a1Fvp5DetB4ln3C020qSGEVnuIpy1TMI="; + hash = "sha256-BdqdJosX1Z1CsPDW65ybk6oGdSk/RXHPaEJuuIedNJ4="; }; - vendorHash = "sha256-hieN3RJA0eBqlYxJj6hKgpQhq8s3vg/fPzxW0XSrlPA="; + vendorHash = "sha256-Ma5/S2PXQ9lByIpIfkkLeiw/9rvmasSMElE1VoGIEHc="; ldflags = [ "-s" @@ -27,6 +27,9 @@ buildGoModule (finalAttrs: { export VOUCH_ROOT=$PWD ''; + # TestClaimsHMAC requires network access to validate HMAC signatures + checkFlags = [ "-skip=TestClaimsHMAC" ]; + meta = { homepage = "https://github.com/vouch/vouch-proxy"; description = "SSO and OAuth / OIDC login solution for NGINX using the auth_request module"; From d8ffaef134a30bcce8ce7c984673308607760af3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 21:31:52 +0000 Subject: [PATCH 19/51] python3Packages.jaxtyping: 0.3.9 -> 0.3.10 --- pkgs/development/python-modules/jaxtyping/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index 36735b912689..e388ba7b5260 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -27,14 +27,15 @@ buildPythonPackage (finalAttrs: { pname = "jaxtyping"; - version = "0.3.9"; + version = "0.3.10"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "jaxtyping"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ex84xtns3wtIodXdpC6/88Kn0I+33B7ScHPIc9C5tuY="; + hash = "sha256-7HhStNjVKjnPfXiuXDLsvwH1efSGSMqRuCWeOtpcidw="; }; build-system = [ hatchling ]; From 0f36d9316ba4db7fbf2c170941fd99c50edc71cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 May 2026 23:47:41 +0000 Subject: [PATCH 20/51] libretro.mame2003-plus: 0-unstable-2026-05-15 -> 0-unstable-2026-05-23 --- .../applications/emulators/libretro/cores/mame2003-plus.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix index 69c42c934586..7e53c5b99b74 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "0-unstable-2026-05-15"; + version = "0-unstable-2026-05-23"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-plus-libretro"; - rev = "a4a02f8f26cc8e983faeabe0a7cfdd55f0ba5403"; - hash = "sha256-cBl67GBGaI69ETtGhwTiwxaTUl9vw8O69gdskfuoTUo="; + rev = "31c9da911c8b3227f4bd5e70dc5a1e3876cf9ada"; + hash = "sha256-5RipbW1eL+VOcl1JuwEOe9ZcTZiig7WWBfJONzAdVNE="; }; makefile = "Makefile"; From 955fec562204fdce8e1b0b1d12efccfb0bdfb4a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 02:01:14 +0000 Subject: [PATCH 21/51] clorinde: 1.4.1 -> 2.0.0 --- pkgs/by-name/cl/clorinde/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix index 7c86e6640fae..ba01ddfd35fa 100644 --- a/pkgs/by-name/cl/clorinde/package.nix +++ b/pkgs/by-name/cl/clorinde/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "clorinde"; - version = "1.4.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "halcyonnouveau"; repo = "clorinde"; tag = "clorinde-v${finalAttrs.version}"; - hash = "sha256-eqLY3iOunTdTZn7lfM8lLYk2e6EI1jW81BnRg/NaGuY="; + hash = "sha256-eWgFcyr9shcgUU4DlXl6SThbbRTMuvYOjY6hA4CCnQo="; }; - cargoHash = "sha256-OacfUdCtRyewr8OZFBh6NphccDwQ6diWA5JqPhtMi54="; + cargoHash = "sha256-p/ZqG1syI6ujgNbNnSSwUz7XpvHK7ua2zH0p3P3Ngec="; cargoBuildFlags = [ "--package=clorinde" ]; From 817291a6e53bf158b2035f7b4273f4b965b468ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 02:24:12 +0000 Subject: [PATCH 22/51] upsies: 2026.05.14 -> 2026.05.24 --- pkgs/by-name/up/upsies/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/up/upsies/package.nix b/pkgs/by-name/up/upsies/package.nix index 82475d40c785..601296e63301 100644 --- a/pkgs/by-name/up/upsies/package.nix +++ b/pkgs/by-name/up/upsies/package.nix @@ -18,14 +18,14 @@ let in python3Packages.buildPythonApplication (finalAttrs: { pname = "upsies"; - version = "2026.05.14"; + version = "2026.05.24"; pyproject = true; src = fetchFromCodeberg { owner = "plotski"; repo = "upsies"; tag = "v${finalAttrs.version}"; - hash = "sha256-/3jR49Rn1itps4Zz8h2//8Sq2+skVgk2Ydm+qvAzAw4="; + hash = "sha256-2gb5eGtEXPaFfFdfE6tBVQGPVmWwnA9Nm2N7OyinWEM="; }; patches = [ From 79d682bd414902b389109b1036a9e4622f036767 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 02:40:32 +0000 Subject: [PATCH 23/51] qbittorrent-nox: 5.2.0 -> 5.2.1 --- pkgs/by-name/qb/qbittorrent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix index 85343193cf40..7d21ed81972b 100644 --- a/pkgs/by-name/qb/qbittorrent/package.nix +++ b/pkgs/by-name/qb/qbittorrent/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${finalAttrs.version}"; - hash = "sha256-Ha2Pc08gztI9fupQMykVz5wVIyUu9dRtChxjAGSxcOQ="; + hash = "sha256-xC0XCVbshs4rtfLoJKKp0+IeSN2SRg7J5G504TcXFPI="; }; nativeBuildInputs = [ From 6e51d10a7fe82e5c5f6f54b2b89bfc9754104ff0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 02:50:18 +0000 Subject: [PATCH 24/51] codebook: 0.3.39 -> 0.3.40 --- pkgs/by-name/co/codebook/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix index 72c1c59cd855..346076c192ca 100644 --- a/pkgs/by-name/co/codebook/package.nix +++ b/pkgs/by-name/co/codebook/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "codebook"; - version = "0.3.39"; + version = "0.3.40"; src = fetchFromGitHub { owner = "blopker"; repo = "codebook"; tag = "v${finalAttrs.version}"; - hash = "sha256-u0BFbG7Vq2dIIJIlXe2rlNPD6iUVnb3uM95bLBg9CEU="; + hash = "sha256-+tjUqo5NO1cVMW2x7eKBw8PpPVvCtURCX/+pHKWT9Z4="; }; buildAndTestSubdir = "crates/codebook-lsp"; - cargoHash = "sha256-Tx2KxtUjQpJa2WDUlFQoNZItKowGv09ZTGytFuxL0yc="; + cargoHash = "sha256-IQdKVZLdXO9zQYDliPbvS7LrVT0h4zOKghJO/E5Zvus="; env = { CARGO_PROFILE_RELEASE_LTO = "fat"; From 345c7799602100e663a0c834b429a2c575f5eb17 Mon Sep 17 00:00:00 2001 From: Chenglun Hu Date: Tue, 26 May 2026 11:23:54 +0800 Subject: [PATCH 25/51] fzf: 0.72.0 -> 0.73.1 --- pkgs/by-name/fz/fzf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index 6a2521018aef..c16b66f477a9 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -11,7 +11,7 @@ buildGoModule (finalAttrs: { pname = "fzf"; - version = "0.72.0"; + version = "0.73.1"; __structuredAttrs = true; @@ -19,10 +19,10 @@ buildGoModule (finalAttrs: { owner = "junegunn"; repo = "fzf"; tag = "v${finalAttrs.version}"; - hash = "sha256-rUxbC2+VASAEBmL8WOpywk0SD0gyHArisl4pxnqK32I="; + hash = "sha256-xdhlbokeCzeBUP3YHA5u5tr3NTQz7n5TKPlJANp7yvM="; }; - vendorHash = "sha256-uFXHoseFOxGIGPiWxWfDl339vUv855VHYgSs9rnDyuI="; + vendorHash = "sha256-MLuoKPEAqrpCbUphYOCpHdo8MdW5kvueeDU/3loK33Q="; env.CGO_ENABLED = 0; From 0a3c9bc966b13c0ee09d1683c3823aee98f67340 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 03:30:49 +0000 Subject: [PATCH 26/51] python3Packages.types-awscrt: 0.31.3 -> 0.33.0 --- pkgs/development/python-modules/types-awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index e4a1617e3771..fd3c517e0442 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,13 +7,13 @@ buildPythonPackage (finalAttrs: { pname = "types-awscrt"; - version = "0.31.3"; + version = "0.33.0"; pyproject = true; src = fetchPypi { pname = "types_awscrt"; inherit (finalAttrs) version; - hash = "sha256-CdPq8AIx4PR+EBvZhn5DCHO8VwQAUOKjvYMFy0/DCGU="; + hash = "sha256-gDvH5+L2FyoKvXHfZZM2j4L8IxJ8oV0ofzYOn8vTqXc="; }; build-system = [ setuptools ]; From bc1858b5b478fa7ff61aecc657b3aa48f86a45d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 03:38:23 +0000 Subject: [PATCH 27/51] redpanda-client: 26.1.8 -> 26.1.9 --- pkgs/by-name/re/redpanda-client/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index 83bb11fe445e..50350ed8bad2 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "26.1.8"; + version = "26.1.9"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-/puIAMeUASG50U35RTRVIOlfD4NY3HZUZ6BKJzEh/s4="; + sha256 = "sha256-UrrFK4VjnovSH1ahmQPaKM/uZP0BA35ckvN4ELnfG10="; }; in buildGoModule rec { @@ -20,7 +20,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-d+qn0JiNF8YcsuhDSp/RPCly5nTy/daHaCUap2hLKCM="; + vendorHash = "sha256-kpcExQ/SRl0ghZqJi3Lcoc+M5oDepvMgfQI96O4u1Yw="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' From 55be8ee2d46f0cc1a8fa77c513161b3ff1eebca9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 03:53:27 +0000 Subject: [PATCH 28/51] tsukimi: 0.21.0 -> 26.5.3 --- pkgs/by-name/ts/tsukimi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix index 7e2fc3f69158..cd9015256e57 100644 --- a/pkgs/by-name/ts/tsukimi/package.nix +++ b/pkgs/by-name/ts/tsukimi/package.nix @@ -22,18 +22,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "tsukimi"; - version = "0.21.0"; + version = "26.5.3"; src = fetchFromGitHub { owner = "tsukinaha"; repo = "tsukimi"; tag = "v${finalAttrs.version}"; - hash = "sha256-FmxNOMYHoQK//v4ZGvJ6vIHKYgMfQm7LTwQV9iEFo0A="; + hash = "sha256-SKmt/dCMsK2dTzWU8Iq5YC75PJK3Q/fNK14MLX14+g8="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-iH7vCZhCN2/gu2EC+YG/LUL9N/HMMnj7qHqXUdrlAh8="; + hash = "sha256-M8MbBcBeK0GBwRCo2WTHG4COsojGBKg8LotOo5A6dF4="; }; nativeBuildInputs = [ From 42e6a9725d6e4c51b5e9210589fed66171d47105 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 04:08:27 +0000 Subject: [PATCH 29/51] cargo-deny: 0.19.6 -> 0.19.7 --- pkgs/by-name/ca/cargo-deny/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix index 175b562e0e50..d464fc1b2972 100644 --- a/pkgs/by-name/ca/cargo-deny/package.nix +++ b/pkgs/by-name/ca/cargo-deny/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-deny"; - version = "0.19.6"; + version = "0.19.7"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; tag = finalAttrs.version; - hash = "sha256-ttD3UgfFUuon80/O1RaGO+mOAyr1zHaUKqCqzjmTQSY="; + hash = "sha256-hdC8SagsZzdJ4FbBBPOt6/iAq3pHtNcS4xuYccJX56Y="; }; - cargoHash = "sha256-Ijd0Mk2p9fsN++U+9IvUu/nqJwI5N/vFigYFFbcEdXs="; + cargoHash = "sha256-2f+RWVTiz0ZBdBKBQfYTojssEHlyVl1mMhfHeulOgXE="; nativeBuildInputs = [ pkg-config From bcf5be94dd1d8a4e1fd18ec2ff8f0ab030bbb0af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 04:54:32 +0000 Subject: [PATCH 30/51] netgen-vlsi: 1.5.319 -> 1.5.320 --- pkgs/by-name/ne/netgen-vlsi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/netgen-vlsi/package.nix b/pkgs/by-name/ne/netgen-vlsi/package.nix index e0907cc57363..5c7f3173ff18 100644 --- a/pkgs/by-name/ne/netgen-vlsi/package.nix +++ b/pkgs/by-name/ne/netgen-vlsi/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "netgen"; - version = "1.5.319"; + version = "1.5.320"; src = fetchFromGitHub { owner = "RTimothyEdwards"; repo = "netgen"; tag = finalAttrs.version; - hash = "sha256-n6UoxoPfUlWrl/3HFEXsZTl+nSTjUzK9WSt4q1kXrZs="; + hash = "sha256-h4SESGTjeD8vtLiLFSkIlnBVQfysQvxWp4E5nS1wu4Y="; }; strictDeps = true; From 50f2b3385df970252773f73b602a7fa4f2dee383 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 05:50:27 +0000 Subject: [PATCH 31/51] python3Packages.gehomesdk: 2026.2.0 -> 2026.5.1 --- pkgs/development/python-modules/gehomesdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index df4dfb912947..093f71d6f24f 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -15,12 +15,12 @@ buildPythonPackage (finalAttrs: { pname = "gehomesdk"; - version = "2026.2.0"; + version = "2026.5.1"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-+BWGkUDKd+9QGbdXuLjmJxLm1xUv0dpIRlPlDkUJ25w="; + hash = "sha256-Q5YvefLDLvZAicBMaD6M7sASIfXllpf1kVlwWEd59zg="; }; build-system = [ setuptools ]; From 2a49571673e926142265de8e321e041477663ee2 Mon Sep 17 00:00:00 2001 From: Chenglun Hu Date: Tue, 26 May 2026 14:12:25 +0800 Subject: [PATCH 32/51] qsv: 19.1.0 -> 20.1.0 --- pkgs/by-name/qs/qsv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix index 3eb96885a7e8..64be3c4f433a 100644 --- a/pkgs/by-name/qs/qsv/package.nix +++ b/pkgs/by-name/qs/qsv/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "qsv"; - version = "19.1.0"; + version = "20.1.0"; inherit buildFeatures; @@ -41,10 +41,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "dathere"; repo = "qsv"; rev = finalAttrs.version; - hash = "sha256-R3Bv0Jkq5esLQSXbhk9m3Xr9K6EmqMtc3iDF7yRspJ0="; + hash = "sha256-dYUZ2IwvXTFwpv1cDQjmq+iq2g/vQQovpR0++/ZtSy8="; }; - cargoHash = "sha256-Wk5OVUKVWHvhWc1ItJcOafY75Pd8ucA3XAGUR//mtqg="; + cargoHash = "sha256-7jZR5u32Hy0XQEeX+tWDbpkj7jM804LBUL93wgnA5bM="; buildInputs = [ file From 190c510d99687052a4aa3164906556818771c82e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 07:09:04 +0000 Subject: [PATCH 33/51] avml: 0.17.0 -> 0.18.0 --- pkgs/by-name/av/avml/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/av/avml/package.nix b/pkgs/by-name/av/avml/package.nix index 35bbf219cdb2..bfa33693cb21 100644 --- a/pkgs/by-name/av/avml/package.nix +++ b/pkgs/by-name/av/avml/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "avml"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "avml"; tag = "v${finalAttrs.version}"; - hash = "sha256-G+0Q4V+7K6GuMc7c1s7DYSrV9l+deu0+KYAWZYdxNU0="; + hash = "sha256-d8H+UPCH3yyBNndlGzamgaPlhmvP4rcUSAywx8vYky0="; }; - cargoHash = "sha256-a6mCdhi2pBc+YE3iJnjjog37lZh/a2TQRihZc0X0M8g="; + cargoHash = "sha256-LxoyvjFVn69s9Wf8pF+9wBgOV4fJ/th6GPzLW6hbz0E="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From 522ef4b01cb39684e46cfed72601b87e00d009a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 07:17:47 +0000 Subject: [PATCH 34/51] vivaldi: 8.0.4033.26 -> 8.0.4033.34 --- pkgs/by-name/vi/vivaldi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix index f82edf5855c1..09210d1928be 100644 --- a/pkgs/by-name/vi/vivaldi/package.nix +++ b/pkgs/by-name/vi/vivaldi/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { pname = "vivaldi"; - version = "8.0.4033.26"; + version = "8.0.4033.34"; suffix = { @@ -80,8 +80,8 @@ stdenv.mkDerivation rec { url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-WJLEdzqF+HBdSSYLlkbxlSwO9IcYeFh7BTAk+2FQln8="; - x86_64-linux = "sha256-6BexB3ZQLNqMPjM9XQgX3RowF+cEJcQmV/Z9QpzhKOE="; + aarch64-linux = "sha256-K5R/h+BZ0thqejG/3VM12efeZwS4Mw3tq1iHr96HIHQ="; + x86_64-linux = "sha256-0sQQsiJLStBTzjrd6JRKzrZ/HUZpT68O3tLdLECl7IQ="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 82588ddebaf63627142b638442ab1588268b5d32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 07:32:21 +0000 Subject: [PATCH 35/51] home-assistant-custom-components.browser-mod: 2.13.3 -> 2.13.4 --- .../custom-components/browser-mod/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix b/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix index 4f6912a79dcd..67460224ab93 100644 --- a/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix +++ b/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "thomasloven"; domain = "browser_mod"; - version = "2.13.3"; + version = "2.13.4"; src = fetchFromGitHub { inherit owner; repo = "hass-browser_mod"; tag = "v${version}"; - hash = "sha256-Q7+9pcV9vZ+PPXjlOezcDPtzcekXqBHgPJSwh5n9ruE="; + hash = "sha256-AE23WTzVt3nF3oLeUdQ9p0kr+4q/Ymko82OOIxaNOcQ="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ buildHomeAssistantComponent rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-MeB1NgQM8HvQF42AaE1XkIt0aODVACO8a0wtUFOqVW8="; + hash = "sha256-1MlUUYkLBSsoeJRH56LXLwXWcrMVKYzW4HcayrR1tI8="; }; npmBuildScript = "build"; From bd783e582dce94f8c540675feabd2ae9bd1b48b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 07:36:32 +0000 Subject: [PATCH 36/51] terraform-providers.opentelekomcloud_opentelekomcloud: 1.36.65 -> 1.36.66 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 00f3762deb14..bbe378f9c828 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1040,13 +1040,13 @@ "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI=" }, "opentelekomcloud_opentelekomcloud": { - "hash": "sha256-NQ8yB4maHOF/sfFSSeCW9MNnAo/PgYrXAPRuM4NNti0=", + "hash": "sha256-P4G1VVlQO1wkl6+fAkVJXaRAkg/5nXpa8rP4zJmM+mg=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.65", + "rev": "v1.36.66", "spdx": "MPL-2.0", - "vendorHash": "sha256-NOsmv0G+tfNwqbPF8U4vihp3cd5Kn9N0dJBWh9m5X+Y=" + "vendorHash": "sha256-mMTZ+mAC7MoWCvOlGvT06bytYGRKX/yjRaPnXsmVtz8=" }, "opsgenie_opsgenie": { "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=", From 00c9ef82330e904a111f39bbc4a0b72dfc98dd57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 07:55:29 +0000 Subject: [PATCH 37/51] python3Packages.langchain-google-genai: 4.2.2 -> 4.2.3 --- .../python-modules/langchain-google-genai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-google-genai/default.nix b/pkgs/development/python-modules/langchain-google-genai/default.nix index e257fe4473f6..af7e50122f3a 100644 --- a/pkgs/development/python-modules/langchain-google-genai/default.nix +++ b/pkgs/development/python-modules/langchain-google-genai/default.nix @@ -29,14 +29,14 @@ buildPythonPackage (finalAttrs: { pname = "langchain-google-genai"; - version = "4.2.2"; + version = "4.2.3"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain-google"; tag = "libs/genai/v${finalAttrs.version}"; - hash = "sha256-W5JACbNUApJFz8XikKXGMY3XL1zdbaf+u9WmCQymy9M="; + hash = "sha256-OJQRYCzMa6y1F3gHFBAY+G3v3ZWzhw1ZqvbePTJyzr8="; }; sourceRoot = "${finalAttrs.src.name}/libs/genai"; From 1805404983a691d849c7c3f7907cfa6574de6e41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 08:04:38 +0000 Subject: [PATCH 38/51] gemini-cli: 0.42.0 -> 0.43.0 --- pkgs/by-name/ge/gemini-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index a9e4fff504e9..b4ac203be5da 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -15,18 +15,18 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-QYSzJdyjJ5SvPkI/uf/wu8MdM76W+djai6zD38IJpos="; + hash = "sha256-UFz+CQLGbzFlpa5Mhf/frnQJWttF35URvua1QTfoaZ0="; }; nodejs = nodejs_22; - npmDepsHash = "sha256-hKNEJ/MAseYs8WLr36h40pYv+5nef8EPhZIfmPKYJPY="; + npmDepsHash = "sha256-7Pl020NKKzRpQftzEYRpQ0v1mkPnO3kVZITvFSLYztI="; dontPatchElf = stdenv.hostPlatform.isDarwin; From b944d102ee676d7f7f8d41d09306cfec4966acd8 Mon Sep 17 00:00:00 2001 From: 2kybe3 Date: Sun, 3 May 2026 13:17:43 +0200 Subject: [PATCH 39/51] prometheus-bird-exporter: 1.4.3 -> 1.4.5 Diff: https://github.com/czerwonk/bird_exporter/compare/1.4.3...v1.4.5 Changelogs: - https://github.com/czerwonk/bird_exporter/releases/tag/v1.4.5 - https://github.com/czerwonk/bird_exporter/releases/tag/v1.4.4 --- .../pr/prometheus-bird-exporter/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-bird-exporter/package.nix b/pkgs/by-name/pr/prometheus-bird-exporter/package.nix index 64519fbf8418..2659ec8fdb34 100644 --- a/pkgs/by-name/pr/prometheus-bird-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-bird-exporter/package.nix @@ -5,26 +5,29 @@ nixosTests, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "bird-exporter"; - version = "1.4.3"; + version = "1.4.5"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "czerwonk"; repo = "bird_exporter"; - rev = version; - sha256 = "sha256-aClwJ+J83iuZbfNP+Y1vKEjBULD5wh/R3TMceCccacc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-uR3/2ktVxzEZOy57eFopLFsAuiw03e9WZn2QC4/GNVc="; }; - vendorHash = "sha256-0EXRpehdpOYpq6H9udmNnQ24EucvAcPUKOlFSAAewbE="; + vendorHash = "sha256-seTykqpdYQiWp8CoTAJ62rzxDaLFqjWe8y5YMu8Ypm8="; passthru.tests = { inherit (nixosTests.prometheus-exporters) bird; }; meta = { description = "Prometheus exporter for the bird routing daemon"; - mainProgram = "bird_exporter"; homepage = "https://github.com/czerwonk/bird_exporter"; + changelog = "https://github.com/czerwonk/bird_exporter/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lukegb ]; + mainProgram = "bird_exporter"; }; -} +}) From 9636984bdc535003b890fcbc9d43778ec83df589 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 08:42:32 +0000 Subject: [PATCH 40/51] terraform-providers.newrelic_newrelic: 3.87.3 -> 3.90.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 80b0a9cd6c98..8cc6c9b5fed1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -968,13 +968,13 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "newrelic_newrelic": { - "hash": "sha256-UByjO3/TE/b3kncFVMuTpWvTfC5Oof+Z5+9KdOEs7JU=", + "hash": "sha256-bYWqx0vZO16pKcLXYrWtbynToxpgHI8r4eZpX43kaPk=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.87.3", + "rev": "v3.90.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2nDiNYX8iwu4u5gaaIYJC8a/Jw/MBdTgNxmyw+RLB+c=" + "vendorHash": "sha256-ilEvo3HS48tP8DgBW4612eBifm9GN1uyrIsPbCjPW2o=" }, "ns1-terraform_ns1": { "hash": "sha256-MX/Wd9Lztjn7uwDzJjs4bsSSp0PFzUgsu4jXke9jHL8=", From 22253f78ec4908049a6a63197be5b3bd3692f3de Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Tue, 26 May 2026 10:52:50 +0200 Subject: [PATCH 41/51] owners: Add @tfc to nixos test driver modules folder --- ci/OWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/OWNERS b/ci/OWNERS index 66055144f662..343b4283340f 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -124,6 +124,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @Artturin @Ericson2314 @lo # NixOS integration test driver /nixos/lib/test-driver @tfc +/nixos/lib/testing @tfc # NixOS QEMU virtualisation /nixos/modules/virtualisation/qemu-vm.nix @raitobezarius From e39dcee4edecde1962db89bd3cab47e06c13bc65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 09:12:03 +0000 Subject: [PATCH 42/51] python3Packages.pyyardian: 1.2.0 -> 1.3.3 --- pkgs/development/python-modules/pyyardian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyyardian/default.nix b/pkgs/development/python-modules/pyyardian/default.nix index f17742b1be67..a8e16e381e5d 100644 --- a/pkgs/development/python-modules/pyyardian/default.nix +++ b/pkgs/development/python-modules/pyyardian/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyyardian"; - version = "1.2.0"; + version = "1.3.3"; pyproject = true; src = fetchFromGitHub { owner = "h3l1o5"; repo = "pyyardian"; tag = version; - hash = "sha256-JBb62pFDuVcXIGRc6UOp5/ciUtbGm4XnKZjt1icF/jQ="; + hash = "sha256-LOHE8vGrT25sgjhcNarMOi0hzpPpHjVIeVq7CezYicY="; }; nativeBuildInputs = [ From 520c7a1e4956cd5025eb52794de0d2bc998f22c2 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 26 May 2026 12:19:21 +0300 Subject: [PATCH 43/51] Revert "scx.cscheds: move env variable into env for structuredAttrs" --- pkgs/os-specific/linux/scx/scx_cscheds.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix index 4089fcc1d16d..b23d424d0070 100644 --- a/pkgs/os-specific/linux/scx/scx_cscheds.nix +++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix @@ -49,7 +49,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { ]; __structuredAttrs = true; - env.EXPECTED_SCHEDULERS = finalAttrs.passthru.schedulers; + EXPECTED_SCHEDULERS = finalAttrs.passthru.schedulers; doInstallCheck = true; installCheckPhase = '' From e7d163b4e6e6f6c550b14aaf065dfba3adb2cfe1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 May 2026 09:23:57 +0000 Subject: [PATCH 44/51] python3Packages.aiolichess: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/aiolichess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolichess/default.nix b/pkgs/development/python-modules/aiolichess/default.nix index 117589863d88..18ffcab02d98 100644 --- a/pkgs/development/python-modules/aiolichess/default.nix +++ b/pkgs/development/python-modules/aiolichess/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "aiolichess"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "aryanhasgithub"; repo = "aiolichess"; tag = "v${finalAttrs.version}"; - hash = "sha256-WCrvDNlq0i2FBD6Ouiue3BQcTuIV80Z8MT/5mOjTr3w="; + hash = "sha256-cJuaEjapvmmRypJHvkveBxjAvGpkq0tjguXJLktnb74="; }; build-system = [ hatchling ]; From 9c526e007704d4a1beae0b882b4c19d1e5db19b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 May 2026 11:29:58 +0200 Subject: [PATCH 45/51] python3Packages.iamdata: 0.1.202605251 -> 0.1.202605261 Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202605251...v0.1.202605261 Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202605261 --- pkgs/development/python-modules/iamdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index c87dca558444..0a17e7f40900 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202605251"; + version = "0.1.202605261"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-EO2FwOx7b5m8ChAkyHfYRwSbWf+h3unG8TfApa50+ME="; + hash = "sha256-gUriLM9qiqKEh+ugMwTBM6+Mvhh54Sf12cLKzMzky7w="; }; __darwinAllowLocalNetworking = true; From 98352fe2f07a423f6fad78b9f17368a143708ed5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 May 2026 11:37:12 +0200 Subject: [PATCH 46/51] python3Packages.pyyardian: modernize --- .../python-modules/pyyardian/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyyardian/default.nix b/pkgs/development/python-modules/pyyardian/default.nix index a8e16e381e5d..831eaa9878fc 100644 --- a/pkgs/development/python-modules/pyyardian/default.nix +++ b/pkgs/development/python-modules/pyyardian/default.nix @@ -7,7 +7,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyyardian"; version = "1.3.3"; pyproject = true; @@ -15,16 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "h3l1o5"; repo = "pyyardian"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LOHE8vGrT25sgjhcNarMOi0hzpPpHjVIeVq7CezYicY="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; # Tests require network access doCheck = false; @@ -34,7 +31,8 @@ buildPythonPackage rec { meta = { description = "Module for interacting with the Yardian irrigation controller"; homepage = "https://github.com/h3l1o5/pyyardian"; + changelog = "https://github.com/aeon-matrix/pyyardian/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From 59d55cbaa3f3e323167a0ba8ee262b7218a709e2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 16 Nov 2025 21:14:20 +1300 Subject: [PATCH 47/51] lib.sources.sourceByGlobs: init function Adds a source filtering function inspired by [doublestar](https://github.com/bmatcuk/doublestar). This has been in used in a few private repositories since the last ~6 months with success. - Testing This was originally tested with the nix-unit testsuite: ``` let inherit (import ./internal.nix) mkSourceFilter mkMatcher; in { mkMatcher = { empty = { testMatch = { expr = mkMatcher "" "" "regular"; expected = true; }; testNoMatch = { expr = mkMatcher "" "foo" "regular"; expected = false; }; }; simple = { testMatch = { expr = mkMatcher "foo" "foo" "regular"; expected = true; }; testNoMatch = { expr = mkMatcher "foo" "bar" "regular"; expected = false; }; }; singleStar = { testMatch = { expr = mkMatcher "*.js" "foo.js" "regular"; expected = true; }; testNoMatch = { expr = mkMatcher "*.js" "foo.py" "regular"; expected = false; }; }; doubleStar = { testMatch = { expr = mkMatcher "foo/**/bar" "foo/baz/bar" "regular"; expected = true; }; testNoMatch = { expr = mkMatcher "foo/**/bar" "foo/bar/baz" "regular"; expected = false; }; testMultiMatch = { expr = mkMatcher "foo/**/bar" "foo/baz/xyz/bar" "regular"; expected = true; }; testMultiMatchDoubleGlob = { expr = mkMatcher "foo/**/**/bar" "foo/baz/xyz/bar" "regular"; expected = true; }; testInfixMatch = { expr = mkMatcher "foo/**/qux/**/bar" "foo/baz/qux/baz/bar" "regular"; expected = true; }; testInfixNoMatch = { expr = mkMatcher "foo/**/xyz/**/bar" "foo/baz/qux/baz/bar" "regular"; expected = false; }; # Technically a partial match testInfixDirMatch = { expr = mkMatcher "foo/**/xyz/**/bar" "foo/baz/qux/baz/bar" "directory"; expected = true; }; }; }; mkSourceFilter = { testSourceFilter = { expr = mkSourceFilter ./fixtures [ "bar/*.js" ] "bar/bar.js" "regular"; expected = true; }; }; } ``` but it was dropped in this nixpkgs contribution as the structure of nixpkgs lib testing is too primitive to incorp this without more extensive refactoring than I'd like at the momment. - Performance It's hard to benchmark this against anything else meaningful except [globsset](https://github.com/pdtpartners/globset), which has a very similar API. `sourceByGlobs` avoids performance pitfalls by: - Using `builtins.filterSource` This is more performant than the fileset API. The downside compared to the fileset API is that any directory which matches the filter will be added to the build, even if it's empty. - Match paths component by component By splitting each pattern into a token per / separator. This is much faster in Nix than the doublestar algorithm. - Globset source ```json { "cpuTime": 0.8585879802703857, "envs": { "bytes": 148252864, "elements": 11899843, "number": 6631765 }, "gc": { "heapSize": 402915328, "totalBytes": 671288560 }, "list": { "bytes": 3358664, "concats": 28658, "elements": 419833 }, "nrAvoided": 11562713, "nrFunctionCalls": 4816963, "nrLookups": 4316209, "nrOpUpdateValuesCopied": 5686407, "nrOpUpdates": 464060, "nrPrimOpCalls": 2966970, "nrThunks": 7796186, "sets": { "bytes": 196404672, "elements": 10837802, "number": 1437490 }, "sizes": { "Attr": 16, "Bindings": 16, "Env": 8, "Value": 24 }, "symbols": { "bytes": 340652, "number": 32026 }, "values": { "bytes": 207367440, "number": 8640310 } } ``` - Glob-filter source ```json { "cpuTime": 0.3904629945755005, "envs": { "bytes": 13263440, "elements": 1005877, "number": 652053 }, "gc": { "heapSize": 402915328, "totalBytes": 146914896 }, "list": { "bytes": 3032168, "concats": 5899, "elements": 379021 }, "nrAvoided": 1666598, "nrFunctionCalls": 484399, "nrLookups": 112698, "nrOpUpdateValuesCopied": 3432135, "nrOpUpdates": 13426, "nrPrimOpCalls": 1041954, "nrThunks": 1205792, "sets": { "bytes": 64304800, "elements": 3978167, "number": 40883 }, "sizes": { "Attr": 16, "Bindings": 16, "Env": 8, "Value": 24 }, "symbols": { "bytes": 285306, "number": 28864 }, "values": { "bytes": 42963240, "number": 1790135 } } ``` --- lib/sources.nix | 109 +++++++++++++++++++++++++++++++++++++++++++ lib/tests/sources.sh | 12 +++++ 2 files changed, 121 insertions(+) diff --git a/lib/sources.nix b/lib/sources.nix index 43bc2ab2dbe3..81c5305842a1 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -7,12 +7,19 @@ let match split storeDir + escapeRegex + removePrefix ; inherit (lib) boolToString filter isString readFile + concatStrings + length + elemAt + isList + any ; inherit (lib.filesystem) pathIsRegularFile @@ -513,6 +520,107 @@ let else throw "repoRevToName: invalid kind"; + /** + Filter sources by a list of double star glob patterns. + + # Inputs + + `src` + + : 1\. Function argument + + `patterns` + + : 2\. Function argument + + # Examples + :::{.example} + ## `sourceByGlobs` usage example + + - Include all .py files recursively + ```nix + src = sourceByGlobs ./my-subproject ["**\/*.py" ] + ``` + + - Include all .py files in root directory only + ```nix + src = sourceByGlobs ./my-subproject ["*.py" ] + ``` + + ::: + */ + sourceByGlobs = + let + splitPath = path: filter isString (split "\/" path); + # Make component regex + mkRe = + s: + if s == "**" then + ".*" # Has special handling below + else + concatStrings (map (tok: if isList tok then "[^\/]*" else escapeRegex tok) (split "\\*+" s)); + + # Make a source filter function from pattern + mkMatcher = + pat: + let + globs = map mkRe (splitPath pat); + glen = length globs; + in + path: type: + let + path' = splitPath path; + plen = length path'; + + recurse = + gi: pi: + let + g = elemAt globs gi; + p = elemAt path' pi; + m = match g p != null; + in + if pi >= plen then # Reached end of path + gi >= glen || (type == "directory" || type == "symlink") # Only allow partial matches for directories + else if gi >= glen then # Reached end of globs + false + else if g == ".*" then # Special handling for ** + ( + # Lookahead for next glob match + if (gi + 1) == glen then + true + else if (match (elemAt globs (gi + 1)) p != null) then + recurse (gi + 1) pi + else if m then + recurse gi (pi + 1) + else + false + ) + else if m then + recurse (gi + 1) (pi + 1) + else + false; + + in + recurse 0 0; + + mkSourceFilter = + root: patterns: + let + root' = "${toString root}/"; + matchers = map mkMatcher patterns; + in + name: type: + let + name' = removePrefix root' name; + in + any (m: m name' type) matchers; + + in + src: patterns: + lib.cleanSourceWith { + filter = mkSourceFilter src patterns; + inherit src; + }; in { inherit @@ -532,6 +640,7 @@ in sourceByRegex sourceFilesBySuffices + sourceByGlobs trace ; diff --git a/lib/tests/sources.sh b/lib/tests/sources.sh index 079c7eea5657..08315a303bc2 100755 --- a/lib/tests/sources.sh +++ b/lib/tests/sources.sh @@ -70,4 +70,16 @@ dir="$(nix-instantiate --eval --strict --read-write-mode --json --expr '(with im EOF ) || die "cleanSourceWith + cleanSource" + +dir="$(nix-instantiate --eval --strict --read-write-mode --json --expr '(with import ; "${ + sources.sourceByGlobs '"$work"' [ "*.md" "**/*.o" ] +}")' | crudeUnquoteJSON)" +(cd "$dir"; find) | sort -f | diff -U10 - <(cat <&2 tests ok From 01bdc186ae9baf635bdfb732e3d81ac41da02ca4 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 22 May 2026 14:14:40 +0200 Subject: [PATCH 48/51] lib.sources.sourceByGlobs: address review comments --- lib/sources.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/sources.nix b/lib/sources.nix index 81c5305842a1..43a374c16e73 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -521,44 +521,50 @@ let throw "repoRevToName: invalid kind"; /** - Filter sources by a list of double star glob patterns. + Filter a source tree by a list of doublestar-style glob patterns, + returning a source that only contains paths matching at least one + pattern. `*` matches a single path component, and `**` matches any + number of components. # Inputs `src` - : 1\. Function argument + : The source tree to filter. `patterns` - : 2\. Function argument + : List of glob patterns to include, e.g. `[ "*.py" "src/**" ]`. + A leading `**` (e.g. `**\/*.py` for all `.py` files at any depth) + is also supported; the `\` here is just a Nix string escape used + to avoid closing this comment. # Examples :::{.example} ## `sourceByGlobs` usage example - - Include all .py files recursively + - Include everything under a subdirectory ```nix - src = sourceByGlobs ./my-subproject ["**\/*.py" ] + src = sourceByGlobs ./. [ "src/**" "tests/**" ] ``` - Include all .py files in root directory only ```nix - src = sourceByGlobs ./my-subproject ["*.py" ] + src = sourceByGlobs ./. [ "*.py" ] ``` ::: */ sourceByGlobs = let - splitPath = path: filter isString (split "\/" path); + splitPath = path: filter isString (split "/" path); # Make component regex mkRe = s: if s == "**" then ".*" # Has special handling below else - concatStrings (map (tok: if isList tok then "[^\/]*" else escapeRegex tok) (split "\\*+" s)); + concatStrings (map (tok: if isList tok then "[^/]*" else escapeRegex tok) (split "\\*+" s)); # Make a source filter function from pattern mkMatcher = From edb4b053f526fa2cd42bdf459a298de622ce2f66 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 22 May 2026 14:42:16 +0200 Subject: [PATCH 49/51] pkgs.formats.javaProperties: use lib.sources.sourceByGlobs Uses the cleaner expression --- pkgs/pkgs-lib/formats/java-properties/test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/pkgs-lib/formats/java-properties/test/default.nix b/pkgs/pkgs-lib/formats/java-properties/test/default.nix index 2ea787a90341..68cd5cfa1bcf 100644 --- a/pkgs/pkgs-lib/formats/java-properties/test/default.nix +++ b/pkgs/pkgs-lib/formats/java-properties/test/default.nix @@ -72,8 +72,8 @@ stdenv.mkDerivation { ) ); - src = lib.sourceByRegex ./. [ - ".*\\.java" + src = lib.sources.sourceByGlobs ./. [ + "**/*.java" ]; # On Linux, this can be C.UTF-8, but darwin + zulu requires en_US.UTF-8 LANG = "en_US.UTF-8"; From 1b476677762937fc0364a4f37bb9e31aebb61220 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 22 May 2026 15:25:46 +0200 Subject: [PATCH 50/51] vimPluginsUpdater: use lib.sources.sourceByGlobs Filter PYTHONPATH source to .py files only, dropping the 6 sibling .nix files from the closure. --- pkgs/applications/editors/vim/plugins/utils/updater.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/utils/updater.nix b/pkgs/applications/editors/vim/plugins/utils/updater.nix index 2ed61a25c83a..0c77e7ce745c 100644 --- a/pkgs/applications/editors/vim/plugins/utils/updater.nix +++ b/pkgs/applications/editors/vim/plugins/utils/updater.nix @@ -43,7 +43,7 @@ buildPythonApplication { neovim-unwrapped nurl ] - }" --prefix PYTHONPATH : "${./.}" ) + }" --prefix PYTHONPATH : "${lib.sources.sourceByGlobs ./. [ "**/*.py" ]}" ) wrapPythonPrograms ''; From df1b67fdfd63eb27e7b135033b9228bdf4ea8826 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 22 May 2026 15:25:46 +0200 Subject: [PATCH 51/51] purescript.tests.minimal-module: use lib.sources.sourceByGlobs Filter src to the .purs and .js files actually compiled, dropping default.nix from the closure. --- .../purescript/purescript/test-minimal-module/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix b/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix index a8503e1b9aae..2a0010b061a5 100644 --- a/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix +++ b/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix @@ -1,11 +1,17 @@ { + lib, runCommand, purescript, nodejs, }: runCommand "purescript-test-minimal-module" { } '' - ${purescript}/bin/purs compile -o ./output ${./.}/Main.purs + ${purescript}/bin/purs compile -o ./output ${ + lib.sources.sourceByGlobs ./. [ + "*.purs" + "*.js" + ] + }/Main.purs echo 'import {main} from "./output/Main/index.js"; main()' > node.mjs