From 4f10f5d413149feef8c17628f9d267709832dd31 Mon Sep 17 00:00:00 2001 From: Glen Huang Date: Mon, 22 Dec 2025 14:06:57 +0800 Subject: [PATCH 001/252] nixos/nginx: not using reuseport for unix domain listens --- nixos/modules/services/web-servers/nginx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index e557ee92f7a7..2ee79440d6d6 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -385,7 +385,7 @@ let " listen ${addr}${optionalString (port != null) ":${toString port}"} quic " + optionalString vhost.default "default_server " - + optionalString vhost.reuseport "reuseport " + + optionalString (vhost.reuseport && !(lib.hasPrefix "unix:" addr)) "reuseport " + optionalString (extraParameters != [ ]) ( concatStringsSep " " ( let @@ -411,7 +411,7 @@ let + optionalString (ssl && vhost.http2 && oldHTTP2) "http2 " + optionalString ssl "ssl " + optionalString vhost.default "default_server " - + optionalString vhost.reuseport "reuseport " + + optionalString (vhost.reuseport && !(lib.hasPrefix "unix:" addr)) "reuseport " + optionalString proxyProtocol "proxy_protocol " + optionalString (extraParameters != [ ]) (concatStringsSep " " extraParameters) + ";"; From 3bbe46a3f31bfb10a5157e3ecdf6dd8c24fc9061 Mon Sep 17 00:00:00 2001 From: commitmaniac <201806046+commitmaniac@users.noreply.github.com> Date: Fri, 6 Mar 2026 21:29:00 -0500 Subject: [PATCH 002/252] burp: 2.4.0 -> 3.2.0 --- pkgs/by-name/bu/burp/package.nix | 35 ++++++++++---------------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/bu/burp/package.nix b/pkgs/by-name/bu/burp/package.nix index 330974ba70b9..ac3d6f974dd4 100644 --- a/pkgs/by-name/bu/burp/package.nix +++ b/pkgs/by-name/bu/burp/package.nix @@ -2,65 +2,52 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, autoreconfHook, pkg-config, acl, librsync, ncurses, - openssl_legacy, + openssl, zlib, uthash, }: stdenv.mkDerivation (finalAttrs: { pname = "burp"; - version = "2.4.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "grke"; repo = "burp"; tag = finalAttrs.version; - hash = "sha256-y6kRd1jD6t+Q6d5t7W9MDuk+m2Iq1THQkP50PJwI7Nc="; + hash = "sha256-jZSrHq3dL9Za71E2k4UDTHe10ESAgkBy5bogY2AqtnM="; }; - patches = [ - # Pull upstream fix for ncurses-6.3 support - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/grke/burp/commit/1d6c931af7c11f164cf7ad3479781e8f03413496.patch"; - hash = "sha256-dJn9YhFQWggoqD3hce7F1d5qHYogbPP6+NMqCpVbTpM="; - }) - # Pull upstream fix for backup resuming - (fetchpatch { - name = "fix-resume.patch"; - url = "https://github.com/grke/burp/commit/b5ed667f73805b5af9842bb0351f5af95d4d50b3.patch"; - hash = "sha256-MT9D2thLgV4nT3LsIDHZp8sWQF2GlOENj0nkOQXZKuk="; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - # use openssl_legacy due to burp-2.4.0 not supporting file encryption with openssl 3.0 - # replace with 'openssl' once burp-3.x has been declared stable and this package upgraded + buildInputs = [ librsync ncurses - openssl_legacy + openssl zlib uthash ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) acl; - configureFlags = [ "--localstatedir=/var" ]; + configureFlags = [ + "--sysconfdir=/etc/burp" + "--localstatedir=/var" + ]; installFlags = [ "localstatedir=/tmp" ]; meta = { - description = "BackUp and Restore Program"; + description = "Backup and restore Program"; homepage = "https://burp.grke.org"; + changelog = "https://github.com/grke/burp/blob/${finalAttrs.version}/CHANGELOG"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ arjan-s ]; platforms = lib.platforms.all; From 83b4d3a1e66426038ce99a577185c39f34b5ee4d Mon Sep 17 00:00:00 2001 From: ash Date: Sun, 8 Mar 2026 16:57:28 +0000 Subject: [PATCH 003/252] python3Packages.scramp: update src to reflect upstream move to Codeberg https://codeberg.org/tlocke/scramp/commit/f4f6f3a1540a572cca9fb9823ec874a47e0916b7 --- pkgs/development/python-modules/scramp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scramp/default.nix b/pkgs/development/python-modules/scramp/default.nix index a131bfd7dcb5..e80c90165a17 100644 --- a/pkgs/development/python-modules/scramp/default.nix +++ b/pkgs/development/python-modules/scramp/default.nix @@ -2,7 +2,7 @@ lib, asn1crypto, buildPythonPackage, - fetchFromGitHub, + fetchFromCodeberg, hatchling, pytest-mock, pytestCheckHook, @@ -14,7 +14,7 @@ buildPythonPackage rec { version = "1.4.5"; pyproject = true; - src = fetchFromGitHub { + src = fetchFromCodeberg { owner = "tlocke"; repo = "scramp"; rev = version; From ac49b04e19e46ce2a716f175c23039c38456a8a1 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Tue, 3 Mar 2026 16:00:20 -0800 Subject: [PATCH 004/252] notesnook: move icon to spec-compliant location --- pkgs/by-name/no/notesnook/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/no/notesnook/package.nix b/pkgs/by-name/no/notesnook/package.nix index f3df2ffb8ac6..9f79412dc59d 100644 --- a/pkgs/by-name/no/notesnook/package.nix +++ b/pkgs/by-name/no/notesnook/package.nix @@ -84,7 +84,7 @@ let wrapProgram $out/bin/notesnook \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/notesnook.png -t $out/share/pixmaps + install -Dm444 ${appimageContents}/notesnook.png -t $out/share/icons substituteInPlace $out/share/applications/notesnook.desktop \ --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' ''; From 36efd3ed00f7f1887dc3378db8aa2389706305f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Apr 2026 09:30:27 +0000 Subject: [PATCH 005/252] python3Packages.beetcamp: 0.24.2 -> 0.24.3 --- pkgs/development/python-modules/beetcamp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beetcamp/default.nix b/pkgs/development/python-modules/beetcamp/default.nix index 3b8e97d9234a..666161ea2957 100644 --- a/pkgs/development/python-modules/beetcamp/default.nix +++ b/pkgs/development/python-modules/beetcamp/default.nix @@ -17,14 +17,14 @@ buildPythonPackage (finalAttrs: { pname = "beetcamp"; - version = "0.24.2"; + version = "0.24.3"; pyproject = true; src = fetchFromGitHub { owner = "snejus"; repo = "beetcamp"; tag = finalAttrs.version; - hash = "sha256-AMHj7rsPAxUUvVg6vri2NnkO9+5NAVwGrWLvNvOtlLs="; + hash = "sha256-kKFYuTJys4j67+cak2PDmn6z2vNzVitFXIZXy2bClY8="; }; patches = [ From 5ac8f415c9a50f61030021757cdee0ecb65d1e2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Apr 2026 05:18:06 +0000 Subject: [PATCH 006/252] scitokens-cpp: 1.3.0 -> 1.4.1 --- pkgs/by-name/sc/scitokens-cpp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scitokens-cpp/package.nix b/pkgs/by-name/sc/scitokens-cpp/package.nix index c29a72349d44..a40f5b123fe1 100644 --- a/pkgs/by-name/sc/scitokens-cpp/package.nix +++ b/pkgs/by-name/sc/scitokens-cpp/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation { pname = "scitokens-cpp"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "scitokens"; repo = "scitokens-cpp"; - rev = "v1.3.0"; - hash = "sha256-C+7tS7Mbcjt4i2SHyinNTqjO+ODsyg9zFdX8HRhhPLk="; + rev = "v1.4.1"; + hash = "sha256-qZUW+b8drIAm21baUO1+O39O9FPP2McmdjsfGTRGRfQ="; }; nativeBuildInputs = [ From 2b22f8a2f7b1bf350baaecafccebaf1841add914 Mon Sep 17 00:00:00 2001 From: Daniel Lagally Date: Mon, 27 Apr 2026 19:05:22 +0200 Subject: [PATCH 007/252] sonic-pi: pin ruby 3.3 and boost 1.86 and unmark as broken pin ruby to version 3.3 and boost to version 1.86 as ruby >= 3.4 removes the mutex header and boost 1.86 is used by supercollider to provide shared memory that is otherwise incompatible --- pkgs/by-name/so/sonic-pi/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/so/sonic-pi/package.nix b/pkgs/by-name/so/sonic-pi/package.nix index 1b9552f3e048..8aa16ea04d16 100644 --- a/pkgs/by-name/so/sonic-pi/package.nix +++ b/pkgs/by-name/so/sonic-pi/package.nix @@ -14,11 +14,11 @@ crossguid, reproc, platform-folders, - ruby, + ruby_3_3, beamPackages, alsa-lib, rtmidi, - boost, + boost186, aubio, jack2, jack-example-tools, @@ -35,7 +35,7 @@ }@args: let - ruby = args.ruby.withPackages (ps: [ + ruby = args.ruby_3_3.withPackages (ps: [ ps.prime ps.racc ps.rake @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { ruby alsa-lib rtmidi - boost + boost186 aubio ] ++ lib.optionals withTauWidget [ @@ -274,6 +274,5 @@ stdenv.mkDerivation (finalAttrs: { sohalt ]; platforms = lib.platforms.linux; - broken = true; }; }) From 5bf68e9f7e458165cfcd029e9dde1f79b67a6ce6 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 2 May 2026 15:50:59 -0400 Subject: [PATCH 008/252] tableplus: 0.1.284 -> 0.1.296 --- pkgs/by-name/ta/tableplus/linux.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/tableplus/linux.nix b/pkgs/by-name/ta/tableplus/linux.nix index 7835f46faabd..6a2efa8f7bba 100644 --- a/pkgs/by-name/ta/tableplus/linux.nix +++ b/pkgs/by-name/ta/tableplus/linux.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tableplus"; - version = "0.1.284"; + version = "0.1.296"; src = fetchurl { url = "https://web.archive.org/web/20251230232124/https://deb.tableplus.com/debian/22/pool/main/t/tableplus/tableplus_${finalAttrs.version}_amd64.deb"; - hash = "sha256-TrYRRpjSVRD721XEd0gwGPv4RNq/uwaswPW2J8oVjXQ="; + hash = "sha256-BJ+S2cBRZtehDU5DOzNEVGzhMoF4jvsNSwntoa5bnlc="; }; nativeBuildInputs = [ From 0be98faa2c54211fa87e5bb13731d54ecc6b4581 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Fri, 24 Apr 2026 04:12:09 +0000 Subject: [PATCH 009/252] tinycbor: 0.6.1 -> 7.0 --- pkgs/by-name/ti/tinycbor/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ti/tinycbor/package.nix b/pkgs/by-name/ti/tinycbor/package.nix index 2d26f74e72bc..5982a0b1b7d8 100644 --- a/pkgs/by-name/ti/tinycbor/package.nix +++ b/pkgs/by-name/ti/tinycbor/package.nix @@ -1,4 +1,5 @@ { + cmake, lib, stdenv, fetchFromGitHub, @@ -6,22 +7,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinycbor"; - version = "0.6.1"; + version = "7.0"; src = fetchFromGitHub { owner = "intel"; repo = "tinycbor"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-JgkZAvZ63jjTdFRnyk+AeIWcGsg36UtPPFbhFjky9e8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Fuw/hV3tVzoKf2Xrw64xuU+7xzSRPWL/ZdLjF0qICDY="; }; - makeFlags = [ "prefix=$(out)" ]; + nativeBuildInputs = [ cmake ]; meta = { description = "Concise Binary Object Representation (CBOR) Library"; mainProgram = "cbordump"; homepage = "https://github.com/intel/tinycbor"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ tbutter ]; }; }) From 6a569f7ce309a9a498c63f082209cd23a09ad9e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 17:28:40 +0000 Subject: [PATCH 010/252] python3Packages.chromadb: 1.5.8 -> 1.5.9 --- pkgs/development/python-modules/chromadb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index 3a1f93ed3f04..b9a2f88145c4 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -68,19 +68,19 @@ buildPythonPackage (finalAttrs: { pname = "chromadb"; - version = "1.5.8"; + version = "1.5.9"; pyproject = true; src = fetchFromGitHub { owner = "chroma-core"; repo = "chroma"; tag = finalAttrs.version; - hash = "sha256-bxRRpwd7pmE+/JMARaqjuE+xFh8Qx70Aon2w56sOi1I="; + hash = "sha256-qJixjywcmJwq1B8kYTIevBk6MMZ/YgOt92VBPag3kiw="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-0vuXMxwbbpfMA0UcHcLieTJK6u67o6EYdJLH5Q+wtc8="; + hash = "sha256-b7YwZGsqPT58b8aArZMwJs1r7CRttjvn2wF/+yL6Ytg="; }; # Can't use fetchFromGitHub as the build expects a zipfile From 03a8a70fda9930e8266e507839737b7ae979e0bc Mon Sep 17 00:00:00 2001 From: kyehn Date: Tue, 19 May 2026 04:30:17 +0000 Subject: [PATCH 011/252] zigfetch: 0.25.0 -> 0.27.1 --- pkgs/by-name/zi/zigfetch/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/zi/zigfetch/package.nix b/pkgs/by-name/zi/zigfetch/package.nix index dd8dd632c55a..7241b6d295e1 100644 --- a/pkgs/by-name/zi/zigfetch/package.nix +++ b/pkgs/by-name/zi/zigfetch/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - zig_0_15, + zig_0_16, pciutils, apple-sdk, replaceVars, @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zigfetch"; - version = "0.25.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "utox39"; repo = "zigfetch"; rev = "v${finalAttrs.version}"; - hash = "sha256-n5bVIkg/jMVLixIfMp1ah4iJJLv59MoH4/acvFye4vQ="; + hash = "sha256-A8DZ8O7WghvN9+74FGapLl/7SfGc3n+FlyI6jRKX/yk="; }; patches = lib.optionals stdenv.hostPlatform.isDarwin [ @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - zig_0_15 + zig_0_16 ]; buildInputs = [ @@ -43,6 +43,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ heisfer ]; mainProgram = "zigfetch"; - inherit (zig_0_15.meta) platforms; + inherit (zig_0_16.meta) platforms; }; }) From 08c56e4d4f520fb718fbeb7e09df74dd63b1cd52 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Wed, 27 May 2026 08:44:13 +0000 Subject: [PATCH 012/252] adif-multitool: 0.1.20 -> 0.1.22 --- pkgs/by-name/ad/adif-multitool/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ad/adif-multitool/package.nix b/pkgs/by-name/ad/adif-multitool/package.nix index 0d080ee66a17..67e9f9ef4282 100644 --- a/pkgs/by-name/ad/adif-multitool/package.nix +++ b/pkgs/by-name/ad/adif-multitool/package.nix @@ -5,15 +5,17 @@ }: buildGoModule (finalAttrs: { pname = "adif-multitool"; - version = "0.1.20"; + version = "0.1.22"; - vendorHash = "sha256-U9BpTDHjUZicMjKeyxyM/eOxJeAY2DMQMHOEMiCeN/U="; + vendorHash = "sha256-Fin0DUvpNPqKXpbDVekvWZYghJIpMLY9IRr2wdbZczc="; + + proxyVendor = true; src = fetchFromGitHub { owner = "flwyd"; repo = "adif-multitool"; tag = "v${finalAttrs.version}"; - hash = "sha256-qeAH8UTyEZn8As3wTjluONpjeT/5l9zicN5+8uwnbLo="; + hash = "sha256-UYnm4S4DP0c2ZkPkPScUHXdKiAz6JY9Lzdu4mAO49Dc="; }; meta = { From 6ede14b0ce591cccba2d5038f1b371b3c91b52fd Mon Sep 17 00:00:00 2001 From: Nikita Denisso Date: Fri, 15 May 2026 10:06:51 +0500 Subject: [PATCH 013/252] xmrig: 6.25.0 -> 6.26.0, make parametrizable This introduces top-level arguments to customize the xmrig build, exposing most of the available CMake options. Users can now: - Disable specific mining algorithms (e.g., KawPow, Argon2) to reduce binary size. - Toggle core features like the HTTP API, TLS support, and MSR. The new arguments follow Nixpkgs conventions, using `with...` for options that pull in external dependencies and `enable...` for build-time toggles. The installPhase is also updated to correctly handle the `xmrig-notls` binary name when TLS support is disabled. --- pkgs/by-name/xm/xmrig/package.nix | 68 +++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/xm/xmrig/package.nix b/pkgs/by-name/xm/xmrig/package.nix index 63dc01581710..497364768aae 100644 --- a/pkgs/by-name/xm/xmrig/package.nix +++ b/pkgs/by-name/xm/xmrig/package.nix @@ -9,17 +9,44 @@ hwloc, kmod, donateLevel ? 0, + + # Algorithms + enableCnLite ? true, + enableCnHeavy ? true, + enableCnPico ? true, + enableCnFemto ? true, + enableRandomx ? true, + enableArgon2 ? true, + enableKawpow ? true, + enableGhostrider ? true, + + # Features requiring external dependencies + withHwloc ? true, + withHttp ? true, + withTls ? true, + + # Features (build toggles) + enableAsm ? true, + enableMsr ? true, + enableProfiling ? false, + enableSse4_1 ? true, + enableBenchmark ? true, + enableDmi ? true, + + # Debug options + enableDebugLog ? false, + enableHwlocDebug ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "xmrig"; - version = "6.25.0"; + version = "6.26.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${finalAttrs.version}"; - hash = "sha256-X34djxUeSDwopwsipgrdFFFUP+tQ/uCNvupYzbegkEE="; + hash = "sha256-ZJKayM1kTLCXlQqqfN3MbAKPShi5OYafOdDbsMa0QIs="; }; patches = [ @@ -28,10 +55,12 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteAllInPlace src/donate.h + '' + + lib.optionalString withTls '' substituteInPlace cmake/OpenSSL.cmake \ --replace "set(OPENSSL_USE_STATIC_LIBS TRUE)" "set(OPENSSL_USE_STATIC_LIBS FALSE)" '' - + lib.optionalString stdenv.hostPlatform.isLinux '' + + lib.optionalString (stdenv.hostPlatform.isLinux && enableMsr) '' substituteInPlace src/hw/msr/Msr_linux.cpp \ --replace "/sbin/modprobe" "${kmod}/bin/modprobe" ''; @@ -42,9 +71,34 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libuv - libmicrohttpd - openssl - hwloc + ] + ++ lib.optional withHttp libmicrohttpd + ++ lib.optional withTls openssl + ++ lib.optional withHwloc hwloc; + + cmakeFlags = [ + (lib.cmakeBool "WITH_CN_LITE" enableCnLite) + (lib.cmakeBool "WITH_CN_HEAVY" enableCnHeavy) + (lib.cmakeBool "WITH_CN_PICO" enableCnPico) + (lib.cmakeBool "WITH_CN_FEMTO" enableCnFemto) + (lib.cmakeBool "WITH_RANDOMX" enableRandomx) + (lib.cmakeBool "WITH_ARGON2" enableArgon2) + (lib.cmakeBool "WITH_KAWPOW" enableKawpow) + (lib.cmakeBool "WITH_GHOSTRIDER" enableGhostrider) + + (lib.cmakeBool "WITH_HWLOC" withHwloc) + (lib.cmakeBool "WITH_HTTP" withHttp) + (lib.cmakeBool "WITH_TLS" withTls) + + (lib.cmakeBool "WITH_ASM" enableAsm) + (lib.cmakeBool "WITH_MSR" enableMsr) + (lib.cmakeBool "WITH_PROFILING" enableProfiling) + (lib.cmakeBool "WITH_SSE4_1" enableSse4_1) + (lib.cmakeBool "WITH_BENCHMARK" enableBenchmark) + (lib.cmakeBool "WITH_DMI" enableDmi) + + (lib.cmakeBool "WITH_DEBUG_LOG" enableDebugLog) + (lib.cmakeBool "HWLOC_DEBUG" enableHwlocDebug) ]; inherit donateLevel; @@ -52,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -vD xmrig $out/bin/xmrig + install -vD ${if withTls then "xmrig" else "xmrig-notls"} $out/bin/xmrig runHook postInstall ''; From 26d180eac2014aa909faf0168eda40e25d5bf860 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Fri, 29 May 2026 06:49:20 +0000 Subject: [PATCH 014/252] cope: unbreak --- pkgs/by-name/co/cope/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cope/package.nix b/pkgs/by-name/co/cope/package.nix index 0c62015faec9..90e296b853c7 100644 --- a/pkgs/by-name/co/cope/package.nix +++ b/pkgs/by-name/co/cope/package.nix @@ -14,6 +14,12 @@ perlPackages.buildPerlPackage { rev = "6d0322a8493361ad32e454b97998df715dbe7b97"; hash = "sha256-VQveV7avM/4nbLroyujJaSoVAP3pXhwrzqzI3eMzxVo="; }; + + postPatch = '' + substituteInPlace lib/App/Cope.pm \ + --replace-warn "feature->import( ':5.10' );" "require feature; feature->import( ':5.10' );" + ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = with perlPackages; [ @@ -67,6 +73,5 @@ perlPackages.buildPerlPackage { gpl1Plus ]; maintainers = with lib.maintainers; [ deftdawg ]; - broken = true; # requires old Perl we don't ship anymore }; } From f1c02cad9633c6b29178ddb06a0ece2c286eed5c Mon Sep 17 00:00:00 2001 From: Ben Haskins Date: Sun, 31 May 2026 17:41:58 +0100 Subject: [PATCH 015/252] maintainers: add benhaskins --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c1f695d0e898..fd97510b65c6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3347,6 +3347,13 @@ githubId = 4313548; name = "Ben Sparks"; }; + benhaskins = { + name = "Ben Haskins"; + email = "ben.haskins@spang.co.uk"; + github = "benhaskins"; + githubId = 179679961; + keys = [ { fingerprint = "bnYZE0VGodlVwh/eUlqGQsAHeSE0hBPbo2EN2LrGu0M"; } ]; + }; benhiemer = { name = "Benedikt Hiemer"; email = "ben.email@posteo.de"; From 4ee4fa98d522ccea580c0afafaf20ddec45c81f7 Mon Sep 17 00:00:00 2001 From: Chahatpreet Singh Date: Tue, 2 Jun 2026 16:49:47 +0000 Subject: [PATCH 016/252] bacnet-stack: 1.3.5 -> 1.5.0 - Switch from manual `make` invocation to CMake, which is the upstream- supported build system in 1.5.0 and handles datalink/app selection correctly. - Drop `hardeningDisable = [ "all" ]`; the package now builds with the default nixpkgs hardening flags. - Drop `BUILD=debug`; ship a release build. - Add `postInstall` to copy the app binaries to `$out/bin`. Upstream's CMakeLists builds the apps via `add_executable()` but does not declare `install(TARGETS ...)` rules for them, so they are not picked up by `make install`. - Add `meta.homepage` and `meta.changelog`. --- pkgs/by-name/ba/bacnet-stack/package.nix | 33 ++++++++++++++---------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ba/bacnet-stack/package.nix b/pkgs/by-name/ba/bacnet-stack/package.nix index 5f5e744a2f33..a97343ea89a9 100644 --- a/pkgs/by-name/ba/bacnet-stack/package.nix +++ b/pkgs/by-name/ba/bacnet-stack/package.nix @@ -2,35 +2,42 @@ lib, stdenv, fetchFromGitHub, + cmake, }: stdenv.mkDerivation (finalAttrs: { pname = "bacnet-stack"; - version = "1.3.5"; + version = "1.5.0"; src = fetchFromGitHub { owner = "bacnet-stack"; repo = "bacnet-stack"; - rev = "bacnet-stack-${finalAttrs.version}"; - sha256 = "sha256-Iwo0bNulKdFNwNU2xj6Uin+5hQt1I3N6+zso5BHrIOU="; + tag = "bacnet-stack-${finalAttrs.version}"; + hash = "sha256-CJmEEIGT6u2nsnl3btWL/JJPxQM53JF6l+mLBSF+Q8Q="; }; - hardeningDisable = [ "all" ]; + nativeBuildInputs = [ cmake ]; - buildPhase = '' - make BUILD=debug BACNET_PORT=linux BACDL_DEFINE=-DBACDL_BIP=1 BACNET_DEFINES=" -DPRINT_ENABLED=1 -DBACFILE -DBACAPP_ALL -DBACNET_PROPERTY_LISTS" - ''; - - installPhase = '' - mkdir $out - cp -r bin $out/bin + # bacnet-stack's CMakeLists builds the apps via add_executable() but never + # adds install(TARGETS ...) rules for them, so `make install` skips them. + # Copy them out of the CMake build tree manually. + postInstall = '' + mkdir -p $out/bin + find . -maxdepth 2 -type f -executable -not -name '*.so*' -not -name '*.a' \ + -exec cp -t $out/bin {} + ''; meta = { description = "BACnet open source protocol stack for embedded systems, Linux, and Windows"; homepage = "https://github.com/bacnet-stack/bacnet-stack"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl2Plus; + changelog = "https://github.com/bacnet-stack/bacnet-stack/blob/bacnet-stack-${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ + gpl2Plus # Core stack (WITH GCC-exception-2.0) + mit # Examples and applications + asl20 # Auxiliary files (SPDX identified) + bsd3 # Auxiliary files (SPDX identified) + ]; maintainers = with lib.maintainers; [ WhittlesJr ]; + platforms = lib.platforms.linux; }; }) From d9d779c24d5b16f2c6da23c8fdd57e93c58a903e Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Wed, 3 Jun 2026 22:11:15 +0200 Subject: [PATCH 017/252] nixos/adguardhome: fix shellcheck error in pre-start script --- .../services/networking/adguardhome.nix | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/networking/adguardhome.nix b/nixos/modules/services/networking/adguardhome.nix index 1df503146b54..caab4ba0c953 100644 --- a/nixos/modules/services/networking/adguardhome.nix +++ b/nixos/modules/services/networking/adguardhome.nix @@ -176,22 +176,32 @@ in StartLimitBurst = 10; }; - preStart = lib.optionalString (settings != null) '' - if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \ - && [ "${toString cfg.mutableSettings}" = "1" ]; then - # First run a schema_version update on the existing configuration - # This ensures that both the new config and the existing one have the same schema_version - # Note: --check-config has the side effect of modifying the file at rest! - ${lib.getExe cfg.package} -c "$STATE_DIRECTORY/AdGuardHome.yaml" --check-config + preStart = + let + installFresh = '' + cp --force "${configFile}" "$STATE_DIRECTORY/AdGuardHome.yaml" + chmod 600 "$STATE_DIRECTORY/AdGuardHome.yaml" + ''; + in + lib.optionalString (settings != null) ( + if cfg.mutableSettings then + '' + if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ]; then + # First run a schema_version update on the existing configuration + # This ensures that both the new config and the existing one have the same schema_version + # Note: --check-config has the side effect of modifying the file at rest! + ${lib.getExe cfg.package} -c "$STATE_DIRECTORY/AdGuardHome.yaml" --check-config - # Writing directly to AdGuardHome.yaml results in empty file - ${lib.getExe pkgs.yaml-merge} "$STATE_DIRECTORY/AdGuardHome.yaml" "${configFile}" > "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" - mv "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" "$STATE_DIRECTORY/AdGuardHome.yaml" - else - cp --force "${configFile}" "$STATE_DIRECTORY/AdGuardHome.yaml" - chmod 600 "$STATE_DIRECTORY/AdGuardHome.yaml" - fi - ''; + # Writing directly to AdGuardHome.yaml results in empty file + ${lib.getExe pkgs.yaml-merge} "$STATE_DIRECTORY/AdGuardHome.yaml" "${configFile}" > "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" + mv "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" "$STATE_DIRECTORY/AdGuardHome.yaml" + else + ${installFresh} + fi + '' + else + installFresh + ); serviceConfig = { DynamicUser = true; From d20c11908887cf4ffc2ffd42091799d4848d0a8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jun 2026 12:02:27 +0000 Subject: [PATCH 018/252] mcat-unwrapped: 0.6.1 -> 0.6.2 --- pkgs/by-name/mc/mcat-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mc/mcat-unwrapped/package.nix b/pkgs/by-name/mc/mcat-unwrapped/package.nix index 44cb06c81bae..08b15dc99396 100644 --- a/pkgs/by-name/mc/mcat-unwrapped/package.nix +++ b/pkgs/by-name/mc/mcat-unwrapped/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "mcat-unwrapped"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Skardyy"; repo = "mcat"; tag = "v${finalAttrs.version}"; - hash = "sha256-zedVMX3JV0jHSUzSY3x9Olimy4Y6GrNVGRSc6Eev9ow="; + hash = "sha256-7QjnbdxUFeRDkIGnAcY2Wf8fLKuj1RuVbu0SUebOc5A="; }; - cargoHash = "sha256-szqXS2CRfHoCtt6Lq1DuVb199mIuf7HUPiN7fj5BGtc="; + cargoHash = "sha256-JnSycAz/jFs9JgA3tqYZn64yNK0bv5SXEYyUOXjC4ug="; nativeBuildInputs = [ installShellFiles From 4996773caf9ff946bf6393755e5f8aaec8559e37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jun 2026 08:26:46 +0000 Subject: [PATCH 019/252] mariadb-galera: 26.4.24 -> 26.4.27 --- pkgs/by-name/ma/mariadb-galera/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mariadb-galera/package.nix b/pkgs/by-name/ma/mariadb-galera/package.nix index c85fdb37bc4a..c43cc4e04430 100644 --- a/pkgs/by-name/ma/mariadb-galera/package.nix +++ b/pkgs/by-name/ma/mariadb-galera/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mariadb-galera"; - version = "26.4.24"; + version = "26.4.27"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; tag = "release_${finalAttrs.version}"; - hash = "sha256-mpf+YY0m+UwvemdZt6SfRP9IJlq5IZtlOJMucADc1oM="; + hash = "sha256-Z1UtNM7HPcbFMr35JVJZCxPl43ZQxy+eBkiQFoVmFhY="; fetchSubmodules = true; }; From 03dbe79b7aa06a9084bd7f0acb70a2c9da9ece48 Mon Sep 17 00:00:00 2001 From: Sanfer Date: Mon, 12 May 2025 14:57:46 +0300 Subject: [PATCH 020/252] maintainers: add different-error --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 65f863a17051..9e3b007ff9d4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6905,6 +6905,11 @@ githubId = 2096594; email = "Dietrich@Daroch.me"; }; + different-error = { + name = "Sanfer D'souza"; + github = "different-error"; + githubId = 9338001; + }; different-name = { name = "different-name"; email = "hello@different-name.dev"; From 9524d71bd77c4022ed7d1329344e6870f1155851 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Mon, 8 Jun 2026 12:17:50 +0100 Subject: [PATCH 021/252] extism-js-core: mark as broken on darwin Build fails due to a linking error: "ld: library not found for -liconv". --- pkgs/by-name/ex/extism-js-core/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ex/extism-js-core/package.nix b/pkgs/by-name/ex/extism-js-core/package.nix index f3942d3a1e6d..6b6963677b9e 100644 --- a/pkgs/by-name/ex/extism-js-core/package.nix +++ b/pkgs/by-name/ex/extism-js-core/package.nix @@ -79,6 +79,9 @@ rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; meta = { + # Fails to build on darwin due to libiconv linking failure (ld: library not found for -liconv) + # See https://github.com/NixOS/nixpkgs/pull/523442 for a (failed) attempt at fixing the issue + broken = stdenv.buildPlatform.isDarwin; changelog = "https://github.com/extism/js-pdk/releases/tag/${finalAttrs.src.tag}"; description = "Write Extism plugins in JavaScript & TypeScript (WASM core)"; homepage = "https://github.com/extism/js-pdk"; From b4b662eb6e280b12e6d19084c37184979e7b2b7a Mon Sep 17 00:00:00 2001 From: Abin Simon Date: Mon, 8 Jun 2026 17:51:43 +0530 Subject: [PATCH 022/252] cliflux: 1.9.1 -> 1.10.0, migrate to codeberg.org --- pkgs/by-name/cl/cliflux/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cl/cliflux/package.nix b/pkgs/by-name/cl/cliflux/package.nix index 1e5237d140a8..ab09017374b0 100644 --- a/pkgs/by-name/cl/cliflux/package.nix +++ b/pkgs/by-name/cl/cliflux/package.nix @@ -1,7 +1,7 @@ { lib, rustPlatform, - fetchFromGitHub, + fetchFromCodeberg, pkg-config, openssl, nix-update-script, @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cliflux"; - version = "1.9.1"; + version = "1.10.0"; - src = fetchFromGitHub { + src = fetchFromCodeberg { owner = "spencerwi"; repo = "cliflux"; tag = "v${finalAttrs.version}"; - hash = "sha256-oBjflPZooZatZCvKLA8h0BMuj++2tPrhE365zTk7vhM="; + hash = "sha256-fzuqgzBVnVIOcRplDKLBskhX9PlMA9LM0f3MnLqzyhk="; }; - cargoHash = "sha256-Q+/sh7Wku40SyhmgGci1YgCXQuEu1Zf4DaRDlDqWpak="; + cargoHash = "sha256-gAfN3kO5wrZ8usKv4C97LT+BAEu9ZD8ZP/GOCrWC7Nk="; nativeBuildInputs = [ pkg-config @@ -32,8 +32,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Terminal client for Miniflux RSS reader"; - homepage = "https://github.com/spencerwi/cliflux"; - changelog = "https://github.com/spencerwi/cliflux/blob/v${finalAttrs.version}/CHANGELOG.md"; + homepage = "https://codeberg.org/spencerwi/cliflux"; + changelog = "https://codeberg.org/spencerwi/cliflux/raw/tag/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "cliflux"; From a4d0b6d4eb2a66467a9bc5270f3e3de196ee7674 Mon Sep 17 00:00:00 2001 From: Gaelan D'costa Date: Mon, 8 Jun 2026 11:46:06 -0400 Subject: [PATCH 023/252] sunsama: 3.1.1 -> 3.4.6 --- pkgs/by-name/su/sunsama/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/sunsama/package.nix b/pkgs/by-name/su/sunsama/package.nix index 07b202838360..838d16cd2857 100644 --- a/pkgs/by-name/su/sunsama/package.nix +++ b/pkgs/by-name/su/sunsama/package.nix @@ -5,11 +5,11 @@ }: let - version = "3.1.1"; + version = "3.4.6"; pname = "sunsama"; src = fetchurl { - url = "https://download.todesktop.com/2003096gmmnl0g1/sunsama-${version}-build-250512vfxlcgvds-x86_64.AppImage"; - hash = "sha512-VOzD/kWfsP2GR1uYkVUdjAuw9tlKjHRNxYuDSYYH7fn43Bk+wfgom/ofu3it/vQjjtuezkTN6gi96U87ypQrSA=="; + url = "https://download.todesktop.com/2003096gmmnl0g1/sunsama-${version}-build-260521zej1bgvs1-x86_64.AppImage"; + hash = "sha512-Stb0Mcap4KmRkj/s5jf1uZLm8sR5KNKGpZKXa2VtBIFxKofS1CxQJDWiJiPSNGsqtezLxmvsC4VSI45isYQSpQ=="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in From 2055a00f76a20cf118c8a357fd29a1a0bbe8e652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Thu, 11 Jun 2026 11:47:14 +0200 Subject: [PATCH 024/252] hue-plus: use finalAttrs, tag and hash --- pkgs/by-name/hu/hue-plus/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/hu/hue-plus/package.nix b/pkgs/by-name/hu/hue-plus/package.nix index c229d5df7038..aa59a6105ccf 100644 --- a/pkgs/by-name/hu/hue-plus/package.nix +++ b/pkgs/by-name/hu/hue-plus/package.nix @@ -5,7 +5,7 @@ libsForQt5, }: -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication (finalAttrs: { pname = "hue-plus"; version = "1.4.5"; format = "setuptools"; @@ -13,8 +13,8 @@ python3Packages.buildPythonApplication { src = fetchFromGitHub { owner = "kusti8"; repo = "hue-plus"; - rev = "7ce7c4603c6d0ab1da29b0d4080aa05f57bd1760"; - sha256 = "sha256-dDIJXhB3rmKnawOYJHE7WK38b0M5722zA+yLgpEjDyI="; + tag = "v.${finalAttrs.version}"; # Only the latest tag uses a . between v and 1. + hash = "sha256-dDIJXhB3rmKnawOYJHE7WK38b0M5722zA+yLgpEjDyI="; }; buildInputs = [ libsForQt5.qtbase ]; @@ -45,4 +45,4 @@ python3Packages.buildPythonApplication { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ garaiza-93 ]; }; -} +}) From ce632c9556a3e3e18a6eed36a049eecf442dff69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Thu, 11 Jun 2026 11:48:31 +0200 Subject: [PATCH 025/252] hue-plus: use mainProgram --- pkgs/by-name/hu/hue-plus/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/hu/hue-plus/package.nix b/pkgs/by-name/hu/hue-plus/package.nix index aa59a6105ccf..97fe095ae689 100644 --- a/pkgs/by-name/hu/hue-plus/package.nix +++ b/pkgs/by-name/hu/hue-plus/package.nix @@ -44,5 +44,6 @@ python3Packages.buildPythonApplication (finalAttrs: { ''; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ garaiza-93 ]; + mainProgram = "hue"; }; }) From 51170f885ea9e7a760e3d89e915362d11daa8994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Thu, 11 Jun 2026 11:49:41 +0200 Subject: [PATCH 026/252] hue-plus: migrate to pyproject --- pkgs/by-name/hu/hue-plus/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/hu/hue-plus/package.nix b/pkgs/by-name/hu/hue-plus/package.nix index 97fe095ae689..9727721575e6 100644 --- a/pkgs/by-name/hu/hue-plus/package.nix +++ b/pkgs/by-name/hu/hue-plus/package.nix @@ -8,7 +8,9 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "hue-plus"; version = "1.4.5"; - format = "setuptools"; + pyproject = true; + + build-system = with python3Packages; [ setuptools ]; src = fetchFromGitHub { owner = "kusti8"; From 9d008f892012aafd2391010fe96c94452a3d39c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Thu, 11 Jun 2026 11:50:43 +0200 Subject: [PATCH 027/252] hue-plus: doCheck --- pkgs/by-name/hu/hue-plus/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/hu/hue-plus/package.nix b/pkgs/by-name/hu/hue-plus/package.nix index 9727721575e6..e0e3c2b609e9 100644 --- a/pkgs/by-name/hu/hue-plus/package.nix +++ b/pkgs/by-name/hu/hue-plus/package.nix @@ -31,7 +31,6 @@ python3Packages.buildPythonApplication (finalAttrs: { setuptools ]; - doCheck = false; dontWrapQtApps = true; makeWrapperArgs = [ From bd90f47a4fa93b27d8f3226b4e11fe9dce237c89 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Thu, 11 Jun 2026 15:28:20 +0200 Subject: [PATCH 028/252] python3Packages.lime: use finalAttrs --- pkgs/development/python-modules/lime/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/lime/default.nix b/pkgs/development/python-modules/lime/default.nix index 62415293eec0..1983b51dc2a4 100644 --- a/pkgs/development/python-modules/lime/default.nix +++ b/pkgs/development/python-modules/lime/default.nix @@ -13,13 +13,13 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lime"; version = "0.2.0.1"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-dpYOTwVf61Pom1AiODuvyHtj8lusYmWYSwozPRpX94E="; }; @@ -55,8 +55,8 @@ buildPythonPackage rec { meta = { description = "Local Interpretable Model-Agnostic Explanations for machine learning classifiers"; homepage = "https://github.com/marcotcr/lime"; - changelog = "https://github.com/marcotcr/lime/releases/tag/${version}"; + changelog = "https://github.com/marcotcr/lime/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ khaser ]; }; -} +}) From f4ebcc196ffc4486bf209a228eb7403ebcba99b2 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Thu, 11 Jun 2026 15:29:02 +0200 Subject: [PATCH 029/252] python3Packages.lime: enable __structuredAttrs --- pkgs/development/python-modules/lime/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/lime/default.nix b/pkgs/development/python-modules/lime/default.nix index 1983b51dc2a4..ebbed5c79a01 100644 --- a/pkgs/development/python-modules/lime/default.nix +++ b/pkgs/development/python-modules/lime/default.nix @@ -18,6 +18,8 @@ buildPythonPackage (finalAttrs: { version = "0.2.0.1"; format = "setuptools"; + __structuredAttrs = true; + src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-dpYOTwVf61Pom1AiODuvyHtj8lusYmWYSwozPRpX94E="; From 66afda3cdafd82f35ecd504a82f7b31cfc24d680 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Thu, 11 Jun 2026 15:32:13 +0200 Subject: [PATCH 030/252] python3Packages.lime: migrate to pyproject --- pkgs/development/python-modules/lime/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lime/default.nix b/pkgs/development/python-modules/lime/default.nix index ebbed5c79a01..407e362b121d 100644 --- a/pkgs/development/python-modules/lime/default.nix +++ b/pkgs/development/python-modules/lime/default.nix @@ -3,6 +3,8 @@ fetchPypi, buildPythonPackage, + setuptools, + matplotlib, numpy, scipy, @@ -16,7 +18,7 @@ buildPythonPackage (finalAttrs: { pname = "lime"; version = "0.2.0.1"; - format = "setuptools"; + pyproject = true; __structuredAttrs = true; @@ -30,7 +32,9 @@ buildPythonPackage (finalAttrs: { --replace-fail "random_seed" "rng" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ matplotlib numpy scipy From 4888b12c8ee3ec6837d36bb0482a52f96ce6b447 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Thu, 11 Jun 2026 16:34:58 +0200 Subject: [PATCH 031/252] python3Packages.lime: disable flaky test --- pkgs/development/python-modules/lime/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/lime/default.nix b/pkgs/development/python-modules/lime/default.nix index 407e362b121d..7ce3a798f17c 100644 --- a/pkgs/development/python-modules/lime/default.nix +++ b/pkgs/development/python-modules/lime/default.nix @@ -48,6 +48,8 @@ buildPythonPackage (finalAttrs: { disabledTestPaths = [ # touches network "lime/tests/test_lime_text.py" + # slightly flaky + "lime/tests/test_lime_tabular.py::TestLimeTabular::test_lime_explainer_entropy_discretizer" ]; pythonImportsCheck = [ From 785d3609240bbe07e5b6ad5b0d8e702b4d94f95d Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Fri, 12 Jun 2026 13:53:35 +0530 Subject: [PATCH 032/252] kip: init at 0.15.0 Signed-off-by: phanirithvij Signed-off-by: phanirithvij --- pkgs/by-name/ki/kip/package.nix | 98 +++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 pkgs/by-name/ki/kip/package.nix diff --git a/pkgs/by-name/ki/kip/package.nix b/pkgs/by-name/ki/kip/package.nix new file mode 100644 index 000000000000..a1a7d2a7863c --- /dev/null +++ b/pkgs/by-name/ki/kip/package.nix @@ -0,0 +1,98 @@ +{ + lib, + stdenv, + fetchFromGitLab, + arpa2cm, + arpa2common, + bison, + cacert, + cmake, + cyrus_sasl, + e2fsprogs, + flex, + freediameter, + gnutls, + json_c, + libev, + libkrb5, + libressl, + openssl, + pkg-config, + python3, + quick-sasl, + quickder, + quickmem, + unbound, + nix-update-script, +}: +let + python-with-packages = python3.withPackages ( + ps: with ps; [ + asn1ate + colored + pyparsing + setuptools + six + ] + ); +in +stdenv.mkDerivation (finalAttrs: { + pname = "kip"; + version = "0.15.0"; + + src = fetchFromGitLab { + owner = "arpa2"; + repo = "kip"; + tag = "v${finalAttrs.version}"; + hash = "sha256-A+tPaImjd9j1Vq69Dgh3j86xI/OcovwTZSULLkOVZaI="; + }; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + bison + cacert + cmake + cyrus_sasl + flex + libkrb5 + openssl + pkg-config + ]; + + buildInputs = [ + arpa2cm + arpa2common + cyrus_sasl + e2fsprogs + freediameter + gnutls + json_c + libev + libkrb5 + libressl + python-with-packages + quick-sasl + quickder + quickmem + unbound + ]; + + cmakeFlags = [ + (lib.cmakeFeature "freeDiameter_EXTENSION_DIR" "${placeholder "out"}/lib/freeDiameter") + ]; + + preBuild = '' + patchShebangs test + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Keyful Identity Protocol — symmetric-key encryption and signing via an online KIP Service"; + homepage = "https://gitlab.com/arpa2/kip"; + license = lib.licenses.bsd2; + teams = with lib.teams; [ ngi ]; + }; +}) From 34e7918c86322476f4308b98a0b7232a476a2d78 Mon Sep 17 00:00:00 2001 From: Noah Markert Date: Sat, 13 Jun 2026 10:47:26 +0200 Subject: [PATCH 033/252] freeradius: 3.2.8 -> 3.2.10 --- pkgs/by-name/fr/freeradius/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/freeradius/package.nix b/pkgs/by-name/fr/freeradius/package.nix index 7f0036dc66a5..3aa2e394b9f5 100644 --- a/pkgs/by-name/fr/freeradius/package.nix +++ b/pkgs/by-name/fr/freeradius/package.nix @@ -38,13 +38,13 @@ assert withRest -> withJson; stdenv.mkDerivation rec { pname = "freeradius"; - version = "3.2.8"; + version = "3.2.10"; src = fetchFromGitHub { owner = "FreeRADIUS"; repo = "freeradius-server"; tag = "release_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-NvcXTT0jp3WR/w+JWcNESg6iNYqIV8QAlM8MxpYkpjs="; + hash = "sha256-+pFV6dDnL7T5G309cLACa+/0vGppCEdk3ghOQhgSjTs="; }; nativeBuildInputs = [ autoreconfHook ]; From 5faa73af1db4258328925792ed56e2204c9a181d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jun 2026 19:47:16 +0000 Subject: [PATCH 034/252] sssd: 2.13.0 -> 2.13.1 --- pkgs/by-name/ss/sssd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ss/sssd/package.nix b/pkgs/by-name/ss/sssd/package.nix index c9d89133e736..91b66f7eb88a 100644 --- a/pkgs/by-name/ss/sssd/package.nix +++ b/pkgs/by-name/ss/sssd/package.nix @@ -65,13 +65,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sssd"; - version = "2.13.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "SSSD"; repo = "sssd"; tag = finalAttrs.version; - hash = "sha256-/zMF7+rpQpWNq7srK2/gP99tgq8s6uFAYb/ORoPO/9w="; + hash = "sha256-f4abHqZ8ojNU4dVw1hkfEJC4asE/NamhYmOQyy368eI="; }; patches = [ From 245d220928cc72aa59f9147c1338df587d1cc49f Mon Sep 17 00:00:00 2001 From: Ben Haskins Date: Sun, 31 May 2026 17:51:52 +0100 Subject: [PATCH 035/252] shantell-sans: init at 1.011 Assisted-by: Antigravity (Gemini 3.5 Flash) --- pkgs/by-name/sh/shantell-sans/package.nix | 36 +++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/sh/shantell-sans/package.nix diff --git a/pkgs/by-name/sh/shantell-sans/package.nix b/pkgs/by-name/sh/shantell-sans/package.nix new file mode 100644 index 000000000000..43f205fd2bea --- /dev/null +++ b/pkgs/by-name/sh/shantell-sans/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenvNoCC, + fetchzip, + installFonts, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "shantell-sans"; + version = "1.011"; + + strictDeps = true; + __structuredAttrs = true; + + outputs = [ + "out" + "webfont" + ]; + + src = fetchzip { + url = "https://github.com/arrowtype/shantell-sans/releases/download/${finalAttrs.version}/Shantell_Sans_${finalAttrs.version}.zip"; + hash = "sha256-xgE4BSl2A7yeVP5hWWUViBDoU8pZ8KkJJrsSfGRIjOk="; + }; + + nativeBuildInputs = [ installFonts ]; + + meta = { + description = "A marker-style variable font by ArrowType and Shantell Martin"; + homepage = "https://github.com/arrowtype/shantell-sans"; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ + benhaskins + ]; + }; +}) From 9fd63d7c6baedb1bb1eca7e43698bf52e5a5c665 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Thu, 21 May 2026 17:12:31 -0600 Subject: [PATCH 036/252] python3Packages.git-revise: 0.7.0-unstable-2025-01-28 -> 0.8.0 Diff: https://github.com/mystor/git-revise/compare/189c9fe150e5587def75c51709246c47c93e3b4d...v0.8.0 --- .../python-modules/git-revise/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix index 12cc6f7e715a..5762c0cfeee2 100644 --- a/pkgs/development/python-modules/git-revise/default.nix +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -2,27 +2,32 @@ lib, stdenv, buildPythonPackage, + hatchling, git, + openssh, gnupg, fetchFromGitHub, pytestCheckHook, }: -buildPythonPackage { +buildPythonPackage (finalAttrs: { pname = "git-revise"; - version = "0.7.0-unstable-2025-01-28"; - format = "setuptools"; + version = "0.8.0"; + pyproject = true; # Missing tests on PyPI src = fetchFromGitHub { owner = "mystor"; repo = "git-revise"; - rev = "189c9fe150e5587def75c51709246c47c93e3b4d"; - hash = "sha256-bqhRV0WtWRUKkBG2tEvctxdoYRkcrpL4JZSHYzox8so="; + tag = "v${finalAttrs.version}"; + hash = "sha256-OdkhYEq30RtDOeCQWl/L9FMgCttznzihbYgT8B6KYuY="; }; + build-system = [ hatchling ]; + nativeCheckInputs = [ git + openssh pytestCheckHook ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ @@ -37,9 +42,9 @@ buildPythonPackage { meta = { description = "Efficiently update, split, and rearrange git commits"; homepage = "https://github.com/mystor/git-revise"; - changelog = "https://github.com/mystor/git-revise/blob/main/CHANGELOG.md"; + changelog = "https://github.com/mystor/git-revise/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; mainProgram = "git-revise"; maintainers = with lib.maintainers; [ _9999years ]; }; -} +}) From 0f67da8a356c3ccacdd302240bd05412c9dc3320 Mon Sep 17 00:00:00 2001 From: Alex Epelde Date: Thu, 18 Jun 2026 08:06:21 -0400 Subject: [PATCH 037/252] mathematica: 14.3.0 -> 15.0.0 --- pkgs/by-name/ma/mathematica/versions.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/by-name/ma/mathematica/versions.nix b/pkgs/by-name/ma/mathematica/versions.nix index 67ae0e5d3086..5fbd2ecd61b0 100644 --- a/pkgs/by-name/ma/mathematica/versions.nix +++ b/pkgs/by-name/ma/mathematica/versions.nix @@ -4,6 +4,20 @@ nix --extra-experimental-features nix-command hash file */ [ + { + version = "15.0.0"; + lang = "en"; + language = "English"; + hash = "sha256-3xEWSCe4g8utJre7h6pr3uADh0VrDN+gh4Ye7eREyLw="; + installer = "Wolfram_15_LIN.sh"; + } + { + version = "15.0.0"; + lang = "en"; + language = "English"; + hash = "sha256-5GulP3FM7p/RBKJskVzywPGJMS90GNATpczcceKmUKo="; + installer = "Wolfram_15.sh"; + } { version = "14.3.0"; lang = "en"; From bb7ea6fc0a9f7a3fa448c3b23c1b5bd2a5ef1305 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jun 2026 20:06:20 +0000 Subject: [PATCH 038/252] python3Packages.junit2html: 31.1.3 -> 31.1.4 --- pkgs/development/python-modules/junit2html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/junit2html/default.nix b/pkgs/development/python-modules/junit2html/default.nix index d5074293dfb6..2471fac4c284 100644 --- a/pkgs/development/python-modules/junit2html/default.nix +++ b/pkgs/development/python-modules/junit2html/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "junit2html"; - version = "31.1.3"; + version = "31.1.4"; pyproject = true; src = fetchFromGitLab { owner = "inorton"; repo = "junit2html"; tag = "v${finalAttrs.version}"; - hash = "sha256-TF+ifAFPn3PQwYQFruP++bWo6/6J8LEmDJYXDYSwcq0="; + hash = "sha256-GUlRGv4+tRslrvSWvb3Fe5DcMFeYgL7HCyAHzrksJeQ="; }; build-system = [ setuptools ]; From 009a683bacea209f4abfe6d167930abd8773c9de Mon Sep 17 00:00:00 2001 From: ojii3 <84656786+OJII3@users.noreply.github.com> Date: Sat, 20 Jun 2026 15:29:29 +0900 Subject: [PATCH 039/252] maintainers: add OJII3 --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fb8460644d88..334fcf4226b2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20625,6 +20625,11 @@ githubId = 31112680; name = "oidro"; }; + ojii3 = { + github = "OJII3"; + githubId = 84656786; + name = "OJII3"; + }; ojsef39 = { name = "Josef Hofer"; github = "ojsef39"; From 0c5164d8f4e76e0dcad815b5ac9bdb309e4c9751 Mon Sep 17 00:00:00 2001 From: ojii3 <84656786+OJII3@users.noreply.github.com> Date: Sat, 20 Jun 2026 15:29:35 +0900 Subject: [PATCH 040/252] gwq: init at 0.1.1 --- pkgs/by-name/gw/gwq/package.nix | 77 +++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 pkgs/by-name/gw/gwq/package.nix diff --git a/pkgs/by-name/gw/gwq/package.nix b/pkgs/by-name/gw/gwq/package.nix new file mode 100644 index 000000000000..9ad31c002b9d --- /dev/null +++ b/pkgs/by-name/gw/gwq/package.nix @@ -0,0 +1,77 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + gitMinimal, + installShellFiles, + makeWrapper, + tmux, + writableTmpDirAsHomeHook, + versionCheckHook, + stdenv, +}: + +buildGoModule (finalAttrs: { + pname = "gwq"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "d-kuro"; + repo = "gwq"; + tag = "v${finalAttrs.version}"; + hash = "sha256-MfCYFbODWnfPxx+6sLlcMT6tqghgILHB13+ccYqVjBA="; + }; + + vendorHash = "sha256-4K01Xf1EXl/NVX1loQ76l1bW8QglBAQdvlZSo7J4NPI="; + + subPackages = [ "cmd/gwq" ]; + + __structuredAttrs = true; + + ldflags = [ + "-s" + "-w" + "-X github.com/d-kuro/gwq/internal/cmd.version=v${finalAttrs.version}" + ]; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + postInstall = '' + wrapProgram $out/bin/gwq \ + --prefix PATH : ${ + lib.makeBinPath [ + gitMinimal + tmux + ] + } + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd gwq \ + --bash <($out/bin/gwq completion bash) \ + --fish <($out/bin/gwq completion fish) \ + --zsh <($out/bin/gwq completion zsh) + ''; + + doInstallCheck = true; + + meta = { + description = "Git worktree manager with fuzzy finder interface"; + homepage = "https://github.com/d-kuro/gwq"; + changelog = "https://github.com/d-kuro/gwq/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + mainProgram = "gwq"; + maintainers = with lib.maintainers; [ ojii3 ]; + platforms = lib.platforms.unix; + }; +}) From cbdc0607fd32e99120288694442defe0e7fd10e4 Mon Sep 17 00:00:00 2001 From: Lyna Date: Tue, 16 Jun 2026 21:05:32 +0100 Subject: [PATCH 041/252] tap: init at 0.1.10 --- pkgs/by-name/ta/tap/package.nix | 49 +++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/ta/tap/package.nix diff --git a/pkgs/by-name/ta/tap/package.nix b/pkgs/by-name/ta/tap/package.nix new file mode 100644 index 000000000000..f272148d841e --- /dev/null +++ b/pkgs/by-name/ta/tap/package.nix @@ -0,0 +1,49 @@ +{ + lib, + buildGoModule, + nix-update-script, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + __structuredAttrs = true; + + pname = "tap"; + version = "0.1.10"; + + src = fetchFromGitHub { + owner = "bluesky-social"; + repo = "indigo"; + rev = "tap-v${finalAttrs.version}"; + hash = "sha256-nDOLIRWTyj/R0h+70+bGi85RVe2OKLNbnSaKyyqc93Q="; + }; + + vendorHash = "sha256-s1S+b+QbptqJ2mxqkvsn7M5VWfLrlwpWgRjg6lq2WVE="; + + subPackages = [ + "cmd/tap" + ]; + + postPatch = '' + substituteInPlace cmd/tap/main.go \ + --replace-fail "versioninfo.Short()" '"${finalAttrs.version}"' \ + --replace-fail '"github.com/earthboundkid/versioninfo/v2"' "" + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "ATProtocol firehose sync utility"; + homepage = "https://github.com/bluesky-social/indigo/tree/main/cmd/tap/README.md"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ + blooym + ]; + mainProgram = "tap"; + }; +}) From 729733adb82715c3bd7b35690f483e0aaa987aae Mon Sep 17 00:00:00 2001 From: Lyna Date: Tue, 16 Jun 2026 21:10:00 +0100 Subject: [PATCH 042/252] nixos/tap: init --- .../manual/release-notes/rl-2611.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/tap.nix | 131 ++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 nixos/modules/services/networking/tap.nix diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index aaf1554cf398..2a41a07db363 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -14,6 +14,8 @@ - [scx_loader](https://github.com/sched-ext/scx-loader), a system daemon and DBus-based loader for sched_ext schedulers. `scxctl` is the command-line client for interacting with the loader, allowing users to switch schedulers, modes, and arguments dynamically. Available as [services.scx-loader](#opt-services.scx-loader.enable) +- [tap](https://github.com/bluesky-social/indigo/tree/main/cmd/tap), an ATProtocol firehose synchronisation utility. Available as [services.tap](#opt-services.tap.enable). + - [Nezha](https://github.com/nezhahq/nezha), a self-hosted, lightweight server and website monitoring and O&M tool. Available as [services.nezha](#opt-services.nezha.enable). - [CastSponsorSkip](https://github.com/gabe565/CastSponsorSkip/), skips YouTube sponsorships (and sometimes ads) on all local Google Cast devices. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0fd01c232583..bcfcbf30bae1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1426,6 +1426,7 @@ ./services/networking/tailscale-derper.nix ./services/networking/tailscale-serve.nix ./services/networking/tailscale.nix + ./services/networking/tap.nix ./services/networking/tayga.nix ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix diff --git a/nixos/modules/services/networking/tap.nix b/nixos/modules/services/networking/tap.nix new file mode 100644 index 000000000000..bea84531014d --- /dev/null +++ b/nixos/modules/services/networking/tap.nix @@ -0,0 +1,131 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.tap; +in +{ + options.services.tap = { + enable = lib.mkEnableOption "Tap, ATProtocol firehose sync utility"; + + package = lib.mkPackageOption pkgs "tap" { }; + + environmentFiles = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + description = '' + Files to load environment variables from. Use for secrets such as + {env}`TAP_ADMIN_PASSWORD` that should not be readable in the Nix store. + ''; + }; + + settings = lib.mkOption { + default = { }; + description = '' + Configuration for Tap as environment variables. See the + [README](https://github.com/bluesky-social/indigo/blob/main/cmd/tap/README.md) + for all available options. + + Secrets such as {option}`settings.TAP_ADMIN_PASSWORD` should be set via + {option}`environmentFiles` rather than here, as values set here will + be readable in the Nix store. + ''; + type = lib.types.submodule { + freeformType = lib.types.attrsOf ( + lib.types.nullOr ( + lib.types.oneOf [ + lib.types.bool + lib.types.int + lib.types.float + lib.types.str + ] + ) + ); + + options = { + TAP_BIND = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1:2480"; + description = "Address and port the HTTP server will listen on."; + }; + + TAP_DATABASE_URL = lib.mkOption { + type = lib.types.str; + default = "sqlite:///var/lib/tap/tap.db"; + description = '' + Database connection string. Accepts SQLite (`sqlite://path`) or + PostgreSQL (`postgres://...`) connection strings. + ''; + }; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.tap = { + description = "Tap - ATProtocol firehose sync utility"; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = "tap"; + DynamicUser = true; + + ExecStart = "${lib.getExe cfg.package} run"; + Environment = lib.mapAttrsToList ( + k: v: "${k}=${if lib.isBool v then lib.boolToString v else toString v}" + ) (lib.filterAttrs (_: v: v != null) cfg.settings); + EnvironmentFile = cfg.environmentFiles; + + Restart = "on-failure"; + RestartSec = 5; + StateDirectory = "tap"; + StateDirectoryMode = "0750"; + + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + ProtectSystem = "strict"; + + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + + LockPersonality = true; + NoNewPrivileges = true; + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + RemoveIPC = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + UMask = "0077"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ blooym ]; +} From 00f2e9ea5ef93595137bedb5281bbece8298d9e9 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 21 Jun 2026 23:42:20 +0200 Subject: [PATCH 043/252] {lomiri,lomiri-qt6}.lomiri-download-manager: 0.3.1 -> 0.3.2 --- .../lomiri/services/lomiri-download-manager/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix index 774f9bf34721..2742499463ca 100644 --- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix @@ -28,17 +28,17 @@ }: let - withQt6 = lib.strings.versionAtLeast qtbase.version "6"; + withQt6 = lib.versions.major qtbase.version == "6"; in stdenv.mkDerivation (finalAttrs: { pname = "lomiri-download-manager"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-download-manager"; tag = finalAttrs.version; - hash = "sha256-FqpTEGbSwN+2oG/G2Zf80rSfezJP/ogtIkVdIrX4FMU="; + hash = "sha256-FJcc8Y+AFAxiTj7JGLAlDkviEwMBpsDjuibJP6hgVNY="; }; outputs = [ From 25b02e1a0b37d57f5b501027e3f403b61709bea1 Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 14 Jun 2026 14:05:08 +0200 Subject: [PATCH 044/252] rio: 0.4.5 -> 0.4.7 --- pkgs/by-name/ri/rio/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix index 21a169c0288a..f5717869361b 100644 --- a/pkgs/by-name/ri/rio/package.nix +++ b/pkgs/by-name/ri/rio/package.nix @@ -51,16 +51,24 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "rio"; - version = "0.4.5"; + version = "0.4.7"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; tag = "v${finalAttrs.version}"; - hash = "sha256-ON7CJ1NDwLfjvLZ0ugN45LUjBGiwRNASiQwuDa6F1vM="; + hash = "sha256-vlNt8hBb1fhO5tEAID5WXMc7I0k9vn6/L45nkTXS6Qg="; }; - cargoHash = "sha256-vSQ5heZZ8tYKeMABhZ8AziEAniavnAasH04BVlqYF4g="; + cargoHash = "sha256-8qVS9wINEBLKKWbylG3sHO+oqnLvsa1wgN0OOHFzOBM="; + + # The 0.4.7 "update to rust 1.96" bump (raphamorim/rio@6a11aa33c7) only made + # clippy-style refactors that build on older rustc; the MSRV pin is cosmetic. + # Lower it so nixpkgs' rustc (1.95) can build rio. + postPatch = '' + substituteInPlace Cargo.toml \ + --replace-fail 'rust-version = "1.96.0"' 'rust-version = "1.95.0"' + ''; nativeBuildInputs = [ rustPlatform.bindgenHook From 952e4912c8c1c9c902dea13ce44f13b4cc4786d7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 22 Jun 2026 19:14:56 +0300 Subject: [PATCH 045/252] corrosion: fix dependent packages --- pkgs/by-name/co/corrosion/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/co/corrosion/package.nix b/pkgs/by-name/co/corrosion/package.nix index ce647cbdf350..9c313f9c1882 100644 --- a/pkgs/by-name/co/corrosion/package.nix +++ b/pkgs/by-name/co/corrosion/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cargo, cmake, rustc, @@ -18,6 +19,14 @@ stdenv.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; hash = "sha256-ppuDNObfKhneD9AlnPAvyCRHKW3BidXKglD1j/LE9CM="; }; + patches = [ + # Fix for this hard to debug issue in dependent packages: + # https://github.com/corrosion-rs/corrosion/issues/588 + (fetchpatch { + url = "https://github.com/corrosion-rs/corrosion/commit/7dab832903ddfb0f644cbd014252d477e692012b.patch"; + hash = "sha256-T9ILTfAd/i63v45YJQsz8F/P3NBwrP1mL2bKNU0NaLw="; + }) + ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; From 5b8358aea82bee2241fbdbba1a064b94cc8c1817 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Thu, 25 Jun 2026 12:59:44 +0200 Subject: [PATCH 046/252] python3Packages.fuzzywuzzy: use finalAttrs --- pkgs/development/python-modules/fuzzywuzzy/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index bd28e2afa990..b1a1508d7e44 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -8,13 +8,14 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fuzzywuzzy"; version = "0.18.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) version; + pname = "fuzzywuzzy"; sha256 = "1s00zn75y2dkxgnbw8kl8dw4p1mc77cv78fwfa4yb0274s96w0a5"; }; @@ -31,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ erikarvstedt ]; }; -} +}) From 0359617a6a813b6273bbeb4d63d3f84979587fee Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Thu, 25 Jun 2026 13:02:09 +0200 Subject: [PATCH 047/252] python3Packages.fuzzywuzzy: enable __structuredAttrs --- pkgs/development/python-modules/fuzzywuzzy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index b1a1508d7e44..03faeaf38a80 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -13,6 +13,8 @@ buildPythonPackage (finalAttrs: { version = "0.18.0"; format = "setuptools"; + __structuredAttrs = true; + src = fetchPypi { inherit (finalAttrs) version; pname = "fuzzywuzzy"; From ad6ca3966bdfd626cc8ea1caa7d36ec2a094a3fd Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Thu, 25 Jun 2026 13:04:58 +0200 Subject: [PATCH 048/252] python3Packages.fuzzywuzzy: migrate to pyproject --- pkgs/development/python-modules/fuzzywuzzy/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index 03faeaf38a80..b6181f23f9af 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, levenshtein, pycodestyle, hypothesis, @@ -11,7 +12,7 @@ buildPythonPackage (finalAttrs: { pname = "fuzzywuzzy"; version = "0.18.0"; - format = "setuptools"; + pyproject = true; __structuredAttrs = true; @@ -21,7 +22,10 @@ buildPythonPackage (finalAttrs: { sha256 = "1s00zn75y2dkxgnbw8kl8dw4p1mc77cv78fwfa4yb0274s96w0a5"; }; - propagatedBuildInputs = [ levenshtein ]; + build-system = [ setuptools ]; + + dependencies = [ levenshtein ]; + nativeCheckInputs = [ pycodestyle hypothesis From 0149e7ce8bb9c0a80d608f5e738a00db34f79192 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Thu, 25 Jun 2026 13:11:18 +0200 Subject: [PATCH 049/252] python3Packages.fuzzywuzzy: enable tests --- pkgs/development/python-modules/fuzzywuzzy/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index b6181f23f9af..28dad040f86b 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -2,11 +2,10 @@ lib, buildPythonPackage, fetchPypi, + pytestCheckHook, setuptools, levenshtein, pycodestyle, - hypothesis, - pytest, }: buildPythonPackage (finalAttrs: { @@ -27,9 +26,12 @@ buildPythonPackage (finalAttrs: { dependencies = [ levenshtein ]; nativeCheckInputs = [ + pytestCheckHook pycodestyle - hypothesis - pytest + ]; + + pythonImportsCheck = [ + "fuzzywuzzy" ]; meta = { From e5228f3b4bc79fea354e759217f9f6369d7a78ab Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Thu, 25 Jun 2026 14:31:34 +0200 Subject: [PATCH 050/252] python3Packages.dpcontracts: enable __structuredAttrs --- pkgs/development/python-modules/dpcontracts/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dpcontracts/default.nix b/pkgs/development/python-modules/dpcontracts/default.nix index 1917a264a114..33ee4cff9675 100644 --- a/pkgs/development/python-modules/dpcontracts/default.nix +++ b/pkgs/development/python-modules/dpcontracts/default.nix @@ -9,6 +9,8 @@ buildPythonPackage { version = "unstable-2018-11-20"; format = "setuptools"; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "deadpixi"; repo = "contracts"; From 6e409a04d47d3dcd8f6ecfb0b9fbaadd1c36f057 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Thu, 25 Jun 2026 14:33:30 +0200 Subject: [PATCH 051/252] python3Packages.dpcontracts: migrate to pyproject --- pkgs/development/python-modules/dpcontracts/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dpcontracts/default.nix b/pkgs/development/python-modules/dpcontracts/default.nix index 33ee4cff9675..e11f41ebb77f 100644 --- a/pkgs/development/python-modules/dpcontracts/default.nix +++ b/pkgs/development/python-modules/dpcontracts/default.nix @@ -2,12 +2,13 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, }: buildPythonPackage { pname = "dpcontracts"; version = "unstable-2018-11-20"; - format = "setuptools"; + pyproject = true; __structuredAttrs = true; @@ -18,6 +19,10 @@ buildPythonPackage { hash = "sha256-FygJPXo7lZ9tlfqY6KmPJ3PLIilMGLBr3013uj9hCEs="; }; + build-system = [ + setuptools + ]; + # package does not have any tests doCheck = false; From 0fd81c6cf37b8e5fd673edb6bfb5b5eb4bc5440b Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Fri, 26 Jun 2026 20:28:36 +0000 Subject: [PATCH 052/252] paper-mono: init at 0.300 --- pkgs/by-name/pa/paper-mono/package.nix | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/pa/paper-mono/package.nix diff --git a/pkgs/by-name/pa/paper-mono/package.nix b/pkgs/by-name/pa/paper-mono/package.nix new file mode 100644 index 000000000000..424bc24446da --- /dev/null +++ b/pkgs/by-name/pa/paper-mono/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenvNoCC, + fetchzip, + installFonts, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "paper-mono"; + version = "0.300"; + __structuredAttrs = true; + + outputs = [ + "out" + "webfont" + ]; + + src = fetchzip { + url = "https://github.com/paper-design/paper-mono/releases/download/v${finalAttrs.version}/paper-mono-v${finalAttrs.version}.zip"; + hash = "sha256-coWJoVnVrzap8iG5UV84UVQOSDQzgF+a9G5/pn8nD6A="; + }; + + strictDeps = true; + nativeBuildInputs = [ installFonts ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Beautiful monospace font for design and code by Paper"; + homepage = "https://github.com/paper-design/paper-mono"; + changelog = "https://github.com/paper-design/paper-mono/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + platforms = lib.platforms.all; + }; +}) From 2d97febca57379d2b1113d40283363e4b1d89e72 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sat, 13 Jun 2026 14:55:28 +0200 Subject: [PATCH 053/252] bazelisk: 1.28.1 -> 1.29.0 changelog: https://github.com/bazelbuild/bazelisk/releases/tag/v1.29.0 diff: https://github.com/bazelbuild/bazelisk/compare/v1.28.1...v1.29.0 --- pkgs/by-name/ba/bazelisk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/bazelisk/package.nix b/pkgs/by-name/ba/bazelisk/package.nix index b795a8b1bcd7..0e7d9c457962 100644 --- a/pkgs/by-name/ba/bazelisk/package.nix +++ b/pkgs/by-name/ba/bazelisk/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "bazelisk"; - version = "1.28.1"; + version = "1.29.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazelisk"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-iKU8B8yOT8cPvZhuor8ZVRsHQDoXq1ja1mr60XqHoEs="; + sha256 = "sha256-NijRYjJyWOqSkfDKOdki3nrc1OIhfooKLhusuiMY/Js="; }; - vendorHash = "sha256-PWqKq/2DFopeiecUL0iWnut8Kd/52U32sNSVGj3Ae5g="; + vendorHash = "sha256-oycCqzUAn/lNFjeLjM+PQfYNscaTi5E9D7Pnv8jrO8M="; ldflags = [ "-s" From 27d7c706bfaa868ed11ea14454f5531e58cb4785 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sat, 13 Jun 2026 14:55:58 +0200 Subject: [PATCH 054/252] bazelisk: modernize --- pkgs/by-name/ba/bazelisk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/bazelisk/package.nix b/pkgs/by-name/ba/bazelisk/package.nix index 0e7d9c457962..d8690b890fcb 100644 --- a/pkgs/by-name/ba/bazelisk/package.nix +++ b/pkgs/by-name/ba/bazelisk/package.nix @@ -11,8 +11,8 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazelisk"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-NijRYjJyWOqSkfDKOdki3nrc1OIhfooKLhusuiMY/Js="; + tag = "v${finalAttrs.version}"; + hash = "sha256-NijRYjJyWOqSkfDKOdki3nrc1OIhfooKLhusuiMY/Js="; }; vendorHash = "sha256-oycCqzUAn/lNFjeLjM+PQfYNscaTi5E9D7Pnv8jrO8M="; @@ -30,7 +30,7 @@ buildGoModule (finalAttrs: { BEWARE: This package does not work on NixOS. ''; homepage = "https://github.com/bazelbuild/bazelisk"; - changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = [ ]; }; From daf7407e4e6c47660cb6b1820dbf53da8317e51c Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sat, 13 Jun 2026 14:56:18 +0200 Subject: [PATCH 055/252] bazelisk: add hythera as maintainer --- pkgs/by-name/ba/bazelisk/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/bazelisk/package.nix b/pkgs/by-name/ba/bazelisk/package.nix index d8690b890fcb..31ce4fda2dc3 100644 --- a/pkgs/by-name/ba/bazelisk/package.nix +++ b/pkgs/by-name/ba/bazelisk/package.nix @@ -32,6 +32,8 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/bazelbuild/bazelisk"; changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + hythera + ]; }; }) From 37793d05708005ca8e518584e01ab15773ed45c7 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Mon, 15 Jun 2026 17:25:15 +0200 Subject: [PATCH 056/252] kubebuilder: 4.13.1 -> 4.15.0 changelog: https://github.com/kubernetes-sigs/kubebuilder/releases/tag/v4.15.0 diff: https://github.com/kubernetes-sigs/kubebuilder/compare/v4.14.0...v4.15.0 --- pkgs/by-name/ku/kubebuilder/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ku/kubebuilder/package.nix b/pkgs/by-name/ku/kubebuilder/package.nix index 4c5c24a0f7cb..e62476888f8d 100644 --- a/pkgs/by-name/ku/kubebuilder/package.nix +++ b/pkgs/by-name/ku/kubebuilder/package.nix @@ -12,16 +12,16 @@ buildGoModule (finalAttrs: { pname = "kubebuilder"; - version = "4.13.1"; + version = "4.15.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; - rev = "v${finalAttrs.version}"; - hash = "sha256-WOqrQb2haoEp57OHFo1Y1fon0lJedI/hEYKE4xrIbpM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-iTC5HY4E54YG+isSgW2515Kz83+khzANAml78z8EG88="; }; - vendorHash = "sha256-1lbf1hXJfhdTu6Gm7dcbJlB3beITxBD83gMltZgg7Pg="; + vendorHash = "sha256-7rXunagWkUWGL5v+xkmyLELwrIEuRVGPk4SK8/lotio="; subPackages = [ "internal/cli/cmd" From e3697bb81d57f5701a76faf344642e1adc216962 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Mon, 15 Jun 2026 17:27:02 +0200 Subject: [PATCH 057/252] kubebuilder: add hythera as maintainer --- pkgs/by-name/ku/kubebuilder/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ku/kubebuilder/package.nix b/pkgs/by-name/ku/kubebuilder/package.nix index e62476888f8d..70db72337fe5 100644 --- a/pkgs/by-name/ku/kubebuilder/package.nix +++ b/pkgs/by-name/ku/kubebuilder/package.nix @@ -69,6 +69,8 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/kubernetes-sigs/kubebuilder"; changelog = "https://github.com/kubernetes-sigs/kubebuilder/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + hythera + ]; }; }) From 5dd3a57308ed06f8272e59f8c2020a9d6e002a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 28 Jun 2026 10:27:43 +0200 Subject: [PATCH 058/252] dockerTools: fix streamLayeredImage wrapper shebang when cross compiling The streamLayeredImage wrapper invokes the image streamer at build time on the build platform. It was built with makeWrapper, which bakes targetPackages.runtimeShell into the shebang. Under cross compilation that is the host shell, so the wrapper is not executable on the builder and crashes (e.g. a Linux image built on a Darwin builder segfaults the streamer). This was fixed by switching to pkgsBuildBuild.makeWrapper (build == host == target) so the shebang points at the build-platform shell. --- pkgs/build-support/docker/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index d8e9812c7bec..6e61677350fe 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -7,6 +7,7 @@ coreutils, devShellTools, e2fsprogs, + pkgsBuildBuild, proot, fakeNss, fakeroot, @@ -1246,7 +1247,7 @@ rec { # take images can know in advance how the image is supposed to be used. isExe = true; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ pkgsBuildBuild.makeWrapper ]; inherit meta; } '' From e179f51ea761ed3bad9e58e1350ff80945ea4c49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jun 2026 14:35:08 +0000 Subject: [PATCH 059/252] modrinth-app-unwrapped: 0.14.8 -> 0.15.1 --- pkgs/by-name/mo/modrinth-app-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 6cb63b4bba03..287ed23699bb 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -31,13 +31,13 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "modrinth-app-unwrapped"; - version = "0.14.8"; + version = "0.15.1"; src = fetchFromGitHub { owner = "modrinth"; repo = "code"; tag = "v${finalAttrs.version}"; - hash = "sha256-s34vmm0Apy20FrfSjESXtj+uggvr4ODpOrxfapAKtlc="; + hash = "sha256-kF808vT/CO1Aklv+P23GWdxSBqDshFphL8hx0PYSgQk="; }; patches = [ @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '1.0.0-local' '${finalAttrs.version}' ''; - cargoHash = "sha256-JU8QhdDikqe9a/MXVe2jSsXATvwdgpyjWr7pV/75C9E="; + cargoHash = "sha256-GQmhyTGN+MItwQEVyZ5Ai0cowvOxp++THuSrXsrRG1A="; mitmCache = gradle.fetchDeps { inherit (finalAttrs) pname; From 9007b5bf53fb9b6e1ea5a542ff53d10d1cbf47a5 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Sun, 28 Jun 2026 12:29:26 +0000 Subject: [PATCH 060/252] orca-slicer: enable EGL for wxwidgets --- pkgs/by-name/or/orca-slicer/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 85d0c618d72e..1c26d773c20e 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -47,7 +47,7 @@ let (wxwidgets_3_3.override { withPrivateFonts = true; withWebKit = true; - withEGL = false; + withEGL = true; }).overrideAttrs (old: { buildInputs = old.buildInputs ++ [ libsecret ]; From ea4ed096f663de2f4f69e5b5aa0496310f67bb2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Jun 2026 04:35:00 +0000 Subject: [PATCH 061/252] envio: 0.7.0 -> 0.8.0 --- pkgs/by-name/en/envio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/en/envio/package.nix b/pkgs/by-name/en/envio/package.nix index 9cf6e4411cf4..7a4646125004 100644 --- a/pkgs/by-name/en/envio/package.nix +++ b/pkgs/by-name/en/envio/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "envio"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "humblepenguinn"; repo = "envio"; rev = "v${finalAttrs.version}"; - hash = "sha256-uiuJ3yFuU5S0e6SrD1C4tU5Ve/VBoGmyclbokESDZAw="; + hash = "sha256-3bcIGQ+4abdG7Xw4Sta+I8a1XllO8h7V09egwuogcxk="; }; - cargoHash = "sha256-eECjTnqjy38jA5kHddPaBZaZ/1ErHB7uQPbZYNFBcSU="; + cargoHash = "sha256-QwuGpIhPS0p+TsbWdGknXcN655IP/AzE44a6m9HY8K0="; nativeBuildInputs = [ pkg-config From b5f2b69b07a6a4b99e268ce674e4c35cb3c59912 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Jun 2026 05:47:54 +0000 Subject: [PATCH 062/252] python3Packages.sigima: 1.1.4 -> 1.1.5 --- pkgs/development/python-modules/sigima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sigima/default.nix b/pkgs/development/python-modules/sigima/default.nix index 234d3967c616..bf67ac8b0666 100644 --- a/pkgs/development/python-modules/sigima/default.nix +++ b/pkgs/development/python-modules/sigima/default.nix @@ -47,7 +47,7 @@ buildPythonPackage (finalAttrs: { pname = "sigima"; - version = "1.1.4"; + version = "1.1.5"; pyproject = true; __structuredAttrs = true; @@ -55,7 +55,7 @@ buildPythonPackage (finalAttrs: { owner = "DataLab-Platform"; repo = "Sigima"; tag = "v${finalAttrs.version}"; - hash = "sha256-AQrUn/WgWZ5W9Lrg4TJjerEZvGDH1wKL2WbeP3sGjrE="; + hash = "sha256-WRuTncx6iKQVdKjDaSwg/hVcBM4WxLGq1pcMEMXMVQI="; }; build-system = [ From cfedd4f94237a409709b83646da8e77af8ed413f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Jun 2026 08:15:43 +0000 Subject: [PATCH 063/252] listmonk: 6.1.0 -> 6.2.0 --- pkgs/by-name/li/listmonk/email-builder.nix | 2 +- pkgs/by-name/li/listmonk/frontend.nix | 2 +- pkgs/by-name/li/listmonk/package.nix | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/listmonk/email-builder.nix b/pkgs/by-name/li/listmonk/email-builder.nix index a8c4718730e6..4b069365903e 100644 --- a/pkgs/by-name/li/listmonk/email-builder.nix +++ b/pkgs/by-name/li/listmonk/email-builder.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { offlineCache = fetchYarnDeps { yarnLock = "${src}/frontend/email-builder/yarn.lock"; - hash = "sha256-sFRmnMPStNp45hxcF+Iq1WhH6LtVFtgq2regq6MPzcc="; + hash = "sha256-ANPLOL9j0gljtNtbfb+ZifVRN9vLexPddAevpeFwX4o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/listmonk/frontend.nix b/pkgs/by-name/li/listmonk/frontend.nix index 4fec2c272de4..cb82721de315 100644 --- a/pkgs/by-name/li/listmonk/frontend.nix +++ b/pkgs/by-name/li/listmonk/frontend.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${src}/frontend/yarn.lock"; - hash = "sha256-VCaEMftA7AzW/6jyceVO596iby0wC3LW9YDG66kLJmw="; + hash = "sha256-R2xHcHksTtFfFh41FLeBhpuz84ceixGt6oz6SQWWyMQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/listmonk/package.nix b/pkgs/by-name/li/listmonk/package.nix index 7fc3c88b6425..ed62aebb3996 100644 --- a/pkgs/by-name/li/listmonk/package.nix +++ b/pkgs/by-name/li/listmonk/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "listmonk"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "knadh"; repo = "listmonk"; rev = "v${finalAttrs.version}"; - hash = "sha256-SG9PhQOu3QB0LA9dNLnNzwwtfaib7MCfvOcBMkWMRPw="; + hash = "sha256-eora/+zJf60trmANEqAhYAQXfEMifyw5gLPKcqBW46w="; }; - vendorHash = "sha256-0KrjaExgT9tN4M99CfyQpqpGYnXOpzsPRk/Ih4qXsuE="; + vendorHash = "sha256-t4l8872bniTmNIW4ias1gImURJgrR6htXkncqfrJ+AU="; nativeBuildInputs = [ stuffbin From de3c59ca011a61403f2b0fbe01acd027b22a3e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dr=C3=A5f=C3=B8lin?= <66629792+drafolin@users.noreply.github.com> Date: Mon, 29 Jun 2026 16:40:29 +0200 Subject: [PATCH 064/252] tonearm: add passthru.updateScript --- pkgs/by-name/to/tonearm/package.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/to/tonearm/package.nix b/pkgs/by-name/to/tonearm/package.nix index d63aa6788920..11477415cccc 100644 --- a/pkgs/by-name/to/tonearm/package.nix +++ b/pkgs/by-name/to/tonearm/package.nix @@ -1,5 +1,5 @@ { - buildGo126Module, + buildGoModule, cairo, copyDesktopItems, fetchFromGitea, @@ -15,7 +15,8 @@ libsecret, librsvg, makeDesktopItem, - makeWrapper, + makeBinaryWrapper, + nix-update-script, pango, pkg-config, symlinkJoin, @@ -38,7 +39,8 @@ let ]; }; in -buildGo126Module (finalAttrs: { +buildGoModule (finalAttrs: { + __structuredAttrs = true; pname = "tonearm"; version = "1.4.0"; src = fetchFromGitea { @@ -67,7 +69,7 @@ buildGo126Module (finalAttrs: { nativeBuildInputs = [ pkg-config copyDesktopItems - makeWrapper + makeBinaryWrapper wrapGAppsHook4 ]; @@ -107,6 +109,8 @@ buildGo126Module (finalAttrs: { glib-compile-schemas $out/share/glib-2.0/schemas ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "GTK client for TIDAL written in Golang"; homepage = "https://codeberg.org/dergs/Tonearm"; @@ -116,5 +120,6 @@ buildGo126Module (finalAttrs: { nilathedragon ]; mainProgram = "tonearm"; + platforms = lib.platforms.unix; }; }) From ef4131bb308481ebabc2eef1c5e5abd6fea557ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Jun 2026 14:53:59 +0000 Subject: [PATCH 065/252] git-pkgs: 0.16.2 -> 0.17.0 --- pkgs/by-name/gi/git-pkgs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-pkgs/package.nix b/pkgs/by-name/gi/git-pkgs/package.nix index fed7f36bd933..19f7d4be6804 100644 --- a/pkgs/by-name/gi/git-pkgs/package.nix +++ b/pkgs/by-name/gi/git-pkgs/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "git-pkgs"; - version = "0.16.2"; + version = "0.17.0"; src = fetchFromGitHub { owner = "git-pkgs"; repo = "git-pkgs"; tag = "v${version}"; - hash = "sha256-6AhA4CG4q6ujM3JSz5aUXvVG7vC5mL8DGiF4dO2kU3k="; + hash = "sha256-4Q95ONe6tcrUk7TsxR347PAFQ/HuMjcqNfCLo6oZtws="; }; - vendorHash = "sha256-uram6wb0nTxVDy8PQa3R4os620S/XuDcTZkMhwNhd3A="; + vendorHash = "sha256-YjKktBQT62htk/nqZp9quKEg4eI3vTz6AY64o9IT3/4="; subPackages = [ "." ]; From 126a01503e35b1d7ed779a8d49ea5a47524c836b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 29 Jun 2026 08:35:01 -0700 Subject: [PATCH 066/252] python3Packages.blinkpy: 0.25.6 -> 0.25.7 Diff: https://github.com/fronzbot/blinkpy/compare/v0.25.6...v0.25.7 Changelog: https://github.com/fronzbot/blinkpy/releases/tag/v0.25.7 --- pkgs/development/python-modules/blinkpy/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 0f9a6383ac50..84823bd41ee5 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -15,24 +15,29 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.25.6"; + version = "0.25.7"; pyproject = true; src = fetchFromGitHub { owner = "fronzbot"; repo = "blinkpy"; tag = "v${version}"; - hash = "sha256-OAa5sYuFGsxiS5r+v69dnXCQs7rmAFAHbmNXm3S6cgY="; + hash = "sha256-/GaSnovF6IwIKdbQ4bTqXI/lZERa2DhbLalOO+ZYXEY="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "wheel>=0.40,<0.47" wheel \ - --replace-fail "setuptools>=68,<81" setuptools + --replace-fail "wheel>=0.40,<0.48" wheel \ + --replace-fail "setuptools>=68,<83" setuptools ''; build-system = [ setuptools ]; + pythonRelaxDeps = [ + "aiohttp" + "requests" + ]; + dependencies = [ aiofiles aiohttp From 0e47ab4a243224ec0591e867cf46b8b250a9a1e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 29 Jun 2026 08:40:09 -0700 Subject: [PATCH 067/252] python3Packages.blinkpy: use finalAttrs --- pkgs/development/python-modules/blinkpy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 84823bd41ee5..428053437f7d 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -13,7 +13,7 @@ sortedcontainers, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "blinkpy"; version = "0.25.7"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fronzbot"; repo = "blinkpy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/GaSnovF6IwIKdbQ4bTqXI/lZERa2DhbLalOO+ZYXEY="; }; @@ -65,8 +65,8 @@ buildPythonPackage rec { meta = { description = "Python library for the Blink Camera system"; homepage = "https://github.com/fronzbot/blinkpy"; - changelog = "https://github.com/fronzbot/blinkpy/releases/tag/${src.tag}"; + changelog = "https://github.com/fronzbot/blinkpy/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) From 1407ab878798d735aa061e8bff8394175fcfee72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 29 Jun 2026 12:49:45 -0700 Subject: [PATCH 068/252] python3Packages.ical: 13.2.5 -> 13.3.0 Diff: https://github.com/allenporter/ical/compare/13.2.5...13.3.0 Changelog: https://github.com/allenporter/ical/releases/tag/13.3.0 --- pkgs/development/python-modules/ical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 1a574e24dcf5..248514e869e9 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "ical"; - version = "13.2.5"; + version = "13.3.0"; pyproject = true; src = fetchFromGitHub { owner = "allenporter"; repo = "ical"; tag = finalAttrs.version; - hash = "sha256-u7HVutdUHwUsGfKj+PYjTrhX9I5lDUzWRhsBnjJYWOg="; + hash = "sha256-tyPD0z2wWND6b6TKe/uXH2N5HcaJifhV4gQS9GEAQxs="; }; build-system = [ setuptools ]; From e1a4f68f2ae09dcb313677c27928a0972cfd16ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Jun 2026 22:06:06 +0000 Subject: [PATCH 069/252] mattermostLatest: 11.8.1 -> 11.8.2 --- pkgs/by-name/ma/mattermostLatest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix index e0fd905a82d2..e98f1f7032b5 100644 --- a/pkgs/by-name/ma/mattermostLatest/package.nix +++ b/pkgs/by-name/ma/mattermostLatest/package.nix @@ -15,10 +15,10 @@ mattermost.override ( # and make sure the version regex is up to date here. # Ensure you also check ../mattermost/package.nix for ESR releases. regex = "^v(11\\.[0-9]+\\.[0-9]+)$"; - version = "11.8.1"; - srcHash = "sha256-9EIbTwnEeZQKg5uixkMp3sp/n+9I2N9W7hxsW5juF3M="; + version = "11.8.2"; + srcHash = "sha256-XZ4yr7nbGum6UQaBjze50L8Yc/MLjo4NQBh263CNRtI="; vendorHash = "sha256-F2QMrLbio7812ZTGQZZPTqHWtIXbwbDmjUhtvv0DJ9s="; - npmDepsHash = "sha256-9GRM0VXrh1eR16ocSGEV/F2eflOflzkhrhRRnm9uB6s="; + npmDepsHash = "sha256-WIPLpi6lQvq9wieqvOACiRh7v1znxzcf+jyKXSjWzNc="; autoUpdate = ./package.nix; }; } From 97406dc5373b654f35b61ae719edf1ecd6385fd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Jun 2026 16:37:26 +0000 Subject: [PATCH 070/252] shogihome: 1.27.3 -> 1.28.0 --- pkgs/by-name/sh/shogihome/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix index df92032feb84..dd1f87a138e4 100644 --- a/pkgs/by-name/sh/shogihome/package.nix +++ b/pkgs/by-name/sh/shogihome/package.nix @@ -4,7 +4,7 @@ buildNpmPackage, fetchFromGitHub, makeWrapper, - electron_40, + electron_42, makeDesktopItem, copyDesktopItems, commandLineArgs ? [ ], @@ -17,20 +17,20 @@ }: let - electron = electron_40; + electron = electron_42; in buildNpmPackage (finalAttrs: { pname = "shogihome"; - version = "1.27.3"; + version = "1.28.0"; src = fetchFromGitHub { owner = "sunfish-shogi"; repo = "shogihome"; tag = "v${finalAttrs.version}"; - hash = "sha256-25Iu/bKUCotJdQESxPPOiYehwn+D3RYnZiJfMWJ4cn0="; + hash = "sha256-icFWpyfdnm0wIkTVa2ijcnBcDmxrutV38vN3/8AY4cg="; }; - npmDepsHash = "sha256-gWI21dPha7yX367r50U3C9wpX5/6oBzHGJNtFmG/GQ8="; + npmDepsHash = "sha256-SSpw8bBbf6saWwR3ZpqMrbrdjDJTCeARBAlHO65O+Zc="; postPatch = '' substituteInPlace package.json \ From 3029930697ba497cc6ec4e96405116be26bf7a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 30 Jun 2026 09:52:10 -0700 Subject: [PATCH 071/252] ark-pixel-font: use buildPythonApplication --- pkgs/by-name/ar/ark-pixel-font/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix index 57222b4739ea..d9d7734f12a6 100644 --- a/pkgs/by-name/ar/ark-pixel-font/package.nix +++ b/pkgs/by-name/ar/ark-pixel-font/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: -python312Packages.buildPythonPackage rec { +python312Packages.buildPythonApplication rec { pname = "ark-pixel-font"; version = "2025.08.24"; pyproject = false; From 589869c02f12d462ef92eafb0b614029475566ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 30 Jun 2026 09:53:39 -0700 Subject: [PATCH 072/252] ark-pixel-font: use default python3 --- pkgs/by-name/ar/ark-pixel-font/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix index d9d7734f12a6..e458a9c6ca95 100644 --- a/pkgs/by-name/ar/ark-pixel-font/package.nix +++ b/pkgs/by-name/ar/ark-pixel-font/package.nix @@ -1,11 +1,11 @@ { lib, - python312Packages, + python3Packages, fetchFromGitHub, nix-update-script, }: -python312Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "ark-pixel-font"; version = "2025.08.24"; pyproject = false; @@ -17,7 +17,7 @@ python312Packages.buildPythonApplication rec { hash = "sha256-kxct994UmZhJBMlXZmayN24eiKqeG9T7GdyfsjBYpn0="; }; - dependencies = with python312Packages; [ + dependencies = with python3Packages; [ pixel-font-builder pixel-font-knife unidata-blocks From 05227335583798f745eadbe76ab932d29867cc43 Mon Sep 17 00:00:00 2001 From: tree-sapii <144389458+tree-sapii@users.noreply.github.com> Date: Tue, 30 Jun 2026 12:28:53 -0400 Subject: [PATCH 073/252] bitwarden-desktop: 2026.6.0 -> 2026.6.1 --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index a53954076a30..305fcc575591 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -26,13 +26,13 @@ let in buildNpmPackage (finalAttrs: { pname = "bitwarden-desktop"; - version = "2026.6.0"; + version = "2026.6.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; tag = "desktop-v${finalAttrs.version}"; - hash = "sha256-JIIis3wW0cU33ovRQfJi3HlB2YdLZ5IPvueq1dGFbas="; + hash = "sha256-ee+C58Y5pZWEmqbRO/w7rdY+e6gy4EL7Sn0S1AxGMXI="; }; patches = [ @@ -74,7 +74,7 @@ buildNpmPackage (finalAttrs: { npmWorkspace = "apps/desktop"; npmDepsFetcherVersion = 3; - npmDepsHash = "sha256-mvFLZwWwIv4PbUwfTWvwZ9JyRoHJSwAA0cT4RXD0/YU="; + npmDepsHash = "sha256-C5GLei/WWetd4qLv7obBJWbQR9LBy+Sqdbjko3/W7VY="; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) From f9f60a4608798c2bf37208562dbdcf2ddfa59e61 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 30 Jun 2026 16:53:01 +0200 Subject: [PATCH 074/252] onlyoffice-documentserver: use icu78 This is needed so that doctrenderer uses the same version of icu as the nodejs.libv8 . This is a little scary because it's a different version of icu than boost is built with, but seems to work out in practice. After #520553 this should ideally be in sync again. Fixes #536824 --- pkgs/by-name/on/onlyoffice-documentserver/x2t.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix index 26d1d20ea9db..09208f3e79a2 100644 --- a/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix +++ b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix @@ -12,7 +12,7 @@ optipng, x265, libde265, - icu, + icu78, jdk, lib, nodejs_22, @@ -30,6 +30,9 @@ }: let + # default at the time of writing is still 76, + # but libv8 from nodejs_22 needs 78 + icu = icu78; openssl' = openssl.override { enableMD2 = true; static = true; @@ -41,8 +44,11 @@ let $BUILDRT/Common/3dParty/icu/icu.pri \ --replace-fail "ICU_MAJOR_VER = 74" "ICU_MAJOR_VER = ${lib.versions.major icu.version}" - mkdir $BUILDRT/Common/3dParty/icu/linux_64 - ln -s ${icu}/lib $BUILDRT/Common/3dParty/icu/linux_64/build + mkdir -p $BUILDRT/Common/3dParty/icu/linux_64/build + ln -s ${icu.dev}/include $BUILDRT/Common/3dParty/icu/linux_64/build/include + for i in ${icu}/lib/* ; do + ln -s $i $BUILDRT/Common/3dParty/icu/linux_64/build/$(basename $i) + done ''; icuQmakeFlags = [ "QMAKE_LFLAGS+=-Wl,--no-undefined" From 19da2a02f17a7443a52177afe562e5e2729b4b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 30 Jun 2026 19:08:25 -0700 Subject: [PATCH 075/252] python3Packages.google-geo-type: 3.31.3 -> 0.7.0 Diff: https://github.com/googleapis/google-cloud-python/compare/google-geo-type-v3.31.3...google-geo-type-v0.7.0 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-geo-type-v0.7.0/packages/google-geo-type/CHANGELOG.md --- .../python-modules/google-geo-type/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/google-geo-type/default.nix b/pkgs/development/python-modules/google-geo-type/default.nix index 59343625e0d4..d7d9b5d5f3e7 100644 --- a/pkgs/development/python-modules/google-geo-type/default.nix +++ b/pkgs/development/python-modules/google-geo-type/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-geo-type"; - version = "3.31.3"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "google-cloud-build-v${version}"; - hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U="; + tag = "google-geo-type-v${version}"; + hash = "sha256-M/7uDWWz4YCfxa4gyM9BaAo10iyTMvtR2MhNpdFYnis="; }; sourceRoot = "${src.name}/packages/google-geo-type"; @@ -45,7 +45,10 @@ buildPythonPackage rec { pytestCheckHook ]; - passthru.updateScript = gitUpdater { rev-prefix = "google-geo-type-v"; }; + passthru = { + skipBulkUpdate = true; # chooses tag for a different project + updateScript = gitUpdater { rev-prefix = "google-geo-type-v"; }; + }; meta = { changelog = "https://github.com/googleapis/google-cloud-python/blob/${src.tag}/packages/google-geo-type/CHANGELOG.md"; From 7ba4dd948a0193975392476db0faf52002d77db5 Mon Sep 17 00:00:00 2001 From: Zain Kergaye Date: Sat, 27 Jun 2026 13:09:16 -0600 Subject: [PATCH 076/252] vimPlugins.neovim-project: init at 0.1 https://github.com/coffebar/neovim-project --- .../applications/editors/vim/plugins/generated.nix | 14 ++++++++++++++ .../applications/editors/vim/plugins/overrides.nix | 7 +++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 22 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3f970303d764..e0d4bf9c60c4 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -11736,6 +11736,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + neovim-project = buildVimPlugin { + pname = "neovim-project"; + version = "0.1"; + src = fetchFromGitHub { + owner = "coffebar"; + repo = "neovim-project"; + tag = "0.1"; + hash = "sha256-OCo4rF+mJ5it1S7UhlzpPpbi6Zxt211c4v6t1IPf1rw="; + }; + meta.homepage = "https://github.com/coffebar/neovim-project/"; + meta.license = getLicenseFromSpdxId "Apache-2.0"; + meta.hydraPlatforms = [ ]; + }; + neovim-sensible = buildVimPlugin { pname = "neovim-sensible"; version = "0-unstable-2017-09-20"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 048136405dff..cf9135882aa8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3012,6 +3012,13 @@ assertNoAdditions { ]; }; + neovim-project = super.neovim-project.overrideAttrs { + dependencies = with self; [ + plenary-nvim + neovim-session-manager + ]; + }; + neovim-sensible = super.neovim-sensible.overrideAttrs (old: { meta = old.meta // { license = lib.licenses.mit; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4f9d4e52d760..d82da3ff21fb 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -836,6 +836,7 @@ https://github.com/marilari88/neotest-vitest/,, https://github.com/lawrence-laz/neotest-zig/,, https://github.com/Shatur/neovim-ayu/,, https://github.com/cloudhead/neovim-fuzzy/,, +https://github.com/coffebar/neovim-project/,, https://github.com/jeffkreeftmeijer/neovim-sensible/,, https://github.com/saxon1964/neovim-tips/,, https://github.com/trunk-io/neovim-trunk/,, From c975ef3d1a02fd6b9dfd5718cec61003d1889dfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jul 2026 03:24:21 +0000 Subject: [PATCH 077/252] zsh-forgit: 26.05.0 -> 26.07.0 --- pkgs/by-name/zs/zsh-forgit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zs/zsh-forgit/package.nix b/pkgs/by-name/zs/zsh-forgit/package.nix index 7fb1ec8e44c1..b6b0ca367435 100644 --- a/pkgs/by-name/zs/zsh-forgit/package.nix +++ b/pkgs/by-name/zs/zsh-forgit/package.nix @@ -16,13 +16,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "zsh-forgit"; - version = "26.05.0"; + version = "26.07.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; tag = finalAttrs.version; - hash = "sha256-EFbzrVgLfVO+dEEQ1vZUcZkIszZFCktYjQjwkBVrHQI="; + hash = "sha256-Ks/kUuQLtzKLjwIDpfkh6pL90aII8Rfh8ijxDmlFvmg="; }; strictDeps = true; From 19daf0e20a86cf6eba9f507a5d53efce86a514ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jul 2026 02:30:35 +0000 Subject: [PATCH 078/252] python3Packages.epaper-dithering: 5.0.6 -> 5.0.7 --- pkgs/development/python-modules/epaper-dithering/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/epaper-dithering/default.nix b/pkgs/development/python-modules/epaper-dithering/default.nix index 7738fce8cfef..efb948c823a1 100644 --- a/pkgs/development/python-modules/epaper-dithering/default.nix +++ b/pkgs/development/python-modules/epaper-dithering/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "epaper-dithering"; - version = "5.0.6"; + version = "5.0.7"; pyproject = true; src = fetchFromGitHub { owner = "OpenDisplay"; repo = "epaper-dithering"; tag = "epaper-dithering-v${finalAttrs.version}"; - hash = "sha256-8xkgKOHS68aQWrJLNwUusZzXK7oAyjDvxd9c5aUDA84="; + hash = "sha256-cAMmjIBqUIhwS4Ak5fXG927pqt5xnBaOEUthv9LQjG8="; }; sourceRoot = "${finalAttrs.src.name}/packages/python"; From 2b2f322e9873a5223ec23c9581606937afa09a61 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Tue, 30 Jun 2026 21:13:57 -0700 Subject: [PATCH 079/252] python3Packages.py-opendisplay: relax epaper-dithering dependency --- pkgs/development/python-modules/py-opendisplay/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/py-opendisplay/default.nix b/pkgs/development/python-modules/py-opendisplay/default.nix index ae19b5d4cf9e..3aa00a1a279d 100644 --- a/pkgs/development/python-modules/py-opendisplay/default.nix +++ b/pkgs/development/python-modules/py-opendisplay/default.nix @@ -36,6 +36,8 @@ buildPythonPackage (finalAttrs: { pillow ]; + pythonRelaxDeps = [ "epaper-dithering" ]; + nativeCheckInputs = [ pytestCheckHook pytest-asyncio From 4e4b610d880524f2489d112754bf2544bed0efa9 Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Sun, 7 Jun 2026 06:28:27 +0100 Subject: [PATCH 080/252] terminusdb: fix baked-in sandbox paths in Prolog saved state --- pkgs/by-name/te/terminusdb/package.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/by-name/te/terminusdb/package.nix b/pkgs/by-name/te/terminusdb/package.nix index 4884cfc2208d..c7b05acd2b40 100644 --- a/pkgs/by-name/te/terminusdb/package.nix +++ b/pkgs/by-name/te/terminusdb/package.nix @@ -100,6 +100,12 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace $cargoDepsCopy/*/tikv-jemalloc-sys-*/build.rs \ --replace-fail 'format!("{orig_makeflags} {makeflags}")' \ 'format!("{makeflags} {orig_makeflags}")' + + # Hardcode terminus_home to a Nix store path that will exist both + # at compile time (via the symlink in preBuild) and at runtime. + substituteInPlace src/load_paths.pl \ + --replace-fail "top_level_directory(TopDir)," \ + "TopDir = '$out/share/terminusdb'," ''; strictDeps = true; @@ -151,6 +157,11 @@ stdenv.mkDerivation (finalAttrs: { preBuild = '' export TERMINUSDB_GIT_HASH=$(cat $src/COMMIT) export TERMINUSDB_JWT_ENABLED=true + + # Point terminus_home at the build directory during compilation + # so the Rust dylib and Prolog sources are findable. + mkdir -p $out/share/terminusdb + ln --symbolic --force --no-target-directory $PWD/src $out/share/terminusdb/src ''; # Required for Prolog initialisation @@ -160,6 +171,10 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall installBin terminusdb installManPage $src/docs/terminusdb.1 + + # Replace with the Nix store source so schema files are findable + # at runtime (the build directory no longer exists). + ln --symbolic --force --no-target-directory $src/src $out/share/terminusdb/src runHook postInstall ''; From 513084bf3b17eaaba8fb25ecca1ddd13406df5c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jul 2026 12:44:54 +0000 Subject: [PATCH 081/252] sysdig-cli-scanner: 1.27.1 -> 1.27.2 --- .../sysdig-cli-scanner.versions.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix index 99d554ff36e0..70a131178040 100644 --- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix +++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix @@ -1,23 +1,23 @@ { - version = "1.27.1"; + version = "1.27.2"; x86_64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.1/linux/amd64/sysdig-cli-scanner"; - hash = "sha256-7YxZgSAhnTn0WfHvybxP16day1AHneX/zoG2Wuquq18="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.2/linux/amd64/sysdig-cli-scanner"; + hash = "sha256-jgT7ux3bb5ZOJFjN+EzEhPMybPZvfqjjIZQORRi32iI="; }; aarch64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.1/linux/arm64/sysdig-cli-scanner"; - hash = "sha256-FNLYmrwn3+EJLVjCzPKRvNPWijQdCjF4RXuIB4Kryqs="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.2/linux/arm64/sysdig-cli-scanner"; + hash = "sha256-j8mbSn6fbzAc8cOsq8FGKtDEJvmc0gqjNXJrpQwyuCc="; }; x86_64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.1/darwin/amd64/sysdig-cli-scanner"; - hash = "sha256-yNkA3BDd/S1Ml/bvosXvMA5zgy9mqL2rMXhotCo5cgE="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.2/darwin/amd64/sysdig-cli-scanner"; + hash = "sha256-J19TcXnR4cnr5Lk8yJ7KuX25xk4YqryXonWXoKFHe60="; }; aarch64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.1/darwin/arm64/sysdig-cli-scanner"; - hash = "sha256-BsoVVd+bMpEU/5KeEGsyU9uE4RF1zxIdsnKorZO7AmA="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.2/darwin/arm64/sysdig-cli-scanner"; + hash = "sha256-WaWfY1QGIz6WxTF+QMk6iJHzM05h03soYadv4Kf/dNg="; }; } From eca91bc4b32f1fd95a4bbffa8b09514d52f3d8dc Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Wed, 1 Jul 2026 13:24:33 +0100 Subject: [PATCH 082/252] terminusdb: 12.0.4 -> 12.0.6 --- pkgs/by-name/te/terminusdb/package.nix | 6 +++--- pkgs/by-name/te/terminusdb/tests.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/te/terminusdb/package.nix b/pkgs/by-name/te/terminusdb/package.nix index c7b05acd2b40..784269b521f8 100644 --- a/pkgs/by-name/te/terminusdb/package.nix +++ b/pkgs/by-name/te/terminusdb/package.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "terminusdb"; - version = "12.0.4"; + version = "12.0.6"; src = fetchFromGitHub { owner = "terminusdb"; repo = "terminusdb"; tag = "v${finalAttrs.version}"; - hash = "sha256-vJifp0U4FrbtI86M8pt022BQWIIeK8jWWFG1Ch1m7IQ="; + hash = "sha256-TxLTPwESQ9pGrm/piWyyTwKlYtVogXRdQjnppvjX8F8="; leaveDotGit = true; postFetch = '' # Will be used for `TERMINUSDB_GIT_HASH` @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src cargoRoot; - hash = "sha256-SvWS18amC4FHuXc/N6e+tomwnVfJ/KlTLIACfl72Nqc="; + hash = "sha256-WymXMJaUKz/IT2gDgQYagin1Sfg1akqCU+mkYUs40Ic="; }; postPatch = '' diff --git a/pkgs/by-name/te/terminusdb/tests.nix b/pkgs/by-name/te/terminusdb/tests.nix index be81bf37d78c..0398fec235ab 100644 --- a/pkgs/by-name/te/terminusdb/tests.nix +++ b/pkgs/by-name/te/terminusdb/tests.nix @@ -19,7 +19,7 @@ buildNpmPackage { sourceRoot = "${terminusdb.src.name}/tests"; - npmDepsHash = "sha256-R2kbwHhlja5mH2AGpyiiVCz3YmSWF9cWptOTdcZb0PM="; + npmDepsHash = "sha256-AkTKdkKTCWExd3U1fkoXoF9znbIGzVGtQl06wfIVOeM="; # Test-only JS adjustments live here so the runtime package stays untouched postPatch = '' From 72fd186ec80e5647688ea4f7430d0753d77dcd12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 1 Jul 2026 17:32:08 +0200 Subject: [PATCH 083/252] libxml2_13: fix CVE-2026-11979 --- pkgs/development/libraries/libxml2/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 015688e4474b..af86f01f877d 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -37,6 +37,13 @@ let # Based on https://gitlab.gnome.org/GNOME/libxml2/-/commit/19549c61590c1873468c53e0026a2fbffae428ef.patch # There are only whitespace differences from upstream. ./2.13-CVE-2026-0989.patch + + (fetchpatch { + name = "CVE-2026-11979.patch"; + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/c2e233fc1b341685fc99621b2768b503f777a72e.patch"; + hash = "sha256-DcPZl6rOuP6aycK+1EHUgPX4YWDAH+ctAZtOI48QO2Q="; + excludes = [ "test/catalogs/test.sh" ]; + }) ]; freezeUpdateScript = true; extraMeta = { From 6709a91894926e4de1240b2e258f1c1c8a009673 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 1 Jul 2026 18:07:48 +0200 Subject: [PATCH 084/252] doc/manual: move language chapter out of build-helpers Packaging is a first class concern and should live as toplevel navigation entry --- doc/build-helpers.md | 1 - doc/manual.md.in | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/build-helpers.md b/doc/build-helpers.md index f11deafdc24d..8b38a79ceff4 100644 --- a/doc/build-helpers.md +++ b/doc/build-helpers.md @@ -25,6 +25,5 @@ build-helpers/dev-shell-tools.chapter.md build-helpers/special.md build-helpers/images.md hooks/index.md -languages-frameworks/index.md packages/index.md ``` diff --git a/doc/manual.md.in b/doc/manual.md.in index 8d75d0fe459e..dbfa6591dbc1 100644 --- a/doc/manual.md.in +++ b/doc/manual.md.in @@ -17,6 +17,10 @@ contributing.md interoperability.md ``` +```{=include=} chapters +languages-frameworks/index.md +``` + ```{=include=} appendix html:into-file=//release-notes.html release-notes/release-notes.md ``` From 545e6f896ca2f8c772be6a57ae8f22b51693b169 Mon Sep 17 00:00:00 2001 From: Gerhard Schwanzer Date: Wed, 1 Jul 2026 20:11:53 +0200 Subject: [PATCH 085/252] pyroscope: 1.20.3 -> 2.1.0 https://github.com/grafana/pyroscope/releases/tag/v2.1.0 Assisted-by: pi coding agent / Mika (OpenAI GPT-5.5) --- pkgs/by-name/py/pyroscope/package.nix | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/py/pyroscope/package.nix b/pkgs/by-name/py/pyroscope/package.nix index 674e9ec87649..fab0564bc098 100644 --- a/pkgs/by-name/py/pyroscope/package.nix +++ b/pkgs/by-name/py/pyroscope/package.nix @@ -1,25 +1,23 @@ { - stdenv, buildGoModule, lib, fetchFromGitHub, versionCheckHook, - installShellFiles, nix-update-script, }: buildGoModule (finalAttrs: { pname = "pyroscope"; - version = "1.20.3"; + version = "2.1.0"; src = fetchFromGitHub { owner = "grafana"; repo = "pyroscope"; rev = "v${finalAttrs.version}"; - hash = "sha256-IZA6xaZgjcS/3QBsz2L12QEBeCzRFAv+Qpag+O4aOVI="; + hash = "sha256-7bY3qmN05m/OxFyDxdwlxsvYrwzhdbkX0XhGqOzCZSA="; }; - vendorHash = "sha256-hy/MM/VOy182MM+Fd+PDVivHwduG2zkBUOWqOnFtWRI="; + vendorHash = "sha256-UGWfrnpTgzR09T5jDL24d/Bs8+HBWi4g1YzZyy7ULWY="; proxyVendor = true; subPackages = [ @@ -28,10 +26,10 @@ buildGoModule (finalAttrs: { ]; ldflags = [ - "-X=github.com/grafana/pyroscope/pkg/util/build.Branch=${finalAttrs.src.rev}" - "-X=github.com/grafana/pyroscope/pkg/util/build.Version=${finalAttrs.version}" - "-X=github.com/grafana/pyroscope/pkg/util/build.Revision=${finalAttrs.src.rev}" - "-X=github.com/grafana/pyroscope/pkg/util/build.BuildDate=1970-01-01T00:00:00Z" + "-X=github.com/grafana/pyroscope/v2/pkg/util/build.Branch=${finalAttrs.src.rev}" + "-X=github.com/grafana/pyroscope/v2/pkg/util/build.Version=${finalAttrs.version}" + "-X=github.com/grafana/pyroscope/v2/pkg/util/build.Revision=${finalAttrs.src.rev}" + "-X=github.com/grafana/pyroscope/v2/pkg/util/build.BuildDate=1970-01-01T00:00:00Z" ]; # We're overriding the version in 'ldFlags', so we should check that the @@ -40,14 +38,6 @@ buildGoModule (finalAttrs: { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; - nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd pyroscope \ - --bash <($out/bin/pyroscope completion bash) \ - --fish <($out/bin/pyroscope completion fish) \ - --zsh <($out/bin/pyroscope completion zsh) - ''; - passthru.updateScript = nix-update-script { }; meta = { From 0a35e687d74a79bda24043b9fdd2e873a6d34891 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jul 2026 19:06:04 +0000 Subject: [PATCH 086/252] selinuxPackages.semodule-utils: 3.10 -> 3.11 --- pkgs/by-name/se/semodule-utils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/semodule-utils/package.nix b/pkgs/by-name/se/semodule-utils/package.nix index e8364954b4d1..ad0eb8f40db8 100644 --- a/pkgs/by-name/se/semodule-utils/package.nix +++ b/pkgs/by-name/se/semodule-utils/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "semodule-utils"; - version = "3.10"; + version = "3.11"; inherit (libsepol) se_url; src = fetchurl { url = "${finalAttrs.se_url}/${finalAttrs.version}/semodule-utils-${finalAttrs.version}.tar.gz"; - hash = "sha256-HC8UzAmMu011kS0THF90fnAkbhBC5y8qtA4o9Tz0XBA="; + hash = "sha256-DFdOFUE/9+1mDEXgEb7+JIu4nqonPbb1brKX1h3rLtY="; }; buildInputs = [ libsepol ]; From 22b74d95da33e0b2f927939fa3c9f196e6cbf703 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jul 2026 19:06:15 +0000 Subject: [PATCH 087/252] selinux-sandbox: 3.10 -> 3.11 --- pkgs/by-name/se/selinux-sandbox/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/selinux-sandbox/package.nix b/pkgs/by-name/se/selinux-sandbox/package.nix index 060fb77ad612..72dd5ea60172 100644 --- a/pkgs/by-name/se/selinux-sandbox/package.nix +++ b/pkgs/by-name/se/selinux-sandbox/package.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "selinux-sandbox"; - version = "3.10"; + version = "3.11"; inherit (policycoreutils) se_url; src = fetchurl { url = "${finalAttrs.se_url}/${finalAttrs.version}/selinux-sandbox-${finalAttrs.version}.tar.gz"; - hash = "sha256-4r0T4YT3IYFVoz6pQygdAvRBwpcQQBW+69/G2Npv9cM="; + hash = "sha256-MnxiXev62tCi1Ek6PP7ZhS9GA5AhQrLLWHV1Z/LeOt8="; }; nativeBuildInputs = [ From 3914ca2b7c3eb556e0965a9e5df7fb9ffa3b8903 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Wed, 1 Jul 2026 22:31:58 +0300 Subject: [PATCH 088/252] lens: 2024.11.261604 -> 2026.6.260931 Also switch the pinned hashes to sha512 SRI, sourced directly from the upstream electron-builder update manifests (latest-linux.yml / latest-mac.yml). Assisted-by: claude-code with claude-opus-4-8[1m]-high --- pkgs/by-name/le/lens/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/le/lens/package.nix b/pkgs/by-name/le/lens/package.nix index 6cbe93baffc1..40658c839cbe 100644 --- a/pkgs/by-name/le/lens/package.nix +++ b/pkgs/by-name/le/lens/package.nix @@ -8,20 +8,20 @@ let pname = "lens-desktop"; - version = "2024.11.261604"; + version = "2026.6.260931"; sources = { x86_64-linux = { url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.x86_64.AppImage"; - hash = "sha256-AbuEU5gOckVU+eDIFnomc7ryLq68ihuk3c0XosoJp74="; + hash = "sha512-P9PrtbGKaHNlzZsm10ovkYCBBfQpVWBgcVsYLETMwINP2bzrIIK5HVbkbcTEUsxK90L7MQmFwpAssojW0b9G5Q=="; }; x86_64-darwin = { url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.dmg"; - hash = "sha256-MQQRGTCe+LEHXJi6zjnpENbtlWNP+XVH9rWXRMk+26w="; + hash = "sha512-I/i9s7O3jT+eNqqUu6B+rB+YbegKhAsZwHlc3mp2wNWW9YDilQbzKrhF9Fq2dSz2WKVZUscBtSGtXCuiPcFXzw=="; }; aarch64-darwin = { url = "https://api.k8slens.dev/binaries/Lens-${version}-latest-arm64.dmg"; - hash = "sha256-aakJCLnQBAnUdrrniTcahS+q3/kP09mlaPTV8FW5afI="; + hash = "sha512-eCE3w7NlYrHiexCirH2wFN0nOO3qAt5acbldXbDMVIrG94tbgM8Y5ZO8/YIUN45XbotYtKW8/Nw+WsrTp6DPBg=="; }; }; From 9306bd0932bfabb948442b02de24967ae5629249 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 2 Jul 2026 01:05:50 +0530 Subject: [PATCH 089/252] nixos/ollama: rename services.ollama.models to modelsDir It was ambigious with loadModels --- nixos/modules/services/misc/ollama.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix index bc1693f1902e..3ce42646a64d 100644 --- a/nixos/modules/services/misc/ollama.nix +++ b/nixos/modules/services/misc/ollama.nix @@ -37,6 +37,18 @@ in "ollama" "acceleration" ] "Set `services.ollama.package` to one of `pkgs.ollama[,-vulkan,-rocm,-cuda,-cpu]` instead.") + (lib.mkRenamedOptionModule + [ + "services" + "ollama" + "models" + ] + [ + "services" + "ollama" + "modelsDir" + ] + ) ]; options = { @@ -91,7 +103,7 @@ in The home directory that the ollama service is started in. ''; }; - models = lib.mkOption { + modelsDir = lib.mkOption { type = types.str; default = "${cfg.home}/models"; defaultText = "\${config.services.ollama.home}/models"; @@ -207,7 +219,7 @@ in cfg.environmentVariables // { HOME = cfg.home; - OLLAMA_MODELS = cfg.models; + OLLAMA_MODELS = cfg.modelsDir; OLLAMA_HOST = "${cfg.host}:${toString cfg.port}"; } // lib.optionalAttrs (cfg.rocmOverrideGfx != null) { @@ -226,7 +238,7 @@ in StateDirectory = [ "ollama" ]; ReadWritePaths = [ cfg.home - cfg.models + cfg.modelsDir ]; CapabilityBoundingSet = [ "" ]; From 265f057e0476bd245a7f54c75242e37b806b83b4 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Wed, 1 Jul 2026 22:40:56 +0300 Subject: [PATCH 090/252] lens: add update script Drives version bumps off upstream's electron-builder auto-update manifests (latest-linux.yml / latest-mac.yml), which carry the version and the base64 sha512 digests for every artifact. Because the digests double as valid Nix SRI hashes, all three platforms are updated without downloading the (~250 MiB) images: update-source-version is called per --system with the hash passed explicitly. Assisted-by: claude-code with claude-opus-4-8[1m]-high --- pkgs/by-name/le/lens/darwin.nix | 3 +++ pkgs/by-name/le/lens/linux.nix | 3 +++ pkgs/by-name/le/lens/package.nix | 4 ++++ pkgs/by-name/le/lens/update.sh | 37 ++++++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+) create mode 100755 pkgs/by-name/le/lens/update.sh diff --git a/pkgs/by-name/le/lens/darwin.nix b/pkgs/by-name/le/lens/darwin.nix index 3acc21000c51..81d520d5fbd1 100644 --- a/pkgs/by-name/le/lens/darwin.nix +++ b/pkgs/by-name/le/lens/darwin.nix @@ -4,6 +4,7 @@ version, src, meta, + updateScript, undmg, }: @@ -29,4 +30,6 @@ stdenv.mkDerivation { ''; dontFixup = true; + + passthru = { inherit updateScript; }; } diff --git a/pkgs/by-name/le/lens/linux.nix b/pkgs/by-name/le/lens/linux.nix index e101ab53556c..81ed42f60958 100644 --- a/pkgs/by-name/le/lens/linux.nix +++ b/pkgs/by-name/le/lens/linux.nix @@ -3,6 +3,7 @@ version, src, meta, + updateScript, appimageTools, makeWrapper, }: @@ -21,6 +22,8 @@ appimageTools.wrapType2 { meta ; + passthru = { inherit updateScript; }; + nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = '' diff --git a/pkgs/by-name/le/lens/package.nix b/pkgs/by-name/le/lens/package.nix index 40658c839cbe..0decf480c2ad 100644 --- a/pkgs/by-name/le/lens/package.nix +++ b/pkgs/by-name/le/lens/package.nix @@ -41,6 +41,8 @@ let platforms = builtins.attrNames sources; }; + updateScript = ./update.sh; + in if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { @@ -49,6 +51,7 @@ if stdenv.hostPlatform.isDarwin then version src meta + updateScript ; } else @@ -58,5 +61,6 @@ else version src meta + updateScript ; } diff --git a/pkgs/by-name/le/lens/update.sh b/pkgs/by-name/le/lens/update.sh new file mode 100755 index 000000000000..12174d9799fc --- /dev/null +++ b/pkgs/by-name/le/lens/update.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts curl yq-go jq + +set -euo pipefail + +base="https://api.k8slens.dev/binaries" + +# Lens is built with electron-builder, which publishes an auto-update manifest +# next to each binary. These manifests carry both the latest version and the +# base64 sha512 digest of every artifact, so we can bump all platforms without +# downloading the (~250 MiB) images ourselves. +linux_manifest=$(curl -sfL "$base/latest-linux.yml" | yq -o=json) +mac_manifest=$(curl -sfL "$base/latest-mac.yml" | yq -o=json) + +# The manifest reports e.g. "2026.6.260931-latest"; the "-latest" suffix only +# lives in the download URL, so drop it from the Nix version. +version=$(jq -r '.version' <<<"$linux_manifest") +version=${version%-latest} + +# electron-builder records base64-encoded sha512 digests, which are already +# valid Nix SRI hashes once prefixed with "sha512-". Match artifacts by filename +# suffix (endswith) rather than a regex to keep jq's string escaping out of play. +manifest_hash() { + echo "sha512-$(jq -r --arg suffix "$1" '.files[] | select(.url | endswith($suffix)) | .sha512' <<<"$2" | head -n1)" +} + +appimage_hash=$(manifest_hash '.x86_64.AppImage' "$linux_manifest") +dmg_hash=$(manifest_hash '-latest.dmg' "$mac_manifest") +arm64_dmg_hash=$(manifest_hash '-arm64.dmg' "$mac_manifest") + +# The three platforms share one version but have distinct hashes. --system picks +# which source (and therefore which hash) update-source-version rewrites; passing +# the hash explicitly avoids a download. The version is written on the first call, +# so the darwin calls need --ignore-same-version to not early-exit as "unchanged". +update-source-version lens "$version" "$appimage_hash" --system=x86_64-linux +update-source-version lens "$version" "$dmg_hash" --system=x86_64-darwin --ignore-same-version +update-source-version lens "$version" "$arm64_dmg_hash" --system=aarch64-darwin --ignore-same-version From 95efce09c3512e6cb4c579cd515d3acac793fa82 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Wed, 1 Jul 2026 22:41:37 +0300 Subject: [PATCH 091/252] lens: add qweered as maintainer Assisted-by: claude-code with claude-opus-4-8[1m]-high --- pkgs/by-name/le/lens/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/le/lens/package.nix b/pkgs/by-name/le/lens/package.nix index 0decf480c2ad..dd955dbe67de 100644 --- a/pkgs/by-name/le/lens/package.nix +++ b/pkgs/by-name/le/lens/package.nix @@ -35,6 +35,7 @@ let license = lib.licenses.lens; maintainers = with lib.maintainers; [ dbirks + qweered RossComputerGuy starkca90 ]; From 13a2636935baf2cd7e4d3d40e26087f88cb0989e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jul 2026 20:14:21 +0000 Subject: [PATCH 092/252] libsemanage: 3.10 -> 3.11 --- pkgs/by-name/li/libsemanage/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libsemanage/package.nix b/pkgs/by-name/li/libsemanage/package.nix index c0423d7ef3e5..d37f651c1a29 100644 --- a/pkgs/by-name/li/libsemanage/package.nix +++ b/pkgs/by-name/li/libsemanage/package.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsemanage"; - version = "3.10"; + version = "3.11"; inherit (libsepol) se_url; src = fetchurl { url = "${finalAttrs.se_url}/${finalAttrs.version}/libsemanage-${finalAttrs.version}.tar.gz"; - hash = "sha256-GXiJTEFHaa13Q40miG6q4/t7t0V47ypa0xMMictcsf4="; + hash = "sha256-52FgKGu/sIIWAsbAwyIOvPNmrTJG07nQoPvvzTXoYEM="; }; outputs = [ From e07a1255a85d2b8eb757aa96005caca8ee8dd5ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jul 2026 01:25:59 +0200 Subject: [PATCH 093/252] cyberstrike: init at 1.1.14 AI-powered offensive security agent https://github.com/CyberStrikeus/CyberStrike --- pkgs/by-name/cy/cyberstrike/package.nix | 178 ++++++++++++++++++++++++ 1 file changed, 178 insertions(+) create mode 100644 pkgs/by-name/cy/cyberstrike/package.nix diff --git a/pkgs/by-name/cy/cyberstrike/package.nix b/pkgs/by-name/cy/cyberstrike/package.nix new file mode 100644 index 000000000000..8ce2972eb26e --- /dev/null +++ b/pkgs/by-name/cy/cyberstrike/package.nix @@ -0,0 +1,178 @@ +{ + lib, + bun, + fetchFromGitHub, + installShellFiles, + makeBinaryWrapper, + models-dev, + nix-update-script, + nodejs, + ripgrep, + stdenvNoCC, + sysctl, + versionCheckHook, + writableTmpDirAsHomeHook, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "cyberstrike"; + version = "1.1.14"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "CyberStrikeus"; + repo = "CyberStrike"; + tag = "v${finalAttrs.version}"; + hash = "sha256-MlFEGP/MiuDtLl7Ms6j11u1MdLV6w8T/7TYo7eeE/rc="; + }; + + node_modules = stdenvNoCC.mkDerivation { + pname = "${finalAttrs.pname}-node_modules"; + inherit (finalAttrs) version src; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" + "SOCKS_SERVER" + ]; + + nativeBuildInputs = [ + bun + writableTmpDirAsHomeHook + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + export BUN_INSTALL_CACHE_DIR=$(mktemp -d) + bun install \ + --cpu="${if stdenvNoCC.hostPlatform.isAarch64 then "arm64" else "x64"}" \ + --os="${if stdenvNoCC.hostPlatform.isLinux then "linux" else "darwin"}" \ + --filter '!./' \ + --filter './packages/cyberstrike' \ + --frozen-lockfile \ + --ignore-scripts \ + --no-progress + + bun --bun ./nix/scripts/canonicalize-node-modules.ts + bun --bun ./nix/scripts/normalize-bun-binaries.ts + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + find . -type d -name node_modules -exec cp -R --parents {} $out \; + + runHook postInstall + ''; + + # Required so fixed-output derivation does not retain store references + dontFixup = true; + + outputHash = "sha256-IxIdzd9MJJRpc0nB5eEASSW0LIckU+SvcUgkKoL+mog="; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }; + + nativeBuildInputs = [ + bun + installShellFiles + makeBinaryWrapper + writableTmpDirAsHomeHook + ]; + + configurePhase = '' + runHook preConfigure + + cp -R ${finalAttrs.node_modules}/. . + patchShebangs node_modules + patchShebangs packages/*/node_modules + + runHook postConfigure + ''; + + env = { + MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json"; + CYBERSTRIKE_DISABLE_MODELS_FETCH = true; + CYBERSTRIKE_VERSION = finalAttrs.version; + CYBERSTRIKE_CHANNEL = "local"; + }; + + buildPhase = '' + runHook preBuild + + cd ./packages/cyberstrike + bun --bun ./script/build.ts --single --skip-install + bun --bun ./script/schema.ts schema.json + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 dist/cyberstrike-*/bin/cyberstrike $out/bin/cyberstrike + install -Dm644 schema.json $out/share/cyberstrike/schema.json + + wrapProgram $out/bin/cyberstrike \ + --prefix PATH : ${ + lib.makeBinPath ( + [ + ripgrep + nodejs + ] + ++ lib.optional stdenvNoCC.hostPlatform.isDarwin sysctl + ) + } + + runHook postInstall + ''; + + postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + installShellCompletion --cmd cyberstrike \ + --bash <($out/bin/cyberstrike completion) \ + --zsh <(SHELL=/bin/zsh $out/bin/cyberstrike completion) + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + + doInstallCheck = true; + + versionCheckKeepEnvironment = [ + "HOME" + "CYBERSTRIKE_DISABLE_MODELS_FETCH" + ]; + + versionCheckProgramArg = "--version"; + + passthru = { + jsonschema = { + config = "${placeholder "out"}/share/cyberstrike/schema.json"; + tui = "${placeholder "out"}/share/cyberstrike/tui.json"; + }; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "node_modules" + ]; + }; + }; + + meta = { + description = "AI-powered offensive security agent"; + homepage = "https://github.com/CyberStrikeus/CyberStrike"; + changelog = "https://github.com/CyberStrikeus/CyberStrike/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "cyberstrike"; + }; +}) From 40b0a76c94309deaee333e84d0aa00e22776ab0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jul 2026 20:54:12 +0200 Subject: [PATCH 094/252] tmux: 3.7 -> 3.7b Diff: https://github.com/tmux/tmux/compare/3.7...3.7b Changelog: https://github.com/tmux/tmux/raw/3.7a/CHANGES Changelog: https://github.com/tmux/tmux/raw/3.7b/CHANGES --- pkgs/by-name/tm/tmux/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tm/tmux/package.nix b/pkgs/by-name/tm/tmux/package.nix index 9f479fa366aa..babc774b187c 100644 --- a/pkgs/by-name/tm/tmux/package.nix +++ b/pkgs/by-name/tm/tmux/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "tmux"; - version = "3.7"; + version = "3.7b"; outputs = [ "out" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "tmux"; repo = "tmux"; tag = finalAttrs.version; - hash = "sha256-dgqI1jZjnluN/F/AjngzcaMy3TgudmkvDT336YlhGZM="; + hash = "sha256-CTq06XP997M0ODxQihTq34dI9H6jSRLUXLYuTWOwDpc="; }; nativeBuildInputs = [ From ede57125e7b774b47b6f98855a5c150a4b87b67f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jul 2026 23:37:37 +0000 Subject: [PATCH 095/252] oxfmt: 0.53.0 -> 0.57.0 --- pkgs/by-name/ox/oxfmt/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ox/oxfmt/package.nix b/pkgs/by-name/ox/oxfmt/package.nix index 6d268e0117dd..f6fa9d35c54c 100644 --- a/pkgs/by-name/ox/oxfmt/package.nix +++ b/pkgs/by-name/ox/oxfmt/package.nix @@ -21,25 +21,25 @@ # A pure Rust build would lack the Prettier plugin functionality. stdenv.mkDerivation (finalAttrs: { pname = "oxfmt"; - version = "0.53.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "oxc"; tag = "oxfmt_v${finalAttrs.version}"; - hash = "sha256-/AXBMb+EEpA10omlpxG1jkCqMrhbB8AdEewyQrMJqTk="; + hash = "sha256-jwEuBM45CM7KB2Z0NouwtLWQZUx6dWhZxkPUXMmO5eY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-JHTbbVzXWyigk8NGqvBjVKUuR2p6+gpFRY1GWZEvEFk="; + hash = "sha256-4D3yTwqzUb4ALTfJwVmGfBIFJ6/5VfeU7edEHpc8d5k="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-mYwkBQZ3ik3yGoPXc3BtLFhavmkj+QzZNMnYG3qyzyc="; + hash = "sha256-QvR4zi9m1V1dvoH82dSsxs4dW6nDCC8IkyTnvsX9IRI="; }; nativeBuildInputs = [ From 288e0e17385046bad27cdb68b15ae2f1e6fa6f04 Mon Sep 17 00:00:00 2001 From: Fabian Haas <29468630+hfxbse@users.noreply.github.com> Date: Fri, 12 Jun 2026 18:40:44 +0200 Subject: [PATCH 096/252] papra: 26.4.0 -> 26.5.0 --- nixos/modules/services/web-apps/papra.nix | 4 +-- pkgs/by-name/pa/papra/package.nix | 30 ++++++++++++----------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/web-apps/papra.nix b/nixos/modules/services/web-apps/papra.nix index 8ee55736f1eb..a9a4d2b66ccb 100644 --- a/nixos/modules/services/web-apps/papra.nix +++ b/nixos/modules/services/web-apps/papra.nix @@ -80,8 +80,8 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { Restart = "on-failure"; - ExecStartPre = "${lib.getExe pkgs.tsx} ${cfg.package}/lib/src/scripts/migrate-up.script.ts"; - ExecStart = "${cfg.package}/bin/papra"; + ExecStartPre = "${lib.getExe' cfg.package "papra-migrate-up"}"; + ExecStart = "${lib.getExe' cfg.package "papra"}"; User = cfg.user; Group = cfg.group; StateDirectory = "papra"; diff --git a/pkgs/by-name/pa/papra/package.nix b/pkgs/by-name/pa/papra/package.nix index a533cf5bf351..0f963947cb9f 100644 --- a/pkgs/by-name/pa/papra/package.nix +++ b/pkgs/by-name/pa/papra/package.nix @@ -1,10 +1,11 @@ { makeBinaryWrapper, - nodejs, + nodejs_26, + nodejs-slim_26, node-gyp, fetchPnpmDeps, fetchFromGitHub, - pnpm_10, + pnpm_11, pnpmConfigHook, stdenv, lib, @@ -12,26 +13,29 @@ pkg-config, python3, nix-update-script, + tsx, }: let - pnpm = pnpm_10; + pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_26; }; + nodejs = nodejs_26; + tsx' = tsx.override { nodejs-slim_24 = nodejs-slim_26; }; in stdenv.mkDerivation (finalAttrs: { pname = "papra"; - version = "26.4.0"; + version = "26.5.0"; src = fetchFromGitHub { owner = "papra-hq"; repo = "papra"; tag = "@papra/app@${finalAttrs.version}"; - hash = "sha256-wQdDBS+QRarZhEIRmLQ4VRtq73I5YFIN2P3ZtAZWvxw="; + hash = "sha256-BOeApLfB1NR07izBM3ChHqzgGx3xf1NkAXqKVeMzqx4="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm; - fetcherVersion = 3; - hash = "sha256-8k8hzpyOQuHAPF+zzIhW+5vo6lHSyZeKAY+tYIf6jKU="; + fetcherVersion = 4; + hash = "sha256-J1syB5X+sI40iPlqDVABqeWDiBjKGP3qQRIh5w3GRUU="; pnpmWorkspaces = [ "@papra/app-client..." "@papra/app-server..." @@ -64,12 +68,6 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - pnpm config set inject-workspace-packages true - - pushd node_modules/sharp - pnpm run install - popd - pnpm --filter "@papra/app-client..." run build pnpm --filter "@papra/app-server..." run build @@ -81,7 +79,8 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/{bin,lib} - pnpm deploy --filter=@papra/app-server --prod $out/lib/ + pnpm config set --location=project injectWorkspacePackages true + pnpm deploy --ignore-script --filter=@papra/app-server --prod $out/lib/ mkdir -p $out/lib/public cp -r apps/papra-client/dist/* $out/lib/public/ @@ -90,6 +89,9 @@ stdenv.mkDerivation (finalAttrs: { --add-flags "$out/lib/dist/index.js" \ --set "NODE_PATH" $out/lib/node_modules + makeWrapper "${lib.getExe tsx'}" $out/bin/papra-migrate-up \ + --add-flags "$out/lib/src/scripts/migrate-up.script.ts" + runHook postInstall ''; From 5fd4aa12e09f7eaf75ec6a9cdc997f9403647989 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jul 2026 00:39:04 +0000 Subject: [PATCH 097/252] checkpolicy: 3.10 -> 3.11 --- pkgs/by-name/ch/checkpolicy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/checkpolicy/package.nix b/pkgs/by-name/ch/checkpolicy/package.nix index b2d6a59daedf..9422f0807d29 100644 --- a/pkgs/by-name/ch/checkpolicy/package.nix +++ b/pkgs/by-name/ch/checkpolicy/package.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "checkpolicy"; - version = "3.10"; + version = "3.11"; inherit (libsepol) se_url; src = fetchurl { url = "${finalAttrs.se_url}/${finalAttrs.version}/checkpolicy-${finalAttrs.version}.tar.gz"; - hash = "sha256-LZKVHfywkNYXnnojhWYi4Py8Mr4Dvx5grOncnL2hHlk="; + hash = "sha256-m4G/zu9/qdAvmHLlanhvND3FjvS1cT3ODVxBbluEzvo="; }; nativeBuildInputs = [ From 0a0a3772ca5f9b97ceee75d20f50f15b0b58d534 Mon Sep 17 00:00:00 2001 From: Andrew Dutka Date: Thu, 2 Jul 2026 01:26:20 -0300 Subject: [PATCH 098/252] rojo: 7.6.1 -> 7.7.0 --- pkgs/by-name/ro/rojo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index 6641cd8af4ef..cd7fde4df78b 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rojo"; - version = "7.6.1"; + version = "7.7.0"; src = fetchFromGitHub { owner = "rojo-rbx"; repo = "rojo"; tag = "v${finalAttrs.version}"; - hash = "sha256-h8gd91Nc35jTQ4u9YyQGOB+rkgRAos8lsjX+bWzvpDs="; + hash = "sha256-2atNAiv51MNpxXdwvKSvtO1CGvQUOdUUOZszjAm3zi8="; fetchSubmodules = true; }; - cargoHash = "sha256-zl1L8q1AJwVn0o2BazJ30FyBCMq5F5nAQ0FGuEAPGms="; + cargoHash = "sha256-1xTvW3Ra6erYpjxgfp2m8qVMz6u99WCDv2VE/Xh2mFc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From 46f01634b5b59bc74b3376ae09bc825f60d1068a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Jul 2026 10:47:55 +0200 Subject: [PATCH 099/252] user-scanner: init at 1.4.1 Email & Username OSINT suite https://github.com/kaifcodec/user-scanner --- pkgs/by-name/us/user-scanner/package.nix | 49 ++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/us/user-scanner/package.nix diff --git a/pkgs/by-name/us/user-scanner/package.nix b/pkgs/by-name/us/user-scanner/package.nix new file mode 100644 index 000000000000..c29183fae954 --- /dev/null +++ b/pkgs/by-name/us/user-scanner/package.nix @@ -0,0 +1,49 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + python3Packages, + versionCheckHook, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "user-scanner"; + version = "1.4.1"; + pyproject = true; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "kaifcodec"; + repo = "user-scanner"; + tag = "v${finalAttrs.version}"; + hash = "sha256-SDi13KGqWXgNXdgF5KOpqEcjwbuNv4PU5ahB5UdsbWQ="; + }; + + build-system = with python3Packages; [ flit-core ]; + + dependencies = with python3Packages; [ + colorama + httpx + socksio + ]; + + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + + pythonImportsCheck = [ "user_scanner" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Email & Username OSINT suite"; + homepage = "https://github.com/kaifcodec/user-scanner"; + changelog = "https://github.com/kaifcodec/user-scanner/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "user-scanner"; + }; +}) From 5f7c34bb8547ad1582ea8f02fe3e33bb84df0702 Mon Sep 17 00:00:00 2001 From: Sanfer Date: Sun, 19 Apr 2026 19:51:29 +0530 Subject: [PATCH 100/252] nordvpn: init at 5.2.0 --- pkgs/by-name/no/nordvpn/cli.nix | 151 ++ pkgs/by-name/no/nordvpn/gui.nix | 48 + pkgs/by-name/no/nordvpn/linux-cmake.patch | 23 + pkgs/by-name/no/nordvpn/package.nix | 66 + pkgs/by-name/no/nordvpn/pubspec.lock.json | 1516 +++++++++++++++++++++ 5 files changed, 1804 insertions(+) create mode 100644 pkgs/by-name/no/nordvpn/cli.nix create mode 100644 pkgs/by-name/no/nordvpn/gui.nix create mode 100644 pkgs/by-name/no/nordvpn/linux-cmake.patch create mode 100644 pkgs/by-name/no/nordvpn/package.nix create mode 100644 pkgs/by-name/no/nordvpn/pubspec.lock.json diff --git a/pkgs/by-name/no/nordvpn/cli.nix b/pkgs/by-name/no/nordvpn/cli.nix new file mode 100644 index 000000000000..5fe73da6cd9d --- /dev/null +++ b/pkgs/by-name/no/nordvpn/cli.nix @@ -0,0 +1,151 @@ +{ + desktopItemArgs, + meta, + src, + version, + + buildGoModule, + copyDesktopItems, + e2fsprogs, + fetchFromGitHub, + iproute2, + lib, + libxslt, + makeDesktopItem, + makeWrapper, + nftables, + openvpn, + procps, + systemdMinimal, + wireguard-tools, +}: +let + patchedOpenvpn = openvpn.overrideAttrs (old: { + # Apply XOR obfuscation patches to disguise OpenVPN traffic, + # enabling connectivity on networks that block VPN protocols via DPI. + patches = + let + tunnelblickSrc = fetchFromGitHub { + owner = "Tunnelblick"; + repo = "Tunnelblick"; + # https://github.com/NordSecurity/nordvpn-linux/blob/4.6.0/ci/openvpn/env.sh#L11 + tag = "v6.0beta09"; + hash = "sha256-uLYrBgwX3HkEV06snlIYLsgfhD5lNDVR21D56ygoStY="; + }; + + pathDir = "third_party/sources/openvpn/openvpn-2.6.12/patches"; + in + (old.patches or [ ]) + ++ (map (fname: "${tunnelblickSrc}/${pathDir}/${fname}") [ + "02-tunnelblick-openvpn_xorpatch-a.diff" + "03-tunnelblick-openvpn_xorpatch-b.diff" + "04-tunnelblick-openvpn_xorpatch-c.diff" + "05-tunnelblick-openvpn_xorpatch-d.diff" + "06-tunnelblick-openvpn_xorpatch-e.diff" + ]); + }); + +in +buildGoModule (finalAttrs: { + inherit src version; + + pname = "nordvpn-cli"; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; + + vendorHash = "sha256-I81sn+tHTny9bX5eNGQLPQtoabbaNZINMjYotCXt88A="; + + preBuild = '' + # redirect AppDataPathStatic (/usr/lib/nordvpn) to $out/bin so that + # NorduserdBinaryPath resolves to $out/bin/norduserd. + substituteInPlace internal/constants.go \ + --replace-fail "/usr/lib/nordvpn" "$out/bin" + + # hardcode the openvpn path to the patched one + old_ovpn_path='filepath.Join(internal.AppDataPathStatic, "openvpn")' + new_ovpn_path='"${patchedOpenvpn}/bin/openvpn"' + substituteInPlace daemon/vpn/openvpn/config.go \ + --replace-fail "$old_ovpn_path" "$new_ovpn_path" + ''; + + ldflags = [ + "-X main.Environment=prod" + "-X main.Version=${finalAttrs.version}" + ]; + + subPackages = [ + "cmd/cli" + "cmd/daemon" + "cmd/norduser" + ]; + + checkPhase = '' + runHook preCheck + + go test ./cli + # skip tests that require network access + go test ./daemon -skip \ + 'TestTransports|TestH1Transport_RoundTrip|Test.*FileList_RealURL' + go test ./norduser + + runHook postCheck + ''; + + postInstall = '' + # rename to standard names + BIN_DIR=$out/bin + mv $BIN_DIR/cli $BIN_DIR/nordvpn + mv $BIN_DIR/daemon $BIN_DIR/nordvpnd + mv $BIN_DIR/norduser $BIN_DIR/norduserd + + # nordvpn needs icons for the system tray and notifications + ICONS_PATH=$out/share/icons/hicolor/scalable/apps + install -d $ICONS_PATH + install --mode=0444 assets/icon.svg $ICONS_PATH/nordvpn.svg + for file in assets/tray-*.svg; do + install --mode=0444 "$file" "$ICONS_PATH/nordvpn-$(basename $file)" + done + ''; + + postFixup = '' + wrapProgram $out/bin/nordvpnd --prefix PATH : ${ + lib.makeBinPath [ + e2fsprogs + iproute2 + libxslt # xsltproc: used to populate OpenVPN configuration files from templates + nftables + patchedOpenvpn + procps + systemdMinimal + wireguard-tools + ] + } + ''; + + desktopItems = [ + (makeDesktopItem ( + desktopItemArgs + // { + comment = "Handles NordVPN OAuth browser login callbacks."; + desktopName = "NordVPN CLI"; + exec = "nordvpn click %u"; + mimeTypes = [ "x-scheme-handler/nordvpn" ]; + name = "nordvpn"; + noDisplay = true; + terminal = true; + } + )) + ]; + + meta = meta // { + description = "NordVPN command-line client and daemon"; + longDescription = '' + Contains the nordvpn client and nordvpnd daemon. + Even if you intend to use the GUI only, you'd need this package. + ''; + mainProgram = "nordvpn"; + }; +}) diff --git a/pkgs/by-name/no/nordvpn/gui.nix b/pkgs/by-name/no/nordvpn/gui.nix new file mode 100644 index 000000000000..780597ebb79f --- /dev/null +++ b/pkgs/by-name/no/nordvpn/gui.nix @@ -0,0 +1,48 @@ +{ + desktopItemArgs, + meta, + src, + version, + + copyDesktopItems, + flutter, + lib, + makeDesktopItem, + libx11, +}: +flutter.buildFlutterApplication { + pname = "nordvpn-gui"; + inherit src version; + + sourceRoot = "${src.name}/gui"; + + buildInputs = [ + libx11 + ]; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + # finds X11 using pkg-config + patches = [ ./linux-cmake.patch ]; + + desktopItems = [ + (makeDesktopItem ( + desktopItemArgs + // { + comment = "NordVPN's GUI to manage vpn connection, settings, etc."; + desktopName = "NordVPN GUI"; + exec = "nordvpn-gui"; + name = "nordvpn-gui"; + } + )) + ]; + + meta = meta // { + description = "NordVPN graphical interface"; + mainProgram = "nordvpn-gui"; + }; +} diff --git a/pkgs/by-name/no/nordvpn/linux-cmake.patch b/pkgs/by-name/no/nordvpn/linux-cmake.patch new file mode 100644 index 000000000000..be2d8fd53850 --- /dev/null +++ b/pkgs/by-name/no/nordvpn/linux-cmake.patch @@ -0,0 +1,23 @@ +--- a/linux/CMakeLists.txt ++++ b/linux/CMakeLists.txt +@@ -51,10 +51,10 @@ + # System-level dependencies. + find_package(PkgConfig REQUIRED) + pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) ++pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11) + + add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + # Fix for: https://github.com/NordSecurity/nordvpn-linux/issues/1136 +-find_package(X11 REQUIRED) + + # Define the application target. To change its name, change BINARY_NAME above, + # not the value here, or `flutter run` will no longer work. +@@ -73,7 +73,7 @@ + # Add dependency libraries. Add any application-specific dependencies here. + target_link_libraries(${BINARY_NAME} PRIVATE flutter) + target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) +-target_link_libraries(${BINARY_NAME} PRIVATE X11::X11) ++target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::X11) + + # Run the Flutter tool portions of the build. This must not be removed. + add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/pkgs/by-name/no/nordvpn/package.nix b/pkgs/by-name/no/nordvpn/package.nix new file mode 100644 index 000000000000..6cce9835c4db --- /dev/null +++ b/pkgs/by-name/no/nordvpn/package.nix @@ -0,0 +1,66 @@ +{ + callPackage, + fetchFromGitHub, + lib, + nix-update-script, + symlinkJoin, +}: +let + version = "5.2.0"; + + common = { + inherit version; + + src = fetchFromGitHub { + owner = "NordSecurity"; + repo = "nordvpn-linux"; + tag = version; + hash = "sha256-F7iw856HVLbOz97j9sMkVwyZl0ZDwID1Tf0YwtdvZsU="; + }; + + # rec so that changelog can reference homepage + meta = rec { + homepage = "https://github.com/NordSecurity/nordvpn-linux"; + changelog = "${homepage}/releases/tag/${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ different-error ]; + platforms = lib.platforms.linux; + }; + + desktopItemArgs = { + categories = [ "Network" ]; + genericName = "VPN Client"; + icon = "nordvpn"; + type = "Application"; + }; + }; +in +symlinkJoin { + pname = "nordvpn"; + inherit version; + + strictDeps = true; + __structuredAttrs = true; + + paths = [ + (callPackage ./cli.nix common) + (callPackage ./gui.nix common) + ]; + + passthru = { + cli = callPackage ./cli.nix common; + gui = callPackage ./gui.nix common; + updateScript = nix-update-script { }; + }; + + meta = common.meta // { + description = "NordVPN client and GUI for Linux"; + longDescription = '' + NordVPN CLI and GUI applications for Linux. + This package currently does not support meshnet. + Additionally, if `networking.firewall.enable = true;`, + then also set `networking.firewall.checkReversePath = "loose";`. + The closed-source nordwhisper protocol is also not supported. + ''; + }; +} diff --git a/pkgs/by-name/no/nordvpn/pubspec.lock.json b/pkgs/by-name/no/nordvpn/pubspec.lock.json new file mode 100644 index 000000000000..e84354e37490 --- /dev/null +++ b/pkgs/by-name/no/nordvpn/pubspec.lock.json @@ -0,0 +1,1516 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "85.0.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "f4ad0fea5f102201015c9aae9d93bc02f75dd9491529a8c21f88d17a8523d44c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.6.0" + }, + "analyzer_plugin": { + "dependency": "transitive", + "description": { + "name": "analyzer_plugin", + "sha256": "a5ab7590c27b779f3d4de67f31c4109dbe13dd7339f86461a6f2a8ab2594d8ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.4" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.1.2" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.12.4" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "ci": { + "dependency": "transitive", + "description": { + "name": "ci", + "sha256": "145d095ce05cddac4d797a158bc4cf3b6016d1fe63d8c3d2fbd7212590adca13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "clock": { + "dependency": "direct main", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.11.1" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "csv": { + "dependency": "transitive", + "description": { + "name": "csv", + "sha256": "c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "custom_lint": { + "dependency": "direct dev", + "description": { + "name": "custom_lint", + "sha256": "9656925637516c5cf0f5da018b33df94025af2088fe09c8ae2ca54c53f2d9a84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.6" + }, + "custom_lint_builder": { + "dependency": "transitive", + "description": { + "name": "custom_lint_builder", + "sha256": "6cdc8e87e51baaaba9c43e283ed8d28e59a0c4732279df62f66f7b5984655414", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.6" + }, + "custom_lint_core": { + "dependency": "transitive", + "description": { + "name": "custom_lint_core", + "sha256": "31110af3dde9d29fb10828ca33f1dce24d2798477b167675543ce3d208dee8be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.5" + }, + "custom_lint_visitor": { + "dependency": "transitive", + "description": { + "name": "custom_lint_visitor", + "sha256": "4a86a0d8415a91fbb8298d6ef03e9034dc8e323a599ddc4120a0e36c433983a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0+7.7.0" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "fake_async": { + "dependency": "direct dev", + "description": { + "name": "fake_async", + "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.3" + }, + "faker": { + "dependency": "direct main", + "description": { + "name": "faker", + "sha256": "544c34e9e1d322824156d5a8d451bc1bb778263b892aded24ec7ba77b0706624", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "fixnum": { + "dependency": "direct main", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_driver": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "flutter_localizations": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_riverpod": { + "dependency": "direct main", + "description": { + "name": "flutter_riverpod", + "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "flutter_svg": { + "dependency": "direct main", + "description": { + "name": "flutter_svg", + "sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "freezed": { + "dependency": "direct dev", + "description": { + "name": "freezed", + "sha256": "2d399f823b8849663744d2a9ddcce01c49268fb4170d0442a655bf6a2f47be22", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "freezed_annotation": { + "dependency": "direct main", + "description": { + "name": "freezed_annotation", + "sha256": "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "fuchsia_remote_debug_protocol": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "get_it": { + "dependency": "direct main", + "description": { + "name": "get_it", + "sha256": "568d62f0e68666fb5d95519743b3c24a34c7f19d834b0658c46e26d778461f66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.2.1" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "go_router": { + "dependency": "direct main", + "description": { + "name": "go_router", + "sha256": "7974313e217a7771557add6ff2238acb63f635317c35fa590d348fb238f00896", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "17.1.0" + }, + "google_identity_services_web": { + "dependency": "transitive", + "description": { + "name": "google_identity_services_web", + "sha256": "5d187c46dc59e02646e10fe82665fc3884a9b71bc1c90c2b8b749316d33ee454", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.3+1" + }, + "googleapis_auth": { + "dependency": "transitive", + "description": { + "name": "googleapis_auth", + "sha256": "b81fe352cc4a330b3710d2b7ad258d9bcef6f909bb759b306bf42973a7d046db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "grpc": { + "dependency": "direct main", + "description": { + "name": "grpc", + "sha256": "807a4da90fc1ba94dccc3a44653d3ff7bcf26818f030259d6a8f9fab405cb880", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.1" + }, + "hotreloader": { + "dependency": "transitive", + "description": { + "name": "hotreloader", + "sha256": "bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "http2": { + "dependency": "transitive", + "description": { + "name": "http2", + "sha256": "382d3aefc5bd6dc68c6b892d7664f29b5beb3251611ae946a98d35158a82bbfa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "integration_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.20.2" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.11.0" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.0.2" + }, + "leak_tracker_flutter_testing": { + "dependency": "direct dev", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.10" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "logger": { + "dependency": "direct main", + "description": { + "name": "logger", + "sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.2" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.17" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.17.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.0.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "path_parsing": { + "dependency": "transitive", + "description": { + "name": "path_parsing", + "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.2" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "direct dev", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.2" + }, + "posix": { + "dependency": "direct main", + "description": { + "name": "posix", + "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "process": { + "dependency": "transitive", + "description": { + "name": "process", + "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.5" + }, + "protobuf": { + "dependency": "direct main", + "description": { + "name": "protobuf", + "sha256": "2fcc8a202ca7ec17dab7c97d6b6d91cf03aa07fe6f65f8afbb6dfa52cc5bd902", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.0" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "riverpod": { + "dependency": "direct main", + "description": { + "name": "riverpod", + "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "riverpod_analyzer_utils": { + "dependency": "transitive", + "description": { + "name": "riverpod_analyzer_utils", + "sha256": "03a17170088c63aab6c54c44456f5ab78876a1ddb6032ffde1662ddab4959611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.10" + }, + "riverpod_annotation": { + "dependency": "direct main", + "description": { + "name": "riverpod_annotation", + "sha256": "e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "riverpod_generator": { + "dependency": "direct dev", + "description": { + "name": "riverpod_generator", + "sha256": "44a0992d54473eb199ede00e2260bd3c262a86560e3c6f6374503d86d0580e36", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.5" + }, + "riverpod_lint": { + "dependency": "direct dev", + "description": { + "name": "riverpod_lint", + "sha256": "89a52b7334210dbff8605c3edf26cfe69b15062beed5cbfeff2c3812c33c9e35", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.5" + }, + "rxdart": { + "dependency": "transitive", + "description": { + "name": "rxdart", + "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.28.0" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_linux": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_linux", + "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_macos": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_macos", + "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_platform_interface", + "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_windows": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_windows", + "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "searchable_listview": { + "dependency": "direct main", + "description": { + "name": "searchable_listview", + "sha256": "902c0038a10e11aa4cc9305dc9e7ec339fad6e5a23c484283f784b67ae6cf7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.19.4" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "cbc40be9be1c5af4dab4d6e0de4d5d3729e6f3d65b89d21e1815d57705644a6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.20" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.6" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "direct dev", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.3" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "slang": { + "dependency": "direct main", + "description": { + "name": "slang", + "sha256": "81e277dc5e2305f53412b92afeb803620453259afe147d5cd6417700f998a7a6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.12.1" + }, + "slang_flutter": { + "dependency": "direct main", + "description": { + "name": "slang_flutter", + "sha256": "0f0276c400660c8b67150005aa4df57643b86ce6ae9c824abee8e25f345d9abc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.12.1" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.7" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.2" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "state_notifier": { + "dependency": "transitive", + "description": { + "name": "state_notifier", + "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "sync_http": { + "dependency": "transitive", + "description": { + "name": "sync_http", + "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.7" + }, + "theme_tailor": { + "dependency": "direct dev", + "description": { + "name": "theme_tailor", + "sha256": "ba98be1d04856deef932757a3ca8fa7a5e2a6f96c30466a59c48924eeb608b97", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "theme_tailor_annotation": { + "dependency": "direct main", + "description": { + "name": "theme_tailor_annotation", + "sha256": "6219cff1c1c31f28d853e7b443e508b9b81e09581ea7d9403998b1d31356ff3b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.28" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.4.1" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.5" + }, + "url_launcher_platform_interface": { + "dependency": "direct dev", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "uuid": { + "dependency": "transitive", + "description": { + "name": "uuid", + "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.3" + }, + "vector_graphics": { + "dependency": "transitive", + "description": { + "name": "vector_graphics", + "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.19" + }, + "vector_graphics_codec": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_codec", + "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.13" + }, + "vector_graphics_compiler": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_compiler", + "sha256": "5a88dd14c0954a5398af544651c7fb51b457a2a556949bfb25369b210ef73a74", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "15.0.2" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webdriver": { + "dependency": "transitive", + "description": { + "name": "webdriver", + "sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.15.0" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.6.1" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + } + }, + "sdks": { + "dart": ">=3.10.0 <3.10.1", + "flutter": ">=3.38.0" + } +} From e5713cbb3dec1b0af2ff2423cc00cf7060be3b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 2 Jul 2026 11:15:33 +0200 Subject: [PATCH 101/252] sdlpop: fix --replace substitutions - the first one seems OK, converted to a non-deprecated variant - the second one didn't match (anymore) --- pkgs/by-name/sd/sdlpop/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/sdlpop/package.nix b/pkgs/by-name/sd/sdlpop/package.nix index 070405981d03..0283038015d6 100644 --- a/pkgs/by-name/sd/sdlpop/package.nix +++ b/pkgs/by-name/sd/sdlpop/package.nix @@ -39,8 +39,7 @@ stdenv.mkDerivation (finalAttrs: { preBuild = '' substituteInPlace src/Makefile \ - --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \ - --replace "CFLAGS += -I/opt/local/include" "CFLAGS += -I${lib.getInclude SDL2}/include/SDL2 -I${SDL2_image}/include/SDL2" + --replace-fail "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" ''; # The prince binary expects two things of the working directory it is called from: From 6bae154eb9c87a8f8daa4d953a7ba597a6b201a6 Mon Sep 17 00:00:00 2001 From: faukah Date: Thu, 2 Jul 2026 10:32:00 +0200 Subject: [PATCH 102/252] handy: 0.8.3 -> 0.9.0 --- pkgs/by-name/ha/handy/package.nix | 36 +++++++++++++++++++------------ 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ha/handy/package.nix b/pkgs/by-name/ha/handy/package.nix index 0bd8e67d767c..ef31f307cae7 100644 --- a/pkgs/by-name/ha/handy/package.nix +++ b/pkgs/by-name/ha/handy/package.nix @@ -28,6 +28,7 @@ gtk-layer-shell, vulkan-loader, vulkan-headers, + spirv-headers, shaderc, gst_all_1, glib-networking, @@ -54,7 +55,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "handy"; - version = "0.8.3"; + version = "0.9.0"; __structuredAttrs = true; @@ -62,11 +63,11 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "cjpais"; repo = "Handy"; tag = "v${finalAttrs.version}"; - hash = "sha256-sCCtp6UAxmCAcYeOM9+RW2czATh4Geqf1H8wXNMniYc="; + hash = "sha256-jRzy8nsLtlNrYXb4LWP5SK6XpIy2pguNcZno3m6Mkqw="; }; cargoRoot = "src-tauri"; - cargoHash = "sha256-mvOThNqfE24iMkVBM2zYexJkQxpMMgE4PPNXKy39hSg="; + cargoHash = "sha256-Ag02t6KwKvgO1kKsQ4RAw9X+rWYNhDyav2N6i4o7ifQ="; nativeInstallInputs = [ jq ]; @@ -109,6 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 shaderc + spirv-headers ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper @@ -154,12 +156,19 @@ rustPlatform.buildRustPackage (finalAttrs: { SWIFTC = lib.getExe' swift "swiftc"; # Explicit so the Handy build system can avoid xcrun }; - preBuild = '' - cp -R ${finalAttrs.passthru.frontendDeps}/node_modules . - chmod -R u+w node_modules - patchShebangs node_modules - bun run build - ''; + preBuild = + lib.optionalString stdenv.hostPlatform.isLinux '' + # Linux enables transcribe-cpp's ggml Vulkan backend, whose CMake build + # needs SPIRV-Headers' package config and headers. + export CMAKE_PREFIX_PATH="${spirv-headers}''${CMAKE_PREFIX_PATH:+:''${CMAKE_PREFIX_PATH}}" + export NIX_CFLAGS_COMPILE="-isystem ${spirv-headers}/include ''${NIX_CFLAGS_COMPILE:-}" + '' + + '' + cp -R ${finalAttrs.passthru.frontendDeps}/node_modules . + chmod -R u+w node_modules + patchShebangs node_modules + bun run build + ''; # If removed, the binary is produced, but not the app bundle for any platform. installPhase = '' @@ -208,8 +217,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # The hook and deps fetcher in https://github.com/NixOS/nixpkgs/pull/376299 should simplify this dramatically. frontendDeps = stdenv.mkDerivation { pname = "handy-frontend-deps"; - version = "0.8.3"; - inherit (finalAttrs) src; + inherit (finalAttrs) src version; nativeBuildInputs = [ bun @@ -238,9 +246,9 @@ rustPlatform.buildRustPackage (finalAttrs: { outputHash = { - "x86_64-linux" = "sha256-tJ6LK99dELOiR0BcsTRTt/vLyNamntujLxhBy5Xl/lc="; - "aarch64-linux" = "sha256-S+dX6ZVgv9dexxIHoa5PxP7e0nxf/d7cKUGty5eEi8A="; - "aarch64-darwin" = "sha256-DQbogNBQ9izK5GPmoOudqiB2lJvct1vZI2U5lp3WFy8="; + "x86_64-linux" = "sha256-1jZBFvX9Ch3jNGPgSnOE8yNCXlHru7tcMJZ5uNZtE1g="; + "aarch64-linux" = "sha256-MsY2tOdBg11OMyQLRkLoVKxyrcqa0yVddfcYuIVWSxw="; + "aarch64-darwin" = "sha256-Fw0va7mq0F36qa15bDFVL01Q5pEprWhza78CzurLoLg="; } .${stdenv.hostPlatform.system}; From 8c37e11a0bbb8569f77791ec7188f79777be06db Mon Sep 17 00:00:00 2001 From: faukah Date: Thu, 2 Jul 2026 10:33:34 +0200 Subject: [PATCH 103/252] handy: add faukah to maintainers --- pkgs/by-name/ha/handy/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ha/handy/package.nix b/pkgs/by-name/ha/handy/package.nix index ef31f307cae7..edb67c0a0dbe 100644 --- a/pkgs/by-name/ha/handy/package.nix +++ b/pkgs/by-name/ha/handy/package.nix @@ -276,7 +276,10 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://github.com/cjpais/Handy/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; mainProgram = "handy"; - maintainers = with lib.maintainers; [ philocalyst ]; + maintainers = with lib.maintainers; [ + faukah + philocalyst + ]; platforms = with lib.platforms; linux ++ darwin; badPlatforms = [ "x86_64-darwin" ]; # We weren't able to get hashes here }; From 95fba3f6f165e63e1de6b7366aa256fa7ae3bb2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Thu, 2 Jul 2026 13:45:46 +0200 Subject: [PATCH 104/252] temporal: install elasticsearch-tool --- pkgs/by-name/te/temporal/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/te/temporal/package.nix b/pkgs/by-name/te/temporal/package.nix index 13f51d2a3278..5f7be6862021 100644 --- a/pkgs/by-name/te/temporal/package.nix +++ b/pkgs/by-name/te/temporal/package.nix @@ -49,6 +49,7 @@ buildGoModule (finalAttrs: { install -Dm755 "$GOPATH/bin/server" -T $out/bin/temporal-server install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra-tool + install -Dm755 "$GOPATH/bin/elasticsearch" -T $out/bin/temporal-elasticsearch-tool install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql-tool install -Dm755 "$GOPATH/bin/tdbg" -T $out/bin/tdbg From 0cf9e0b7308ac23cfb63adbe4497644901d0d348 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jul 2026 12:31:55 +0000 Subject: [PATCH 105/252] python3Packages.netbox-documents: 0.8.2 -> 0.8.4 --- .../ne/netbox_4_5/plugins/netbox-documents/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix index 393cf1ab3b6e..3ecc5ebc286e 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix @@ -10,7 +10,7 @@ buildPythonPackage (finalAttrs: { pname = "netbox-documents"; - version = "0.8.2"; + version = "0.8.4"; pyproject = true; __structuredAttrs = true; @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { owner = "jasonyates"; repo = "netbox-documents"; tag = "v${finalAttrs.version}"; - hash = "sha256-XFVfNLU9a/0tQAVTrN2B1Oia/isOD8G5BdA3fVUn2sM="; + hash = "sha256-6t7r/98UILL73JT1TwUBAqygQOtOWj1s1bY7IbRcUKQ="; }; build-system = [ setuptools ]; From 18a4e9b8c16ae04abb36144e99d4398fa66a5d6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jul 2026 13:20:43 +0000 Subject: [PATCH 106/252] python3Packages.pysail: 0.6.4 -> 0.6.5 --- pkgs/development/python-modules/pysail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pysail/default.nix b/pkgs/development/python-modules/pysail/default.nix index 624c066ca517..9fabfa299b10 100644 --- a/pkgs/development/python-modules/pysail/default.nix +++ b/pkgs/development/python-modules/pysail/default.nix @@ -13,19 +13,19 @@ buildPythonPackage (finalAttrs: { pname = "pysail"; - version = "0.6.4"; + version = "0.6.5"; pyproject = true; src = fetchFromGitHub { owner = "lakehq"; repo = "sail"; tag = "v${finalAttrs.version}"; - hash = "sha256-EX8cDed32uF7NSreViKBn7RQeWIG7C7sI6O0c+hVf4M="; + hash = "sha256-pCxlGCOLxupgxCtRfUSLbA88dFIWvO16fgibLmydNBQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname src version; - hash = "sha256-ouNXKPpwKTLfI+Gcp393r7oHZAjUFQL9225+AuFzdoo="; + hash = "sha256-V3FS28H+lGORTFYWaMNeLdz0s+Bv4bo3By5VlIOWiOc="; }; # The `generate-import-lib` PyO3 feature only matters when building Windows From 7c6a7b2defd22b1471065665890960870a429210 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jul 2026 13:38:06 +0000 Subject: [PATCH 107/252] okteto: 3.20.0 -> 3.21.0 --- pkgs/by-name/ok/okteto/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index 613b60dc1801..870e2bbabf6a 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "okteto"; - version = "3.20.0"; + version = "3.21.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; tag = finalAttrs.version; - hash = "sha256-s733L3Jhaz780fEa+mQnnokUXXwvUPDCZq3fWEUBaT0="; + hash = "sha256-EPtAOczXzBbt+lZFC+K0svh4hh/H3myduIoTs7nrjRw="; }; - vendorHash = "sha256-/qZEO/oXEmr4VsrKZMiaJ/LOyFG7rQ8j3aUdqSspfCg="; + vendorHash = "sha256-+4QYxAe45jlbC2b06ZkJuSYjGX1v1CCJM1XNHx8rIFM="; postPatch = '' # Disable some tests that need file system & network access. From ad97f5573d6621d4861bfdcfbd433ca08e86a188 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Thu, 2 Jul 2026 15:41:55 +0200 Subject: [PATCH 108/252] pkgs/nixos-render-docs: replace inlince tocs with collapsible sidebar tables of contents disconnect headings from body text. decouples heading levels from include type (part,chapter,part etc.) structure of the sidebar is derived from the include type for now. Can be changed to a meta file later. sidebar now uses proper ol-, li-, span-, a-tags definition tables are not ideal for navigation and accessibility breaking change: --toc-depth, --chunk-toc-depth, --section-toc-depth is now collapsed into --sidebar-depth --- doc/doc-support/package.nix | 3 +- doc/languages-frameworks/beam.section.md | 4 +- doc/style.css | 37 ++-- nixos/doc/manual/default.nix | 3 +- .../src/nixos_render_docs/html.py | 20 +-- .../src/nixos_render_docs/manual.py | 164 +++++++----------- .../src/tests/test_auto_id_prefix.py | 6 +- .../src/tests/test_manual.py | 116 +++++++++++++ .../src/tests/test_redirects.py | 2 +- 9 files changed, 210 insertions(+), 145 deletions(-) create mode 100644 pkgs/by-name/ni/nixos-render-docs/src/tests/test_manual.py diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index 3cc6daa32863..466beb204425 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -116,8 +116,7 @@ stdenvNoCC.mkDerivation ( --script ./highlightjs/loader.js \ --script ./anchor.min.js \ --script ./anchor-use.js \ - --toc-depth 1 \ - --section-toc-depth 1 \ + --sidebar-depth 3 \ manual.md \ out/index.html diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 70ad1591be01..db4edaad4a4b 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -125,7 +125,7 @@ There are 2 ways to package backend dependencies: either per-dependency mix2nix When writing an elixir project targeting `mixRelease`, you can also consider using [deps_nix](https://github.com/code-supply/deps_nix) with `mixNixDeps`. `deps_nix` supports git dependencies, but is intended to be added to the project's `mix.exs` directly. -###### mix2nix {#mix2nix} +##### mix2nix {#mix2nix} `mix2nix` is a cli tool available in Nixpkgs. It will generate a Nix expression from a `mix.lock` file. It is quite standard in the 2nix tool series. @@ -175,7 +175,7 @@ If there are git dependencies. You will need to run the build process once to fix the hash to correspond to your new git src. -###### FOD {#fixed-output-derivation} +##### FOD {#fixed-output-derivation} A fixed output derivation will download mix dependencies from the internet. To ensure reproducibility, a hash will be supplied. Note that mix is relatively reproducible. An FOD generating a different hash on each run hasn't been observed (as opposed to npm where the chances are relatively high). See [akkoma](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/ak/akkoma/package.nix) for a usage example of FOD. diff --git a/doc/style.css b/doc/style.css index c3c58e88637d..90517caf4948 100644 --- a/doc/style.css +++ b/doc/style.css @@ -387,15 +387,6 @@ div.appendix dt { margin-top: 1em; } -div.book .toc dt, -div.appendix .toc dt { - margin-top: 0; -} - -.list-of-examples dt { - margin-top: 0; -} - div.book code, div.appendix code { padding: 0; @@ -408,17 +399,6 @@ div.appendix code { hyphens: none; } -div.book div.toc, -div.appendix div.toc { - margin-bottom: 3em; - border-bottom: 0.0625rem solid #d8d8d8; -} - -div.book div.toc dd, -div.appendix div.toc dd { - margin-left: 2em; -} - div.book span.command, div.appendix span.command { font-family: monospace; @@ -515,12 +495,23 @@ nav.toc-sidebar .toc { margin-bottom: 0; } -nav.toc-sidebar .toc dl { +nav.toc-sidebar ol.toc, +nav.toc-sidebar ol.toc ol { + list-style: none; + margin: 0; + padding-left: 0; +} + +nav.toc-sidebar ol.toc ol { + padding-left: 1em; +} + +nav.toc-sidebar li { margin: 0; } -nav.toc-sidebar .toc dd { - margin-left: 1em; +nav.toc-sidebar summary { + cursor: pointer; } @media screen and (min-width: 768px) { diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index c8afe6167a7d..cf5c28358097 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -201,8 +201,7 @@ rec { --script ./highlightjs/loader.js \ --script ./anchor.min.js \ --script ./anchor-use.js \ - --toc-depth 1 \ - --chunk-toc-depth 1 \ + --sidebar-depth 2 \ ./manual.md \ $dst/${common.indexPath} diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py index 3e4ff1aedb7a..5944431d4680 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py @@ -1,12 +1,13 @@ from collections.abc import Mapping, Sequence -from typing import cast, Optional, NamedTuple - from html import escape +from typing import NamedTuple, Optional, cast + from markdown_it.token import Token from .manual_structure import XrefTarget from .md import Renderer + class UnresolvedXrefError(Exception): pass @@ -17,9 +18,6 @@ class Heading(NamedTuple): # special handling for part content: whether partinfo div was already closed from # elsewhere or still needs closing. partintro_closed: bool - # tocs are generated when the heading opens, but have to be emitted into the file - # after the heading titlepage (and maybe partinfo) has been closed. - toc_fragment: str _bullet_list_styles = [ 'disc', 'circle', 'square' ] _ordered_list_styles = [ '1', 'a', 'i', 'A', 'I' ] @@ -29,7 +27,6 @@ class HTMLRenderer(Renderer): _headings: list[Heading] _attrspans: list[str] - _hlevel_offset: int = 0 _bullet_list_nesting: int = 0 _ordered_list_nesting: int = 0 @@ -185,8 +182,7 @@ class HTMLRenderer(Renderer): anchor = f'id="{escape(anchor, True)}"' result = self._close_headings(hlevel) tag = self._heading_tag(token, tokens, i) - toc_fragment = self._build_toc(tokens, i) - self._headings.append(Heading(tag, hlevel, htag, tag != 'part', toc_fragment)) + self._headings.append(Heading(tag, hlevel, htag, tag != 'part')) return ( f'{result}' f'
' @@ -205,8 +201,6 @@ class HTMLRenderer(Renderer): ) if heading.container_tag == 'part': result += '
' - else: - result += heading.toc_fragment return result def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: extra = 'compact' if token.meta.get('compact', False) else '' @@ -329,14 +323,14 @@ class HTMLRenderer(Renderer): ) def _make_hN(self, level: int) -> tuple[str, str]: - return f"h{min(6, max(1, level + self._hlevel_offset))}", "" + return f"h{min(6, max(1, level))}", "" def _maybe_close_partintro(self) -> str: if self._headings: heading = self._headings[-1] if heading.container_tag == 'part' and not heading.partintro_closed: self._headings[-1] = heading._replace(partintro_closed=True) - return heading.toc_fragment + "
" + return "
" return "" def _close_headings(self, level: Optional[int]) -> str: @@ -349,5 +343,3 @@ class HTMLRenderer(Renderer): def _heading_tag(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "section" - def _build_toc(self, tokens: Sequence[Token], i: int) -> str: - return "" diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py index 9208148c594b..902b365d8b5f 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py @@ -4,21 +4,29 @@ import html import json import re import xml.sax.saxutils as xml - from abc import abstractmethod from collections.abc import Mapping, Sequence from pathlib import Path -from typing import Any, Callable, cast, ClassVar, Generic, get_args, NamedTuple +from typing import Any, Callable, ClassVar, Generic, NamedTuple, cast, get_args from markdown_it.token import Token from . import md, options from .html import HTMLRenderer, UnresolvedXrefError -from .manual_structure import check_structure, FragmentType, is_include, make_xml_id, TocEntry, TocEntryType, XrefTarget +from .manual_structure import ( + FragmentType, + TocEntry, + TocEntryType, + XrefTarget, + check_structure, + is_include, + make_xml_id, +) from .md import Converter, Renderer from .redirects import Redirects from .src_error import SrcError + class BaseConverter(Converter[md.TR], Generic[md.TR]): # per-converter configuration for ns:arg=value arguments to include blocks, following # the include type. html converters need something like this to support chunking, or @@ -253,12 +261,8 @@ class HTMLParameters(NamedTuple): generator: str stylesheets: Sequence[str] scripts: Sequence[str] - # number of levels in the rendered table of contents. tables are prepended to - # the content they apply to (entire document / document chunk / top-level section - # of a chapter), setting a depth of 0 omits the respective table. - toc_depth: int - chunk_toc_depth: int - section_toc_depth: int + # structural depth of the navigation sidebar tree + sidebar_depth: int media_dir: Path class ManualHTMLRenderer(RendererMixin, HTMLRenderer): @@ -289,14 +293,13 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer): target_path.write_bytes(content) return f"./{self._html_params.media_dir}/{target_name}" - def _push(self, tag: str, hlevel_offset: int) -> Any: - result = (self._toplevel_tag, self._headings, self._attrspans, self._hlevel_offset, self._in_dir) - self._hlevel_offset += hlevel_offset + def _push(self, tag: str) -> Any: + result = (self._toplevel_tag, self._headings, self._attrspans, self._in_dir) self._toplevel_tag, self._headings, self._attrspans = tag, [], [] return result def _pop(self, state: Any) -> None: - (self._toplevel_tag, self._headings, self._attrspans, self._hlevel_offset, self._in_dir) = state + (self._toplevel_tag, self._headings, self._attrspans, self._in_dir) = state def _render_book(self, tokens: Sequence[Token]) -> str: assert tokens[4].children @@ -307,7 +310,7 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer): toc = TocEntry.of(tokens[0]) return "\n".join([ - self._file_header(toc, sidebar=self._build_toc(tokens, 0)), + self._file_header(toc, sidebar=self._build_sidebar(toc)), '
', '
', '
', @@ -434,103 +437,60 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer): if token.tag == 'h1': return self._toplevel_tag return super()._heading_tag(token, tokens, i) - def _build_toc(self, tokens: Sequence[Token], i: int) -> str: - toc = TocEntry.of(tokens[i]) - if toc.kind == 'section' and self._html_params.section_toc_depth < 1: - return "" - def walk_and_emit(toc: TocEntry, depth: int) -> list[str]: - if depth <= 0: - return [] - result = [] - for child in toc.children: - result.append( - f'
' - f' ' - f' {child.target.toc_html}' - f' ' - f'
' - ) - # we want to look straight through parts because docbook-xsl did too, but it - # also makes for more uesful top-level tocs. - next_level = walk_and_emit(child, depth - (0 if child.kind == 'part' else 1)) - if next_level: - result.append(f'
{"".join(next_level)}
') - return result + def _build_sidebar(self, toc: TocEntry) -> str: + root = toc.root + def render_entries(entries: Sequence[TocEntry], budget: int) -> str: + items: list[str] = [] + for e in entries: + # 'part' are structural containers we look straight through, so + # they do not consume a depth level + child_budget = budget if e.kind == 'part' else budget - 1 + children = (render_entries(e.children, child_budget) + if e.children and child_budget > 0 else "") + link = f'{e.target.toc_html}' + cls = html.escape(e.kind, True) + if children: + items.append( + f'
  • ' + f'
    {link}{children}
    ' + '
    • ' + ) + else: + items.append(f'
  • {link}
    • ') + return f'
      {"".join(items)}
    ' if items else "" def build_list(kind: str, id: str, lst: Sequence[TocEntry]) -> str: if not lst: return "" - entries = [ - f'
    {i}. {e.target.toc_html}
    ' - for i, e in enumerate(lst, start=1) - ] + entries = "".join( + f'
  • {e.target.toc_html}
    • ' + for e in lst + ) return ( f'
    ' f'

    List of {kind}

    ' - f'
    {"".join(entries)}
    ' + f'
      {entries}
    ' '
    ' ) - # we don't want to generate the "Title of Contents" header for sections, - # docbook didn't and it's only distracting clutter unless it's the main table. - # we also want to generate tocs only for a top-level section (ie, one that is - # not itself contained in another section) - print_title = toc.kind != 'section' - if toc.kind == 'section': - if toc.parent and toc.parent.kind == 'section': - toc_depth = 0 - else: - toc_depth = self._html_params.section_toc_depth - elif toc.starts_new_chunk and toc.kind != 'book': - toc_depth = self._html_params.chunk_toc_depth - else: - toc_depth = self._html_params.toc_depth - if not (items := walk_and_emit(toc, toc_depth)): - return "" - figures = build_list("Figures", "list-of-figures", toc.figures) - examples = build_list("Examples", "list-of-examples", toc.examples) - return "".join([ - f'
    ', - '

    Table of Contents

    ' if print_title else "", - f'
    ' - f' {"".join(items)}' - f'
    ' - f'
    ' - f'{figures}' - f'{examples}' - ]) + nav = render_entries(root.children, self._html_params.sidebar_depth) + figures = build_list("Figures", "list-of-figures", root.figures) + examples = build_list("Examples", "list-of-examples", root.examples) + return f'{nav}{figures}{examples}' def _make_hN(self, level: int) -> tuple[str, str]: - # for some reason chapters didn't increase the hN nesting count in docbook xslts. - # originally this was duplicated here for consistency with docbook rendering, but - # it could be reevaluated and changed now that docbook is gone. - if self._toplevel_tag == 'chapter': - level -= 1 - # this style setting is also for docbook compatibility only and could well go away. - style = "" - if level + self._hlevel_offset < 3 \ - and (self._toplevel_tag == 'section' or (self._toplevel_tag == 'chapter' and level > 0)): - style = "clear: both" - tag, hstyle = super()._make_hN(max(1, level)) - return tag, style + # book heading := h1 + # Everything else is h2 ... h6 + return super()._make_hN(level + 1) def _included_thing(self, tag: str, token: Token, tokens: Sequence[Token], i: int) -> str: outer, inner = [], [] - # since books have no non-include content the toplevel book wrapper will not count - # towards nesting depth. other types will have at least a title+id heading which - # *does* count towards the nesting depth. chapters give a -1 to included sections - # mirroring the special handing in _make_hN. sigh. - hoffset = ( - 0 if not self._headings - else self._headings[-1].level - 1 if self._toplevel_tag == 'chapter' - else self._headings[-1].level - ) outer.append(self._maybe_close_partintro()) into = token.meta['include-args'].get('into-file') fragments = token.meta['included'] - state = self._push(tag, hoffset) + state = self._push(tag) if into: toc = TocEntry.of(fragments[0][0][0]) - inner.append(self._file_header(toc)) - # we do not set _hlevel_offset=0 because docbook didn't either. + # chunk pages carry the same whole-book sidebar as the main page. + inner.append(self._file_header(toc, sidebar=self._build_sidebar(toc))) else: inner = outer in_dir = self._in_dir @@ -755,17 +715,25 @@ class HTMLConverter(BaseConverter[ManualHTMLRenderer]): server_redirects_file.write("\n".join(formatted_server_redirects)) +class _DeprecatedDepthFlag(argparse.Action): + def __call__(self, parser: argparse.ArgumentParser, namespace: argparse.Namespace, + values: Any, option_string: str | None = None) -> None: + parser.error(f"{option_string} has been removed, use --sidebar-depth instead") + def _build_cli_html(p: argparse.ArgumentParser) -> None: p.add_argument('--manpage-urls', required=True) p.add_argument('--revision', required=True) p.add_argument('--generator', default='nixos-render-docs') p.add_argument('--stylesheet', default=[], action='append') p.add_argument('--script', default=[], action='append') - p.add_argument('--toc-depth', default=1, type=int) - p.add_argument('--chunk-toc-depth', default=1, type=int) - p.add_argument('--section-toc-depth', default=0, type=int) p.add_argument('--media-dir', default="media", type=Path) p.add_argument('--redirects', type=Path) + p.add_argument('--sidebar-depth', default=2, type=int) + # Deprecated flags, + p.add_argument('--toc-depth', nargs='?', action=_DeprecatedDepthFlag, default=None) + p.add_argument('--chunk-toc-depth', nargs='?', action=_DeprecatedDepthFlag, default=None) + p.add_argument('--section-toc-depth', nargs='?', action=_DeprecatedDepthFlag, default=None) + # Positional p.add_argument('infile', type=Path) p.add_argument('outfile', type=Path) @@ -778,8 +746,8 @@ def _run_cli_html(args: argparse.Namespace) -> None: md = HTMLConverter( args.revision, - HTMLParameters(args.generator, args.stylesheet, args.script, args.toc_depth, - args.chunk_toc_depth, args.section_toc_depth, args.media_dir), + HTMLParameters(args.generator, args.stylesheet, args.script, + args.sidebar_depth, args.media_dir), json.load(manpage_urls), redirects) md.convert(args.infile, args.outfile) diff --git a/pkgs/by-name/ni/nixos-render-docs/src/tests/test_auto_id_prefix.py b/pkgs/by-name/ni/nixos-render-docs/src/tests/test_auto_id_prefix.py index 6fb706bad5ac..fce017fc70ba 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/tests/test_auto_id_prefix.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/tests/test_auto_id_prefix.py @@ -10,7 +10,7 @@ def set_prefix(token: Token, ident: str) -> None: def test_auto_id_prefix_simple() -> None: - md = HTMLConverter("1.0.0", HTMLParameters("", [], [], 2, 2, 2, Path("")), {}) + md = HTMLConverter("1.0.0", HTMLParameters("", [], [], 2, Path("")), {}) src = f""" # title @@ -31,7 +31,7 @@ def test_auto_id_prefix_simple() -> None: def test_auto_id_prefix_repeated() -> None: - md = HTMLConverter("1.0.0", HTMLParameters("", [], [], 2, 2, 2, Path("")), {}) + md = HTMLConverter("1.0.0", HTMLParameters("", [], [], 2, Path("")), {}) src = f""" # title @@ -57,7 +57,7 @@ def test_auto_id_prefix_repeated() -> None: ] def test_auto_id_prefix_maximum_nested() -> None: - md = HTMLConverter("1.0.0", HTMLParameters("", [], [], 2, 2, 2, Path("")), {}) + md = HTMLConverter("1.0.0", HTMLParameters("", [], [], 2, Path("")), {}) src = f""" # h1 diff --git a/pkgs/by-name/ni/nixos-render-docs/src/tests/test_manual.py b/pkgs/by-name/ni/nixos-render-docs/src/tests/test_manual.py new file mode 100644 index 000000000000..339bf58b2462 --- /dev/null +++ b/pkgs/by-name/ni/nixos-render-docs/src/tests/test_manual.py @@ -0,0 +1,116 @@ +from pathlib import Path + +from nixos_render_docs.manual import HTMLConverter, HTMLParameters + + +def _build(tmp_path: Path, sidebar_depth: int = 2) -> str: + (tmp_path / "part.md").write_text( + "# Build helpers {#part-builders}\n\n" # -> h2 + "```{=include=} chapters\nchapter.md\n```\n" + ) + (tmp_path / "chapter.md").write_text( + "# Fixed-point arguments {#chap-fpa}\n\n" # -> h2 + "Intro.\n\n" + "## First section {#sec-first}\n\n" # -> h3 + "Body.\n\n" + "### A subsection {#sub-a}\n\n" + "Deep.\n\n" + "#### Deeper {#d4}\n\n" + "More.\n\n" + "##### Deepest {#d5}\n\n" + "Most.\n" + ) + (tmp_path / "index.md").write_text( + "# Test manual {#book-test}\n\n" # -> h1 (book title) + "## Version 1\n\n" # -> h2 + "```{=include=} parts\npart.md\n```\n" + ) + out = tmp_path / "out" + out.mkdir(exist_ok=True) + conv = HTMLConverter( + "1.0.0", + HTMLParameters("test-gen", [], [], sidebar_depth, Path("media")), + {}, + ) + conv.convert(tmp_path / "index.md", out / "index.html") + return (out / "index.html").read_text() + + +def test_single_h1_and_flat_heading_levels(tmp_path: Path) -> None: + html = _build(tmp_path) + # There should be only one h1 on an html for acessibility and semantic reasons + assert html.count("' in html + assert '

    None: + html = _build(tmp_path) + assert '

    ' ) nav = render_entries(root.children, self._html_params.sidebar_depth) - figures = build_list("Figures", "list-of-figures", root.figures) - examples = build_list("Examples", "list-of-examples", root.examples) - return f'{nav}{figures}{examples}' + return f'{nav}' def _make_hN(self, level: int) -> tuple[str, str]: # book heading := h1 diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual_structure.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual_structure.py index 64effecb88f5..859ff5197d17 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual_structure.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual_structure.py @@ -3,13 +3,12 @@ from __future__ import annotations import dataclasses as dc import html import itertools - -from typing import cast, get_args, Iterable, Literal, Sequence +from typing import Iterable, Literal, Sequence, cast, get_args from markdown_it.token import Token -from .utils import Freezeable from .src_error import SrcError +from .utils import Freezeable # FragmentType is used to restrict structural include blocks. FragmentType = Literal['preface', 'part', 'chapter', 'section', 'appendix'] @@ -146,8 +145,6 @@ class TocEntry(Freezeable): next: TocEntry | None = None children: list[TocEntry] = dc.field(default_factory=list) starts_new_chunk: bool = False - examples: list[TocEntry] = dc.field(default_factory=list) - figures: list[TocEntry] = dc.field(default_factory=list) @property def root(self) -> TocEntry: @@ -162,7 +159,7 @@ class TocEntry(Freezeable): @classmethod def collect_and_link(cls, xrefs: dict[str, XrefTarget], tokens: Sequence[Token]) -> TocEntry: - entries, examples, figures = cls._collect_entries(xrefs, tokens, 'book') + entries = cls._collect_entries(xrefs, tokens, 'book') def flatten_with_parent(this: TocEntry, parent: TocEntry | None) -> Iterable[TocEntry]: this.parent = parent @@ -179,9 +176,6 @@ class TocEntry(Freezeable): prev = c paths_seen.add(c.target.path) - flat[0].examples = examples - flat[0].figures = figures - for c in flat: c.freeze() @@ -189,37 +183,30 @@ class TocEntry(Freezeable): @classmethod def _collect_entries(cls, xrefs: dict[str, XrefTarget], tokens: Sequence[Token], - kind: TocEntryType) -> tuple[TocEntry, list[TocEntry], list[TocEntry]]: + kind: TocEntryType) -> TocEntry: # we assume that check_structure has been run recursively over the entire input. # list contains (tag, entry) pairs that will collapse to a single entry for # the full sequence. entries: list[tuple[str, TocEntry]] = [] - examples: list[TocEntry] = [] - figures: list[TocEntry] = [] for token in tokens: if token.type.startswith('included_') and (included := token.meta.get('included')): fragment_type_str = token.type[9:].removesuffix('s') assert fragment_type_str in get_args(TocEntryType) fragment_type = cast(TocEntryType, fragment_type_str) for fragment, _path in included: - subentries, subexamples, subfigures = cls._collect_entries(xrefs, fragment, fragment_type) + subentries = cls._collect_entries(xrefs, fragment, fragment_type) entries[-1][1].children.append(subentries) - examples += subexamples - figures += subfigures elif token.type == 'heading_open' and (id := cast(str, token.attrs.get('id', ''))): while len(entries) > 1 and entries[-1][0] >= token.tag: entries[-2][1].children.append(entries.pop()[1]) entries.append((token.tag, TocEntry(kind if token.tag == 'h1' else 'section', xrefs[id]))) token.meta['TocEntry'] = entries[-1][1] - elif token.type == 'example_open' and (id := cast(str, token.attrs.get('id', ''))): - examples.append(TocEntry('example', xrefs[id])) - elif token.type == 'figure_open' and (id := cast(str, token.attrs.get('id', ''))): - figures.append(TocEntry('figure', xrefs[id])) + while len(entries) > 1: entries[-2][1].children.append(entries.pop()[1]) - return (entries[0][1], examples, figures) + return entries[0][1] _xml_id_translate_table = { ord('*'): ord('_'), From 64ee61cb64cb05458e9d00e35effc4a922bb4c15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jul 2026 14:02:22 +0000 Subject: [PATCH 207/252] smfh: 1.5 -> 1.6 --- pkgs/by-name/sm/smfh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sm/smfh/package.nix b/pkgs/by-name/sm/smfh/package.nix index 0df11ace409b..02767bf49c14 100644 --- a/pkgs/by-name/sm/smfh/package.nix +++ b/pkgs/by-name/sm/smfh/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "smfh"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "feel-co"; repo = "smfh"; tag = finalAttrs.version; - hash = "sha256-RgszLC/p9uov6aXnPGbFRkPzT5xleX17wBCdoMT1wcA="; + hash = "sha256-mP/ln+GkafKSnK4LIrAZY45OZYErQFehHUKmBRhHJY4="; }; - cargoHash = "sha256-7IcoDgRvpye2lm+bdPlVKj0GO6QBABiQKVwSxL4Mh5k="; + cargoHash = "sha256-6kybKx2aZ0pTr0yXPawqTnJVntL1NNCkgEvRFQEwtCk="; meta = { description = "Sleek Manifest File Handler"; From 7a157c354fc29029fd594d388fd7f8c69e6e4b3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jul 2026 14:25:30 +0000 Subject: [PATCH 208/252] stalwart-cli: 1.0.9 -> 1.0.10 --- pkgs/by-name/st/stalwart-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stalwart-cli/package.nix b/pkgs/by-name/st/stalwart-cli/package.nix index 3194aa7cce69..f0213bd93504 100644 --- a/pkgs/by-name/st/stalwart-cli/package.nix +++ b/pkgs/by-name/st/stalwart-cli/package.nix @@ -7,14 +7,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "stalwart-cli"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-SZefTApX3FT6M7Zr3CAIfZfgkECJb54xTGdoPPII8Q4="; + hash = "sha256-9fB9qkRtXIL/8qROl3FiK0w5XUA+nDVjxi1+dhwtxJM="; }; - cargoHash = "sha256-D6TN5IIlX9PL2+qP0e8QBoalgfgN+xT2poD7wMh5TB8="; + cargoHash = "sha256-91S7XMbNClc349AvXixQdBnPV5+3G1RA5fpfNUfFmwk="; __structuredAttrs = true; # `Result::unwrap()` on an `Err` value: Network(reqwest::Error { kind: Builder, source: General("No CA certificates were loaded from the system") }) nativeCheckInputs = [ cacert ]; From 8bb07fcc0f6c720004c133dbc1d5844fe7565db6 Mon Sep 17 00:00:00 2001 From: yaya Date: Fri, 3 Jul 2026 16:22:36 +0200 Subject: [PATCH 209/252] pocket-casts: Bump electron version to 42 Upstream already pinned Electron to 42 in their `package.json` for v0.13.0. --- pkgs/by-name/po/pocket-casts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/pocket-casts/package.nix b/pkgs/by-name/po/pocket-casts/package.nix index f5b922150081..5d001a612e1b 100644 --- a/pkgs/by-name/po/pocket-casts/package.nix +++ b/pkgs/by-name/po/pocket-casts/package.nix @@ -5,10 +5,10 @@ makeDesktopItem, copyDesktopItems, makeWrapper, - electron_40, + electron_42, }: let - electron = electron_40; + electron = electron_42; in buildNpmPackage rec { pname = "pocket-casts"; From f8225c39df4421cc40726adbd57ffebf94126c65 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 18 Jul 2025 10:41:20 -0400 Subject: [PATCH 210/252] nixos/comma: init Fixes https://github.com/NixOS/nixpkgs/issues/426379 --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/comma.nix | 52 ++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 nixos/modules/programs/comma.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 692b4462c928..9ded7df50ebf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -193,6 +193,7 @@ ./programs/chrysalis.nix ./programs/clash-verge.nix ./programs/cnping.nix + ./programs/comma.nix ./programs/command-not-found/command-not-found.nix ./programs/coolercontrol.nix ./programs/corefreq.nix diff --git a/nixos/modules/programs/comma.nix b/nixos/modules/programs/comma.nix new file mode 100644 index 000000000000..89fa20fd4812 --- /dev/null +++ b/nixos/modules/programs/comma.nix @@ -0,0 +1,52 @@ +{ + lib, + config, + pkgs, + ... +}: + +let + cfg = config.programs.comma; +in +{ + options.programs.comma = { + enable = lib.mkEnableOption "comma"; + package = lib.mkPackageOption pkgs "comma" { }; + enableBashIntegration = lib.mkEnableOption "comma command-not-found handler for bash" // { + default = true; + }; + enableZshIntegration = lib.mkEnableOption "comma command-not-found handler for zsh" // { + default = true; + }; + enableFishIntegration = lib.mkEnableOption "comma command-not-found handler for fish" // { + default = true; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + programs = { + bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration '' + source ${cfg.package}/share/comma/command-not-found.sh + ''; + zsh.interactiveShellInit = lib.mkIf cfg.enableZshIntegration '' + source ${cfg.package}/share/comma/command-not-found.sh + ''; + fish.interactiveShellInit = '' + source ${cfg.package}/share/comma/command-not-found.fish + ''; + + # Disable *other* command-not-found handlers + command-not-found.enable = lib.mkIf ( + cfg.enableBashIntegration || cfg.enableZshIntegration || cfg.enableFishIntegration + ) (lib.mkDefault false); + nix-index = { + enableBashIntegration = lib.mkIf (cfg.enableBashIntegration) (lib.mkDefault false); + enableZshIntegration = lib.mkIf (cfg.enableZshIntegration) (lib.mkDefault false); + enableFishIntegration = lib.mkIf (cfg.enableFishIntegration) (lib.mkDefault false); + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ pandapip1 ]; +} From a4a2a9aa8ccc7ca9cd1fb5fdc338e2b66fc17dab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jul 2026 14:26:19 +0000 Subject: [PATCH 211/252] ocamlPackages.x509: 1.1.0 -> 1.1.1 --- pkgs/development/ocaml-modules/x509/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index a9eb4388442b..420fd91d628f 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -17,15 +17,13 @@ ohex, }: -buildDunePackage rec { - minimalOCamlVersion = "4.08"; - +buildDunePackage (finalAttrs: { pname = "x509"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-${version}.tbz"; - hash = "sha256-BYQ74iwQ9MoOzyStOasALolWD1PMIhKKw9FHReFr+n0="; + url = "https://github.com/mirleft/ocaml-x509/releases/download/v${finalAttrs.version}/x509-${finalAttrs.version}.tbz"; + hash = "sha256-trFZ3Fa6RcNzAn8g5gd5te+Nb7eFTotCio3Zr+FAylU="; }; checkInputs = [ alcotest ]; @@ -50,6 +48,6 @@ buildDunePackage rec { homepage = "https://github.com/mirleft/ocaml-x509"; description = "X509 (RFC5280) handling in OCaml"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ vbgl ]; + maintainers = [ ]; }; -} +}) From 5502f844b225147985f1fb200f2b187f4f14f969 Mon Sep 17 00:00:00 2001 From: wxlyyy <1556588440@qq.com> Date: Fri, 3 Jul 2026 23:12:56 +0800 Subject: [PATCH 212/252] Reapply "nixos/pipewire: minor refactor" Reapplies #537519, reverted in #537857 Fixed breakage --- .../services/desktops/pipewire/pipewire.nix | 46 +++++++++++-------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index 4449c273c7ec..fb72bd695cec 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -11,11 +11,17 @@ let inherit (lib) maintainers teams; inherit (lib.attrsets) attrByPath - attrsToList concatMapAttrs filterAttrs + mapAttrs' + nameValuePair + ; + inherit (lib.lists) + elem + flatten + optional + optionals ; - inherit (lib.lists) flatten optional optionals; inherit (lib.modules) mkIf mkRemovedOptionModule; inherit (lib.options) literalExpression @@ -23,7 +29,7 @@ let mkOption mkPackageOption ; - inherit (lib.strings) concatMapStringsSep hasPrefix optionalString; + inherit (lib.strings) hasPrefix optionalString; inherit (lib.types) attrsOf bool @@ -32,17 +38,6 @@ let ; json = pkgs.formats.json { }; - mapToFiles = - location: config: - concatMapAttrs (name: value: { - "share/pipewire/${location}.conf.d/${name}.conf" = json.generate "${name}" value; - }) config; - extraConfigPkgFromFiles = - locations: filesSet: - pkgs.runCommand "pipewire-extra-config" { } '' - mkdir -p ${concatMapStringsSep " " (l: "$out/share/pipewire/${l}.conf.d") locations} - ${concatMapStringsSep ";" ({ name, value }: "ln -s ${value} $out/${name}") (attrsToList filesSet)} - ''; cfg = config.services.pipewire; enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.hostPlatform.isx86_64 && pkgs.pkgsi686Linux.pipewire != null; @@ -58,11 +53,24 @@ let configPackages = cfg.configPackages; - extraConfigPkg = extraConfigPkgFromFiles [ "pipewire" "client" "jack" "pipewire-pulse" ] ( - mapToFiles "pipewire" cfg.extraConfig.pipewire - // mapToFiles "client" cfg.extraConfig.client - // mapToFiles "jack" cfg.extraConfig.jack - // mapToFiles "pipewire-pulse" cfg.extraConfig.pipewire-pulse + extraConfigPkg = pkgs.linkFarm "pipewire-extra-config" ( + concatMapAttrs + ( + location: config: + mapAttrs' ( + name: value: + nameValuePair "share/pipewire/${location}.conf.d/${name}.conf" (json.generate name value) + ) config + ) + # cfg.extraConfig contains deprecated options, i.e. client-rt + { + inherit (cfg.extraConfig) + pipewire + client + jack + pipewire-pulse + ; + } ); configs = pkgs.buildEnv { From 81237ed5cf32dd63987e9fbb81b3c60746c049df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jul 2026 15:25:44 +0000 Subject: [PATCH 213/252] prow: 0-unstable-2026-06-24 -> 0-unstable-2026-07-02 --- pkgs/by-name/pr/prow/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix index 24599bb1db28..5354864dc099 100644 --- a/pkgs/by-name/pr/prow/package.nix +++ b/pkgs/by-name/pr/prow/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "prow"; - version = "0-unstable-2026-06-24"; - rev = "2b5fea27a177c767160452ba75dba978a88d8d63"; + version = "0-unstable-2026-07-02"; + rev = "ef12e757d9a9ede25c2a41236ace781e56b23265"; src = fetchFromGitHub { inherit rev; owner = "kubernetes-sigs"; repo = "prow"; - hash = "sha256-QKxalLV+UwFs+WspXgnqS3QFRTzDkh/NKHZr/+UPUNg="; + hash = "sha256-u8TQav5uv8uWpuO6n/gOkEYhZKq16EHRkdUMY3cq6Uc="; }; vendorHash = "sha256-iLJ2atYyHNMvflyuETpPnuhKD293k25vfZQU68Y7oN8="; From 81c0a9a17add2285fac35003fea11ffadea005e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jul 2026 15:43:17 +0000 Subject: [PATCH 214/252] terraform-providers.sacloud_sakuracloud: 2.36.0 -> 2.36.1 --- .../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 29b4d81234c6..f676b9f5a7a9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1157,13 +1157,13 @@ "vendorHash": null }, "sacloud_sakuracloud": { - "hash": "sha256-mk5tmlx8UZXedRbSKmSg9YqX9MJFWsSrMea1dirL+HI=", + "hash": "sha256-oAD+QfMqUOtbh2GNooyV1Yc1OVHuAnv86ZvuCB7zo8E=", "homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud", "owner": "sacloud", "repo": "terraform-provider-sakuracloud", - "rev": "v2.36.0", + "rev": "v2.36.1", "spdx": "Apache-2.0", - "vendorHash": "sha256-vBcPWjugjqyuUdvxNQN1oC8V5D2SeW2WR0/c6OlgaXU=" + "vendorHash": "sha256-zklw0YajAZZLkosLxZCsWtAbvmHuGEI8OGpVykp1Xw4=" }, "sap-cloud-infrastructure_sci": { "hash": "sha256-eQA4mY+Rx5PLbTgGqfefYFc5gZKIvt1w2eag8ipE0PI=", From 3aad7978d0a4288db782f6145f2fce7dabdbaa19 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 28 May 2026 10:01:45 +0000 Subject: [PATCH 215/252] python3Packages.gradio: 6.9.0 -> 6.19.0 Diff: https://github.com/gradio-app/gradio/compare/gradio@6.9.0...gradio@6.19.0 Changelog: https://github.com/gradio-app/gradio/releases/tag/gradio@6.19.0 --- .../python-modules/gradio/client.nix | 3 +- .../python-modules/gradio/default.nix | 43 +++++++++++------ .../gradio/dont-npm-install-http-proxy.patch | 44 +++++++++++++++++ .../fix-transformers-pipelines-imports.patch | 4 +- .../python-modules/hf-gradio/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 6 files changed, 126 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/gradio/dont-npm-install-http-proxy.patch create mode 100644 pkgs/development/python-modules/hf-gradio/default.nix diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index d1f5af6a6332..6a63952ab6f3 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - nix-update-script, jq, # build-system @@ -32,7 +31,7 @@ buildPythonPackage (finalAttrs: { pname = "gradio-client"; - version = "2.3.0"; + version = "2.5.0"; pyproject = true; # no tests on pypi diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 1bbdae5bdc98..073163aa7a8b 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -21,14 +21,13 @@ pnpmConfigHook, # dependencies - aiofiles, anyio, audioop-lts, brotli, fastapi, - ffmpy, gradio-client, groovy, + hf-gradio, httpx, huggingface-hub, jinja2, @@ -82,17 +81,23 @@ let in buildPythonPackage (finalAttrs: { pname = "gradio"; - version = "6.9.0"; + version = "6.19.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "gradio-app"; repo = "gradio"; tag = "gradio@${finalAttrs.version}"; - hash = "sha256-iGaUiJto/tquCSa6D/wbkNyVtK/2kZB/hz62STfwLOY="; + hash = "sha256-9vO+cuxpXERD/rH8wMuNWBNSH6Mu+yZLQMxLoiUTKtk="; }; patches = [ + # Upstream's after_build.js runs `npm install --production` to vendor http-proxy into the server + # build output, which fails offline. + # Copy it (and its dependency closure) from the already-fetched pnpm workspace. + ./dont-npm-install-http-proxy.patch + ./fix-transformers-pipelines-imports.patch ]; @@ -103,8 +108,12 @@ buildPythonPackage (finalAttrs: { src ; inherit pnpm; - fetcherVersion = 3; - hash = "sha256-pZCYtWFNlrcRFomx6HbO0zySOyifO3n/ffzx59pS/A8="; + fetcherVersion = 4; + hash = "sha256-xCxr/jnp9emeB6THGt4cumvApw6fSZQwG2NGOcvR0yQ="; + }; + + env = { + CI = "true"; }; nativeBuildInputs = [ @@ -121,19 +130,13 @@ buildPythonPackage (finalAttrs: { hatch-fancy-pypi-readme ]; - pythonRelaxDeps = [ - "aiofiles" - "tomlkit" - ]; - dependencies = [ - aiofiles anyio brotli fastapi - ffmpy gradio-client groovy + hf-gradio httpx huggingface-hub jinja2 @@ -397,13 +400,25 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "gradio" ]; + __darwinAllowLocalNetworking = true; + # Cyclic dependencies are fun! - # This is gradio without gradio-client and gradio-pdf + # This is gradio without gradio-client and hf-gradio passthru = { sans-reverse-dependencies = (gradio.override { gradio-client = null; gradio-pdf = null; + # gradio imports hf_gradio at module load (gradio/routes.py), so we must keep it for the + # import to succeed. + # hf-gradio depends on gradio-client, whose test suite pulls in + # gradio.sans-reverse-dependencies, which would create a build cycle. + # Break it by giving hf-gradio a checkless gradio-client. + hf-gradio = hf-gradio.override { + gradio-client = gradio-client.overridePythonAttrs { + doCheck = false; + }; + }; }).overridePythonAttrs (old: { pname = old.pname + "-sans-reverse-dependencies"; diff --git a/pkgs/development/python-modules/gradio/dont-npm-install-http-proxy.patch b/pkgs/development/python-modules/gradio/dont-npm-install-http-proxy.patch new file mode 100644 index 000000000000..b25b851ea2aa --- /dev/null +++ b/pkgs/development/python-modules/gradio/dont-npm-install-http-proxy.patch @@ -0,0 +1,44 @@ +--- a/js/app/after_build.js 2026-05-28 14:03:04.411110834 +0000 ++++ b/js/app/after_build.js 2026-05-28 14:03:32.000852551 +0000 +@@ -1,7 +1,7 @@ +-import { writeFileSync, copyFileSync } from "fs"; ++import { writeFileSync, copyFileSync, cpSync, mkdirSync, readFileSync } from "fs"; + import { resolve, dirname } from "path"; + import { fileURLToPath } from "url"; +-import { execSync } from "child_process"; ++import { createRequire } from "module"; + + const __filename = fileURLToPath(import.meta.url); + const __dirname = dirname(__filename); +@@ -20,8 +20,29 @@ + ) + ); + +-// Install http-proxy in the build output so it's available at runtime +-execSync("npm install --production", { cwd: out_path, stdio: "inherit" }); ++// Vendor http-proxy and its production dependency closure into the build ++// output so it's available at runtime. Upstream runs `npm install --production` ++// here, but the packages are already present in the workspace, so we copy them ++// instead of hitting the network. ++const out_node_modules = resolve(out_path, "node_modules"); ++mkdirSync(out_node_modules, { recursive: true }); ++ ++const copied = new Set(); ++function vendor(name, parentRequire) { ++ if (copied.has(name)) return; ++ copied.add(name); ++ const pkgJsonPath = parentRequire.resolve(`${name}/package.json`); ++ cpSync(dirname(pkgJsonPath), resolve(out_node_modules, name), { ++ recursive: true, ++ dereference: true ++ }); ++ const pkgJson = JSON.parse(readFileSync(pkgJsonPath, "utf8")); ++ const ownRequire = createRequire(pkgJsonPath); ++ for (const dep of Object.keys(pkgJson.dependencies || {})) { ++ vendor(dep, ownRequire); ++ } ++} ++vendor("http-proxy", createRequire(import.meta.url)); + + // Replace the adapter-generated index.js with our custom proxy entry point + copyFileSync( diff --git a/pkgs/development/python-modules/gradio/fix-transformers-pipelines-imports.patch b/pkgs/development/python-modules/gradio/fix-transformers-pipelines-imports.patch index 72fc44d0d3aa..696ea3e569d5 100644 --- a/pkgs/development/python-modules/gradio/fix-transformers-pipelines-imports.patch +++ b/pkgs/development/python-modules/gradio/fix-transformers-pipelines-imports.patch @@ -14,10 +14,10 @@ index 1903f758f..c40e6d3b1 100644 - FillMaskPipeline, - ImageClassificationPipeline, - ObjectDetectionPipeline, -- QuestionAnsweringPipeline, +- QuestionAnsweringPipeline, # ty: ignore[unresolved-import] - TextClassificationPipeline, - TextGenerationPipeline, -- VisualQuestionAnsweringPipeline, +- VisualQuestionAnsweringPipeline, # ty: ignore[unresolved-import] - ZeroShotClassificationPipeline, -) diff --git a/pkgs/development/python-modules/hf-gradio/default.nix b/pkgs/development/python-modules/hf-gradio/default.nix new file mode 100644 index 000000000000..7dfd59ce40a9 --- /dev/null +++ b/pkgs/development/python-modules/hf-gradio/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + hatchling, + + # dependencies + gradio-client, + typer, +}: + +buildPythonPackage (finalAttrs: { + pname = "hf-gradio"; + version = "0.4.1"; + pyproject = true; + __structuredAttrs = true; + + # No tags on GitHub + # https://github.com/gradio-app/hf-gradio/issues/2 + src = fetchPypi { + pname = "hf_gradio"; + inherit (finalAttrs) version; + hash = "sha256-oBfZQmGPDUlaWO5FYwR/oEvvYUwA4Mt4mpptBjPP+ns="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + gradio-client + typer + ]; + + # The PyPI sdist ships no test suite. + doCheck = false; + + pythonImportsCheck = [ "hf_gradio" ]; + + meta = { + description = "Extension of the Hugging Face CLI for interacting with Gradio Spaces and Apps"; + homepage = "https://pypi.org/project/hf-gradio"; + 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 9033e7b92583..15ee04f1f391 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7234,6 +7234,8 @@ self: super: with self; { hexdump = callPackage ../development/python-modules/hexdump { }; + hf-gradio = callPackage ../development/python-modules/hf-gradio { }; + hf-transfer = callPackage ../development/python-modules/hf-transfer { }; hf-xet = callPackage ../development/python-modules/hf-xet { }; From dcc6fe72fae7378098fd3a119b2ac8d1a59f3b16 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 3 Jul 2026 16:27:18 +0000 Subject: [PATCH 216/252] python3Packages.uproot: 5.7.4 -> 5.7.5 Diff: https://github.com/scikit-hep/uproot5/compare/v5.7.4...v5.7.5 Changelog: https://github.com/scikit-hep/uproot5/releases/tag/v5.7.5 --- pkgs/development/python-modules/uproot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 7010c5630142..6b224d1e6147 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: { pname = "uproot"; - version = "5.7.4"; + version = "5.7.5"; pyproject = true; __structuredAttrs = true; @@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: { owner = "scikit-hep"; repo = "uproot5"; tag = "v${finalAttrs.version}"; - hash = "sha256-OUvU54mgQl8SjgxwGHXr5/w+X9hbTL3vzflsP7UlxlA="; + hash = "sha256-Ox+PfMlO1ijkSyUM78g9YthdjUo+l0+Idd0jy+a83wE="; }; build-system = [ From c64c2cf7f35a5d2ef3828401fc6dd874f29a0c8f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Jul 2026 18:41:31 +0200 Subject: [PATCH 217/252] monsoon: modernize - add version and versionCheckHook - add nix-update-script --- pkgs/by-name/mo/monsoon/package.nix | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/monsoon/package.nix b/pkgs/by-name/mo/monsoon/package.nix index 8fc3576649c7..31491e9d175c 100644 --- a/pkgs/by-name/mo/monsoon/package.nix +++ b/pkgs/by-name/mo/monsoon/package.nix @@ -3,12 +3,16 @@ stdenv, buildGoModule, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: buildGoModule (finalAttrs: { pname = "monsoon"; version = "0.10.1"; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "RedTeamPentesting"; repo = "monsoon"; @@ -18,19 +22,32 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-hGEUO1sl8IKXo4rkS81Wlf7187lu2PrSujNlGNTLwmE="; + ldflags = [ + "-s" + "-X=main.version=v${finalAttrs.version}" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + + versionCheckProgramArg = [ "version" ]; + # Tests fails on darwin doCheck = !stdenv.hostPlatform.isDarwin; + passthru.updateScript = nix-update-script { }; + meta = { description = "Fast HTTP enumerator"; - mainProgram = "monsoon"; longDescription = '' A fast HTTP enumerator that allows you to execute a large number of HTTP requests, filter the responses and display them in real-time. ''; homepage = "https://github.com/RedTeamPentesting/monsoon"; - changelog = "https://github.com/RedTeamPentesting/monsoon/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/RedTeamPentesting/monsoon/releases/tag/v${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; + mainProgram = "monsoon"; }; }) From 21056d4afcb0a3ee2d3f5189539b5777f9b67e00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jul 2026 16:49:42 +0000 Subject: [PATCH 218/252] libretro.fceumm: 0-unstable-2026-06-23 -> 0-unstable-2026-06-30 --- pkgs/applications/emulators/libretro/cores/fceumm.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix index e2c485bc5ad5..fa4b3cbf53a0 100644 --- a/pkgs/applications/emulators/libretro/cores/fceumm.nix +++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fceumm"; - version = "0-unstable-2026-06-23"; + version = "0-unstable-2026-06-30"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-fceumm"; - rev = "f87bc875bd68262211e2e01ffbaf3662626a3e4f"; - hash = "sha256-TUrhDbRArO/RISZawu5p9FIZlFf8pPlBrD9WRrdSRPk="; + rev = "6e00afac498903586330492cdd81354a6c4c0d4c"; + hash = "sha256-0WPMqXj/hNtFxUAIL16B80SxZ8FW31M4g/8wVMZLv/w="; }; meta = { From fbcc46ede8d65346948910a3a00f4fa50d39cfab Mon Sep 17 00:00:00 2001 From: kayoubi13 Date: Fri, 3 Jul 2026 18:58:40 +0200 Subject: [PATCH 219/252] maintainers: add kayoubi13 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 06725dcec750..4f6e25b44976 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14235,6 +14235,12 @@ githubId = 48174247; name = "Aleksandar Nesovic"; }; + kayoubi13 = { + email = "nix@foss-daily.org"; + github = "kayoubi13"; + githubId = 299534864; + name = "Kayoubi13"; + }; kazcw = { email = "kaz@lambdaverse.org"; github = "kazcw"; From 9fbff166f6f7c34a8d3c1aa13be7cc9fe0de17bf Mon Sep 17 00:00:00 2001 From: bitbloxhub <45184892+bitbloxhub@users.noreply.github.com> Date: Fri, 3 Jul 2026 17:06:59 +0000 Subject: [PATCH 220/252] pg-schema-diff: 1.0.5 -> 1.0.7 --- pkgs/by-name/pg/pg-schema-diff/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pg/pg-schema-diff/package.nix b/pkgs/by-name/pg/pg-schema-diff/package.nix index 47ac0af6335b..afc9eef6896a 100644 --- a/pkgs/by-name/pg/pg-schema-diff/package.nix +++ b/pkgs/by-name/pg/pg-schema-diff/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "pg-schema-diff"; - version = "1.0.5"; + version = "1.0.7"; src = fetchFromGitHub { owner = "stripe"; repo = "pg-schema-diff"; tag = "v${finalAttrs.version}"; - hash = "sha256-MNuJS9zhTbF6FY1i5fF5VhX8pa+hVaQfdAaj3CKmG50="; + hash = "sha256-7N9n0puEyCOq3MKXRLNAgtgrFEC4Sh9d6OK9U/h4xCQ="; }; subPackages = [ From 1355a38d2d3040cd0dfabade997fadfa1cf02984 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 3 Jul 2026 20:31:57 +0300 Subject: [PATCH 221/252] netbird: 0.74.0 -> 0.74.2 Diff: https://github.com/netbirdio/netbird/compare/v0.74.0...v0.74.2 Changelog: https://github.com/netbirdio/netbird/releases/tag/v0.74.2 --- pkgs/by-name/ne/netbird/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index 55919ad5b4cd..1f342526688d 100644 --- a/pkgs/by-name/ne/netbird/package.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -73,13 +73,13 @@ let in buildGoModule (finalAttrs: { pname = "netbird-${componentName}"; - version = "0.74.0"; + version = "0.74.2"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${finalAttrs.version}"; - hash = "sha256-lichQPWqlphUjod3nsqJokDFIIEiwIykc9fWjSn5fzs="; + hash = "sha256-+BGWZzw6a8Fp8NlhtbX81OA3hCTcQ9r6nLuXTsbXCZ8="; }; overrideModAttrs = final: prev: { From 653c4a3515d187078eeb29a03d2d3d9a70fe9e63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jul 2026 17:34:25 +0000 Subject: [PATCH 222/252] nano-syntax-highlighting: 2026.05.01 -> 2026.07.01 --- pkgs/by-name/na/nano-syntax-highlighting/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nano-syntax-highlighting/package.nix b/pkgs/by-name/na/nano-syntax-highlighting/package.nix index 4c0d776c56bb..e104b6af9a86 100644 --- a/pkgs/by-name/na/nano-syntax-highlighting/package.nix +++ b/pkgs/by-name/na/nano-syntax-highlighting/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: rec { pname = "nano-syntax-highlighting"; - version = "2026.05.01"; + version = "2026.07.01"; src = fetchFromGitHub { owner = "galenguyer"; repo = "nano-syntax-highlighting"; tag = version; - hash = "sha256-ipnePkQEDfJ7T3GJ84D6bmo9KZ2AUkJ8aUqH0rPCsps="; + hash = "sha256-tcRNoeg0j/z9wFZjIc1CJXOKieWrvlLq9pblB0kE6yc="; }; dontBuild = true; From d8f802c855afc68761e81270a64088c37ed094fb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 3 Jul 2026 19:39:04 +0200 Subject: [PATCH 223/252] nixos/nginx/gitweb: move into gitweb module I don't see how this was ever considered a good idea, but that's part of a service-module and is not the responsibility of the nginx maintainers. --- nixos/modules/module-list.nix | 1 - nixos/modules/services/misc/gitweb.nix | 105 +++++++++++++++++- .../services/web-servers/nginx/gitweb.nix | 101 ----------------- 3 files changed, 104 insertions(+), 103 deletions(-) delete mode 100644 nixos/modules/services/web-servers/nginx/gitweb.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 692b4462c928..6f4cbe9fcc07 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1848,7 +1848,6 @@ ./services/web-servers/minio.nix ./services/web-servers/molly-brown.nix ./services/web-servers/nginx/default.nix - ./services/web-servers/nginx/gitweb.nix ./services/web-servers/nginx/tailscale-auth.nix ./services/web-servers/phpfpm/default.nix ./services/web-servers/pomerium.nix diff --git a/nixos/modules/services/misc/gitweb.nix b/nixos/modules/services/misc/gitweb.nix index 3030dc5c8285..65f923add2d5 100644 --- a/nixos/modules/services/misc/gitweb.nix +++ b/nixos/modules/services/misc/gitweb.nix @@ -6,7 +6,12 @@ }: let cfg = config.services.gitweb; - + cfgNginx = config.services.gitweb.nginx; + package = pkgs.gitweb.override ( + lib.optionalAttrs cfg.gitwebTheme { + gitwebTheme = true; + } + ); in { @@ -55,6 +60,104 @@ in internal = true; }; + nginx = { + enable = lib.mkOption { + default = false; + type = lib.types.bool; + description = '' + If true, enable gitweb in nginx. + ''; + }; + + location = lib.mkOption { + default = "/gitweb"; + type = lib.types.str; + description = '' + Location to serve gitweb on. + ''; + }; + + user = lib.mkOption { + default = "nginx"; + type = lib.types.str; + description = '' + Existing user that the CGI process will belong to. (Default almost surely will do.) + ''; + }; + + group = lib.mkOption { + default = "nginx"; + type = lib.types.str; + description = '' + Group that the CGI process will belong to. (Set to `config.services.gitolite.group` if you are using gitolite.) + ''; + }; + + virtualHost = lib.mkOption { + default = "_"; + type = lib.types.str; + description = '' + VirtualHost to serve gitweb on. Default is catch-all. + ''; + }; + }; + + }; + + imports = [ + (lib.mkRenamedOptionModule + [ "services" "nginx" "gitweb" "enable" ] + [ "services" "gitweb" "nginx" "enable" ] + ) + (lib.mkRenamedOptionModule + [ "services" "nginx" "gitweb" "location" ] + [ "services" "gitweb" "nginx" "location" ] + ) + (lib.mkRenamedOptionModule + [ "services" "nginx" "gitweb" "user" ] + [ "services" "gitweb" "nginx" "user" ] + ) + (lib.mkRenamedOptionModule + [ "services" "nginx" "gitweb" "group" ] + [ "services" "gitweb" "nginx" "group" ] + ) + (lib.mkRenamedOptionModule + [ "services" "nginx" "gitweb" "virtualHost" ] + [ "services" "gitweb" "nginx" "virtualHost" ] + ) + ]; + + config = lib.mkIf cfgNginx.enable { + + systemd.services.gitweb = { + description = "GitWeb service"; + script = "${package}/gitweb.cgi --fastcgi --nproc=1"; + environment = { + FCGI_SOCKET_PATH = "/run/gitweb/gitweb.sock"; + }; + serviceConfig = { + User = cfgNginx.user; + Group = cfgNginx.group; + RuntimeDirectory = [ "gitweb" ]; + }; + wantedBy = [ "multi-user.target" ]; + }; + + services.nginx = { + virtualHosts.${cfgNginx.virtualHost} = { + locations."${cfgNginx.location}/static/" = { + alias = "${package}/static/"; + }; + locations."${cfgNginx.location}/" = { + extraConfig = '' + include ${config.services.nginx.package}/conf/fastcgi_params; + fastcgi_param GITWEB_CONFIG ${cfg.gitwebConfigFile}; + fastcgi_pass unix:/run/gitweb/gitweb.sock; + ''; + }; + }; + }; + }; meta.maintainers = [ ]; diff --git a/nixos/modules/services/web-servers/nginx/gitweb.nix b/nixos/modules/services/web-servers/nginx/gitweb.nix deleted file mode 100644 index c379245c5bff..000000000000 --- a/nixos/modules/services/web-servers/nginx/gitweb.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -let - cfg = config.services.nginx.gitweb; - gitwebConfig = config.services.gitweb; - package = pkgs.gitweb.override ( - optionalAttrs gitwebConfig.gitwebTheme { - gitwebTheme = true; - } - ); - -in -{ - - options.services.nginx.gitweb = { - - enable = mkOption { - default = false; - type = types.bool; - description = '' - If true, enable gitweb in nginx. - ''; - }; - - location = mkOption { - default = "/gitweb"; - type = types.str; - description = '' - Location to serve gitweb on. - ''; - }; - - user = mkOption { - default = "nginx"; - type = types.str; - description = '' - Existing user that the CGI process will belong to. (Default almost surely will do.) - ''; - }; - - group = mkOption { - default = "nginx"; - type = types.str; - description = '' - Group that the CGI process will belong to. (Set to `config.services.gitolite.group` if you are using gitolite.) - ''; - }; - - virtualHost = mkOption { - default = "_"; - type = types.str; - description = '' - VirtualHost to serve gitweb on. Default is catch-all. - ''; - }; - - }; - - config = mkIf cfg.enable { - - systemd.services.gitweb = { - description = "GitWeb service"; - script = "${package}/gitweb.cgi --fastcgi --nproc=1"; - environment = { - FCGI_SOCKET_PATH = "/run/gitweb/gitweb.sock"; - }; - serviceConfig = { - User = cfg.user; - Group = cfg.group; - RuntimeDirectory = [ "gitweb" ]; - }; - wantedBy = [ "multi-user.target" ]; - }; - - services.nginx = { - virtualHosts.${cfg.virtualHost} = { - locations."${cfg.location}/static/" = { - alias = "${package}/static/"; - }; - locations."${cfg.location}/" = { - extraConfig = '' - include ${config.services.nginx.package}/conf/fastcgi_params; - fastcgi_param GITWEB_CONFIG ${gitwebConfig.gitwebConfigFile}; - fastcgi_pass unix:/run/gitweb/gitweb.sock; - ''; - }; - }; - }; - - }; - - meta.maintainers = [ ]; - -} From c1f215aff8fd0051618054f2324d3de844514a61 Mon Sep 17 00:00:00 2001 From: lucasew Date: Wed, 1 Jul 2026 14:01:37 -0300 Subject: [PATCH 224/252] rsync: fix pkgsStatic itemize test failure When cross-compiling (e.g. pkgsStatic), configure cannot run the link()-hardlinks-symlinks probe and defaults to no. On Linux that leaves hardlink_symlinks false while --copy-dest/--link-dest still itemize identical symlinks with blank attribute flags, so testsuite/itemize.test fails. Set rsync_cv_can_hardlink_symlink=yes for Linux cross builds. Resolves: #537437 Assisted-by: Grok (xAI) --- pkgs/by-name/rs/rsync/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/rs/rsync/package.nix b/pkgs/by-name/rs/rsync/package.nix index a102ff36cc15..cdeec0aac5a8 100644 --- a/pkgs/by-name/rs/rsync/package.nix +++ b/pkgs/by-name/rs/rsync/package.nix @@ -85,6 +85,14 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) [ # fix `multiversioning needs 'ifunc' which is not supported on this target` error "--disable-roll-simd" + ] + # Linux can hard-link symlinks; configure defaults this check to "no" when + # cross-compiling (e.g. pkgsStatic) because it cannot run the probe. + # That leaves hardlink_symlinks false while itemize still reports identical + # --copy-dest/--link-dest symlinks with blank attribute flags, so + # testsuite/itemize.test fails (https://github.com/NixOS/nixpkgs/issues/537437). + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform != stdenv.buildPlatform) [ + "rsync_cv_can_hardlink_symlink=yes" ]; enableParallelBuilding = true; From efe13f56f7a1b9b16b4748360865e63cf270991a Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Fri, 3 Jul 2026 19:55:59 +0200 Subject: [PATCH 225/252] mastodon: 4.6.2 -> 4.6.3 changelog: https://github.com/mastodon/mastodon/releases/tag/v4.6.3 diff: https://github.com/mastodon/mastodon/compare/v4.6.2...v4.6.3 --- pkgs/by-name/ma/mastodon/gemset.nix | 8 ++++---- pkgs/by-name/ma/mastodon/source.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ma/mastodon/gemset.nix b/pkgs/by-name/ma/mastodon/gemset.nix index 9e0500f11092..d2e16e05e7fa 100644 --- a/pkgs/by-name/ma/mastodon/gemset.nix +++ b/pkgs/by-name/ma/mastodon/gemset.nix @@ -804,10 +804,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; + sha256 = "15djj19ynz3sbw54fsf8n7y3sha8a333f2mgvjfwhr46jhcqg1ll"; type = "gem"; }; - version = "1.0.6"; + version = "1.0.7"; }; css_parser = { dependencies = [ @@ -2274,10 +2274,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v68nyl07xira30iyhn3118a4g59ar5748laq0cx2pwnsdy7ivrz"; + sha256 = "18g6ps30z6m365bly7sfialavnsf6m6qamdxsr84w96k51j4mnlb"; type = "gem"; }; - version = "1.8.1"; + version = "1.8.3"; }; multi_json = { groups = [ "default" ]; diff --git a/pkgs/by-name/ma/mastodon/source.nix b/pkgs/by-name/ma/mastodon/source.nix index dc6982dca446..7d292595b1b4 100644 --- a/pkgs/by-name/ma/mastodon/source.nix +++ b/pkgs/by-name/ma/mastodon/source.nix @@ -5,14 +5,14 @@ patches ? [ ], }: let - version = "4.6.2"; + version = "4.6.3"; in applyPatches { src = fetchFromGitHub { owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-RA9yGmWyzwiD/skPxOB27hqRxMqKGFmMMDOvHR5FjqI="; + hash = "sha256-NMeI8Ev0CSIf0dfbjqVAmFuTU9MFC8Y3qO9gI3p8Y+4="; passthru = { inherit version; yarnHash = "sha256-G1keSWDDpp0vBAOqQI8y8n7bmAeo9Hrdbo7R+cVZQwE="; From e886b7d92cc68c4db521596bbdb428f372c88c65 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 3 Jul 2026 18:06:05 +0000 Subject: [PATCH 226/252] radicle-desktop: 0.12.0 -> 0.13.0 Changelog: https://radicle.network/nodes/seed.radicle.dev/rad:z4D5UCArafTzTQpDZNQRuqswh3ury/tree/CHANGELOG.md --- pkgs/by-name/ra/radicle-desktop/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ra/radicle-desktop/package.nix b/pkgs/by-name/ra/radicle-desktop/package.nix index 7f70f73de9da..280879f22948 100644 --- a/pkgs/by-name/ra/radicle-desktop/package.nix +++ b/pkgs/by-name/ra/radicle-desktop/package.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "radicle-desktop"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromRadicle { seed = "seed.radicle.dev"; repo = "z4D5UCArafTzTQpDZNQRuqswh3ury"; tag = "releases/${finalAttrs.version}"; - hash = "sha256-lbLBtLOBLf+w2Oq56JwXtouDykNrRZyrMxYX9131lf8="; + hash = "sha256-XpzOzyUwAGLF/klXXbBFX5oLRSURB+AsL8n9WWv5x7s="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git_head @@ -53,10 +53,10 @@ rustPlatform.buildRustPackage (finalAttrs: { npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - hash = "sha256-7dXQ7wRJ2ZzuSplFdZTlfMetYPYA6/GODkuYjFRWfu0="; + hash = "sha256-EigvRDUmiuz/wt5vZ3NSxovxjvxHVGrHdA9HIod/fO8="; }; - cargoHash = "sha256-UOk9v6tNshe6pNYU2djz50Ep7BEdUd4bLkGadO5VUb0="; + cargoHash = "sha256-HInTwQYuLVFnRCbQq2hNRPGJP1I9gBRQZQ9ul3DWtBQ="; twemojiAssets = fetchFromGitHub { owner = "twitter"; From 4af074100f497298d819887b22a1b4efead158f3 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 3 Jul 2026 20:12:17 +0200 Subject: [PATCH 227/252] mdfried: move env variables into env for structuredAttrs New instances of environment variables outside of env should not be introduced. --- pkgs/by-name/md/mdfried/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/md/mdfried/package.nix b/pkgs/by-name/md/mdfried/package.nix index c6ff3e1ca665..52eac913a73a 100644 --- a/pkgs/by-name/md/mdfried/package.nix +++ b/pkgs/by-name/md/mdfried/package.nix @@ -59,8 +59,10 @@ rustPlatform.buildRustPackage (finalAttrs: { libiconv ]; - CFLAGS_aarch64_apple_darwin = lib.optionalString stdenv.hostPlatform.isDarwin "-UTARGET_OS_MAC"; - CXXFLAGS_aarch64_apple_darwin = lib.optionalString stdenv.hostPlatform.isDarwin "-UTARGET_OS_MAC"; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + CFLAGS_aarch64_apple_darwin = "-UTARGET_OS_MAC"; + CXXFLAGS_aarch64_apple_darwin = "-UTARGET_OS_MAC"; + }; doCheck = true; From 4ed0e68851d523833197e5de09d0bceda3aac395 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 3 Jul 2026 17:26:35 +0000 Subject: [PATCH 228/252] obliteratus: 0.1.2-unstable-2026-03-05 -> 0-unstable-2026-06-17 --- pkgs/by-name/ob/obliteratus/package.nix | 55 ++++++++++++++++++------- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ob/obliteratus/package.nix b/pkgs/by-name/ob/obliteratus/package.nix index 71e950eb9c22..bab9f30f17b4 100644 --- a/pkgs/by-name/ob/obliteratus/package.nix +++ b/pkgs/by-name/ob/obliteratus/package.nix @@ -1,26 +1,27 @@ { lib, - python3, + stdenv, + python3Packages, fetchFromGitHub, + nix-update-script, }: -python3.pkgs.buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "obliteratus"; - version = "0.1.2-unstable-2026-03-05"; + version = "0-unstable-2026-06-17"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "elder-plinius"; repo = "OBLITERATUS"; - rev = "984ce140592a9385347934f9ca647413ba9fac76"; - hash = "sha256-U5DcRC1/IEQRlBGLIfsCX48ZCxPkpzEhg8qIw3ytJps="; + rev = "a5a1ffa5849b442cf188b3c03fd4de71ddf5bdcc"; + hash = "sha256-IxIpUlVlZRzXan53mCCsH8AYg/ajNofSm56iUO9XPrg="; }; - __structuredAttrs = true; + build-system = with python3Packages; [ setuptools ]; - build-system = with python3.pkgs; [ setuptools ]; - - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ accelerate bitsandbytes datasets @@ -37,18 +38,44 @@ python3.pkgs.buildPythonApplication (finalAttrs: { transformers ]; - optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3Packages; { spaces = [ gradio ]; }; - nativeCheckInputs = with python3.pkgs; [ + pythonImportsCheck = [ "obliteratus" ]; + + nativeCheckInputs = with python3Packages; [ pytest-cov-stub pytestCheckHook ]; - # This increases the build time significantly - # ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); - pythonImportsCheck = [ "obliteratus" ]; + disabledTestPaths = [ + # These tests reference `obliteratus.models.loader._select_model_class`, which upstream + # removed/renamed without updating the tests or the benchmark script. + "tests/test_gemma4_hard_tier_bench.py" + "tests/test_gemma4_support.py" + ]; + + disabledTests = [ + # Upstream tests that hardcode expectations the implementation has since outgrown + # (e.g. 512 prompts vs the current 842, a stale method set, changed pipeline defaults). + "test_default_values" + "test_informed_method_in_abliterate_methods" + "test_informed_method_standalone" + "test_inherits_base_pipeline" + "test_linear_cone_fewer_directions" + "test_methods_exist" + "test_prompt_count_512" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox: + # RuntimeError: Failed to initialize cpuinfo! + "test_output_dtype_preserved" + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; meta = { description = "Ablation Suite for HuggingFace transformers"; From f827eb15c2c8eb8a864acb1373c51460c9bcd606 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jul 2026 19:33:27 +0000 Subject: [PATCH 229/252] terraform-providers.aiven_aiven: 4.59.0 -> 4.60.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 29b4d81234c6..a90d769f1627 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -27,13 +27,13 @@ "vendorHash": null }, "aiven_aiven": { - "hash": "sha256-+iZbQ5V8DQXBRHlt3UuSa3WKbC5A0ootY4AQ6leTHBo=", + "hash": "sha256-rXoDdoBK4yS/suC6lEnK+dWxcILRG+XcMNXVyVmeQYw=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.59.0", + "rev": "v4.60.0", "spdx": "MIT", - "vendorHash": "sha256-NWkgbkjaaA0dxphUWhiNqBaUKobdjsMEvD05WShZHHQ=" + "vendorHash": "sha256-4S5uyvSjtEOO1hK5MhuAmjsPBJ6qC1KN3/mrtRHU+P4=" }, "akamai_akamai": { "hash": "sha256-M6Btq8wX1lsEs1HUaaTwGspnvS2IyE0L2ITe+ogDTlc=", From 125ba423c86f6765332eb3d9f6fb565a73d97709 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jul 2026 19:34:42 +0000 Subject: [PATCH 230/252] terraform-providers.hashicorp_google-beta: 7.38.0 -> 7.39.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 29b4d81234c6..007a18c341ea 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -589,13 +589,13 @@ "vendorHash": "sha256-ayt8FR4684ZV5kd6exMw0AEgkMJLW5huvTYZqcr3q/s=" }, "hashicorp_google-beta": { - "hash": "sha256-LbNsD7R+TP9trNaMZq+OTyGlQPR6EZoSdUx3uo+3xUo=", + "hash": "sha256-pEdNv1MViCsCb3wFoDghCeQ5q2FErtGrQL9noL5B11g=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v7.38.0", + "rev": "v7.39.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-JAxI/E8GlUZd3RlhsrIhGm4+G18/obms+czJORYCENY=" + "vendorHash": "sha256-u4zldvOO/TtNHC8B+c63DWMbk7iEix+S+y/RLExchI8=" }, "hashicorp_helm": { "hash": "sha256-Dw6khnp0pronRKbBv2gx8ygtVvRV9uQIHCXj2BblZ6k=", From 541b3201ffea61cf28338e597506a24d64220490 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jul 2026 19:41:40 +0000 Subject: [PATCH 231/252] mathjax: 4.1.2 -> 4.1.3 --- pkgs/by-name/ma/mathjax/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mathjax/package.nix b/pkgs/by-name/ma/mathjax/package.nix index a7f6bc9c3590..7bedaa251fa7 100644 --- a/pkgs/by-name/ma/mathjax/package.nix +++ b/pkgs/by-name/ma/mathjax/package.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mathjax"; - version = "4.1.2"; + version = "4.1.3"; src = fetchFromGitHub { owner = "mathjax"; repo = "mathjax"; tag = finalAttrs.version; - hash = "sha256-x4aRA1EDBpx/PmWF8YmWs1Le7yX/hJo0Egrhc/nrWsE="; + hash = "sha256-Vl4gh2GRnlLkTV1o41WV6WBccjr+bnbq6JPcHGwfKXQ="; }; installPhase = '' From 87e4ff403f8d58eacb616afd5865ecd964cf8f64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jul 2026 19:49:46 +0000 Subject: [PATCH 232/252] mcp-gateway: 2.19.0 -> 3.0.1 --- pkgs/by-name/mc/mcp-gateway/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mc/mcp-gateway/package.nix b/pkgs/by-name/mc/mcp-gateway/package.nix index 582fb3a18536..4ab47070867b 100644 --- a/pkgs/by-name/mc/mcp-gateway/package.nix +++ b/pkgs/by-name/mc/mcp-gateway/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mcp-gateway"; - version = "2.19.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "MikkoParkkola"; repo = "mcp-gateway"; tag = "v${finalAttrs.version}"; - hash = "sha256-Rt2FoIBSFEA9Zgy27ZlVeVOgI3NF09FuPC+XW/WV8Ns="; + hash = "sha256-BtKPUKcZFu1ybnDmp9yme5/2/gzv1ASQ5E9G/QZClOc="; }; - cargoHash = "sha256-tMIsJkHxSNxwLkgoqVoSK1EFRgnhoCej7nAwcZcmLlQ="; + cargoHash = "sha256-hzx9qyqMk3kK8iCRYPtwGqXTQBaQUtt+l6KEn3KF1WE="; nativeInstallCheckInputs = [ versionCheckHook From 62588547a1e2cc5ab4cd235a89a2e4eb7ee593be Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 3 Jul 2026 22:20:25 +0200 Subject: [PATCH 233/252] python3Packages.rns: 1.3.5 -> 1.3.6 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 49174a8f8eab..eb9d0c8ceb83 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "rns"; - version = "1.3.5"; + version = "1.3.6"; pyproject = true; __structuredAttrs = true; src = fetchPypi { pname = "rns"; version = finalAttrs.version; - hash = "sha256-YxReocD6Ump5FMCnLEqCJ5tZcZh1kYsFWNBJ0pGYzuM="; + hash = "sha256-vys4vHAoSDenUzVTHiN8s+o3yy/APS9pOz4/XYvdsig="; }; patches = [ From b67cbb5907e32726ad0829cf0015f4d3e34e242c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jul 2026 20:22:59 +0000 Subject: [PATCH 234/252] pyrefly: 1.1.1 -> 1.2.0-dev.1 --- pkgs/by-name/py/pyrefly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix index a6466acfa2a1..0ee8ddbfeaf9 100644 --- a/pkgs/by-name/py/pyrefly/package.nix +++ b/pkgs/by-name/py/pyrefly/package.nix @@ -10,18 +10,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "pyrefly"; - version = "1.1.1"; + version = "1.2.0-dev.1"; src = fetchFromGitHub { owner = "facebook"; repo = "pyrefly"; tag = finalAttrs.version; - hash = "sha256-GHH+oG3oUEmGNEmtrmra321UIgRD04Eq1Ct0H7VsjxU="; + hash = "sha256-qi2ImB2fuaDJWlJpPSlopZZmdGplEGm6+31yNOP+b8g="; }; buildAndTestSubdir = "pyrefly"; - cargoHash = "sha256-vOHcmYVKlsxueWjvCCDWwSfJt+2/71b5+NdQyW3jYH4="; + cargoHash = "sha256-Q/xB79oR0yvXCT1bCPU82LUDrGpTUMt+uy67Si+mWL8="; buildInputs = [ rust-jemalloc-sys ]; From 1ec413ad635782eb17d5475f8092618fb11dc62c Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 3 Jul 2026 20:01:07 +0200 Subject: [PATCH 235/252] python3Packages.libtmux: 0.59.0 -> 0.60.0 Diff: https://github.com/tmux-python/libtmux/compare/v0.59.0...v0.60.0 Changelog: https://github.com/tmux-python/libtmux/raw/v0.60.0/CHANGES --- pkgs/development/python-modules/libtmux/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 8a648f904396..f9fbb25f1f5c 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "libtmux"; - version = "0.59.0"; + version = "0.60.0"; pyproject = true; src = fetchFromGitHub { owner = "tmux-python"; repo = "libtmux"; tag = "v${finalAttrs.version}"; - hash = "sha256-RsK3nVGpgNX05tCc5kK5GFLUS5vVoe8NRKgg7Y/DzwM="; + hash = "sha256-1h+qkQDYRwP2peMOvKC1kk4DFcG4cwuBApsF8MmkWbo="; }; patches = [ ./0001-fix-test_control_mode_stdout_preserves_non_ascii_out.patch ]; @@ -45,7 +45,12 @@ buildPythonPackage (finalAttrs: { enabledTestPaths = [ "tests" ]; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test/test_retry.py" ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + disabledTests = [ + # test is broken for tmux 3.7a and later + # https://github.com/tmux-python/libtmux/issues/697 + "test_new_window_name_invalid_on_3_7" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Fail with: 'no server running on /tmp/tmux-1000/libtmux_test8sorutj1'. "test_new_session_width_height" # AssertionError: assert '' == '$' From 4055b857d7a3c7fa62f624fe3cbc89182ca6c005 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 3 Jul 2026 19:59:02 +0200 Subject: [PATCH 236/252] tmuxp: 1.71.0 -> 1.73.0 Changelog: https://github.com/tmux-python/tmuxp/raw/v1.73.0/CHANGES --- pkgs/by-name/tm/tmuxp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tm/tmuxp/package.nix b/pkgs/by-name/tm/tmuxp/package.nix index af15e89c0bdc..621044b3d72f 100644 --- a/pkgs/by-name/tm/tmuxp/package.nix +++ b/pkgs/by-name/tm/tmuxp/package.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "tmuxp"; - version = "1.71.0"; + version = "1.73.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-+Nsr4gNem/gB6ZMre53rfuM8Kwkiu86aGJmrxiFRorY="; + hash = "sha256-UExY0hC7HDWeISQ/mMZLMcMnqDko4i188MyoDbNePZc="; }; build-system = with python3Packages; [ From 2522c876111eb36ff3a0d7a2ac74f11927345f87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jul 2026 20:25:35 +0000 Subject: [PATCH 237/252] awsebcli: 3.27.2 -> 3.27.3 --- pkgs/by-name/aw/awsebcli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index 580885fb4d06..6efd8d221e81 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -27,7 +27,7 @@ in python.pkgs.buildPythonApplication (finalAttrs: { pname = "awsebcli"; - version = "3.27.2"; + version = "3.27.3"; pyproject = true; doInstallCheck = true; @@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { owner = "aws"; repo = "aws-elastic-beanstalk-cli"; tag = finalAttrs.version; - hash = "sha256-hTRgNqccwbXxpS4F+JD2h19N/U671NjCBEMiDp6Jbio="; + hash = "sha256-p7W9HoFND28jcqrMp7cFOzmarxvcA3wFhrOCHyvoj5E="; }; pythonRelaxDeps = [ From 84820487702f8f2f79d4cc4b93ad6f8d029fe64d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 3 Jul 2026 22:40:16 +0200 Subject: [PATCH 238/252] python3Packages.rns: 1.3.6 -> 1.3.7 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index eb9d0c8ceb83..f4cd9aa06afc 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "rns"; - version = "1.3.6"; + version = "1.3.7"; pyproject = true; __structuredAttrs = true; src = fetchPypi { pname = "rns"; version = finalAttrs.version; - hash = "sha256-vys4vHAoSDenUzVTHiN8s+o3yy/APS9pOz4/XYvdsig="; + hash = "sha256-Z1fbZcCvISs4a35EuV7aTjbWsRyug0JYvG0tEdrG4SU="; }; patches = [ From da2a179a76e823dfe3e2bb9ac10b9e71a96204d7 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 3 Jul 2026 23:23:37 +0200 Subject: [PATCH 239/252] hardinfo2: 2.2.16 -> 2.3.1 --- pkgs/by-name/ha/hardinfo2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/hardinfo2/package.nix b/pkgs/by-name/ha/hardinfo2/package.nix index 756d1297b2ef..a91f768a4cfa 100644 --- a/pkgs/by-name/ha/hardinfo2/package.nix +++ b/pkgs/by-name/ha/hardinfo2/package.nix @@ -51,13 +51,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hardinfo2"; - version = "2.2.16"; + version = "2.3.1"; src = fetchFromGitHub { owner = "hardinfo2"; repo = "hardinfo2"; tag = "release-${finalAttrs.version}"; - hash = "sha256-n/Rf/XKsATx3OEzYSjl+2Yzk7WSiaBkbOveA9+xR6fc="; + hash = "sha256-rrb7iwR5kd7kJSncbE+yzdG55L7IaF7919kLsl/A5pY="; }; patches = [ From 3a6a36c8c39d7707f13b23f9602a340dcfa81e43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jul 2026 21:33:20 +0000 Subject: [PATCH 240/252] terraform-providers.ubiquiti-community_unifi: 0.53.0 -> 0.54.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 29b4d81234c6..a50c770179c9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1409,11 +1409,11 @@ "vendorHash": null }, "ubiquiti-community_unifi": { - "hash": "sha256-7lmT0ZCRfu3nL1FXAdxMxvQURtNcZiz9GY+0d7HI2N0=", + "hash": "sha256-wqR9XIuH9QzzacdOd8Z+QcfTXwjjnTQA8SbEHcLYhig=", "homepage": "https://registry.terraform.io/providers/ubiquiti-community/unifi", "owner": "ubiquiti-community", "repo": "terraform-provider-unifi", - "rev": "v0.53.0", + "rev": "v0.54.0", "spdx": "MPL-2.0", "vendorHash": "sha256-XPEH1zya7e/3N/HxBPN/vZxFU5GOOXfBPTrnZEUzdpw=" }, From c1f04f375c0e8ecf8d8fa81e99b0d41f2c1788b3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 24 Jun 2026 18:52:18 +0000 Subject: [PATCH 241/252] python3Packages.torch: fix inductor on darwin --- pkgs/development/python-modules/torch/source/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix index f807e1a696e4..1f1a5948f586 100644 --- a/pkgs/development/python-modules/torch/source/default.nix +++ b/pkgs/development/python-modules/torch/source/default.nix @@ -385,6 +385,15 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: { # until https://github.com/pytorch/pytorch/issues/76082 is addressed + lib.optionalString cudaSupport '' rm cmake/Modules/FindCUDAToolkit.cmake + '' + # Otherwise, torch compile will fail at runtime if openmp is not available + # torch._inductor.exc.InductorError: CppCompileError: C++ compile error + # fatal error: 'omp.h' file not found + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace torch/csrc/inductor/cpp_prefix.h \ + --replace-fail \ + "#include " \ + '#include "${lib.getInclude llvmPackages.openmp}/include/omp.h"' ''; # NOTE(@connorbaker): Though we do not disable Gloo or MPI when building with CUDA support, caution should be taken From 08114f95db01f307ab5ad776ea13348189510353 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 24 Jun 2026 18:58:04 +0000 Subject: [PATCH 242/252] python3Packages: remove unnecessary llvmPackages.openmp inclusions --- .../python-modules/accelerate/default.nix | 2 -- .../python-modules/compressed-tensors/default.nix | 5 ----- pkgs/development/python-modules/e3nn/default.nix | 6 ------ .../development/python-modules/hoptorch/default.nix | 6 ------ pkgs/development/python-modules/lerobot/default.nix | 5 ----- pkgs/development/python-modules/skorch/default.nix | 2 -- .../python-modules/torch/source/default.nix | 2 +- pkgs/development/python-modules/torchao/default.nix | 7 ------- .../python-modules/torchaudio/default.nix | 13 +++---------- .../python-modules/torchmd-net/default.nix | 7 ------- 10 files changed, 4 insertions(+), 51 deletions(-) diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index a97f2498d6e2..13817fe7278b 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -44,8 +44,6 @@ buildPythonPackage (finalAttrs: { hash = "sha256-IfKePiU38fUd5HefaS7J1s8Mb6hVmldINemxAJY+83o="; }; - buildInputs = [ llvmPackages.openmp ]; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/compressed-tensors/default.nix b/pkgs/development/python-modules/compressed-tensors/default.nix index 06f3b6d3e459..5d89c2097ad0 100644 --- a/pkgs/development/python-modules/compressed-tensors/default.nix +++ b/pkgs/development/python-modules/compressed-tensors/default.nix @@ -7,7 +7,6 @@ # build-system setuptools, setuptools-scm, - llvmPackages, # dependencies frozendict, @@ -47,10 +46,6 @@ buildPythonPackage (finalAttrs: { setuptools-scm ]; - buildInputs = lib.optionals stdenv.cc.isClang [ - llvmPackages.openmp - ]; - dependencies = [ frozendict loguru diff --git a/pkgs/development/python-modules/e3nn/default.nix b/pkgs/development/python-modules/e3nn/default.nix index 4382881a2302..372a0c7359e2 100644 --- a/pkgs/development/python-modules/e3nn/default.nix +++ b/pkgs/development/python-modules/e3nn/default.nix @@ -62,12 +62,6 @@ buildPythonPackage (finalAttrs: { "test_variance" ]; - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - # Otherwise, torch will fail to include `omp.h`: - # torch._inductor.exc.InductorError: CppCompileError: C++ compile error OpenMP support not found - llvmPackages.openmp - ]; - meta = { description = "Modular framework for neural networks with Euclidean symmetry"; homepage = "https://github.com/e3nn/e3nn"; diff --git a/pkgs/development/python-modules/hoptorch/default.nix b/pkgs/development/python-modules/hoptorch/default.nix index 791367818bd8..e9871e0f629e 100644 --- a/pkgs/development/python-modules/hoptorch/default.nix +++ b/pkgs/development/python-modules/hoptorch/default.nix @@ -40,12 +40,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "hoptorch" ]; - checkInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - # torch._inductor.exc.InductorError: CppCompileError: C++ compile error - # fatal error: 'omp.h' file not found - llvmPackages.openmp - ]; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/lerobot/default.nix b/pkgs/development/python-modules/lerobot/default.nix index f0fab063e976..7092e229d80e 100644 --- a/pkgs/development/python-modules/lerobot/default.nix +++ b/pkgs/development/python-modules/lerobot/default.nix @@ -59,11 +59,6 @@ buildPythonPackage (finalAttrs: { ]; dontUseCmakeConfigure = true; - checkInputs = lib.optionals stdenv.cc.isClang [ - # test_async_iterator_* hangs after failing to find OMP headers - llvmPackages.openmp - ]; - pythonRelaxDeps = [ "av" "diffusers" diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index b916413ab003..ede1c6551fa4 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -53,8 +53,6 @@ buildPythonPackage rec { transformers ]; - checkInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; - disabledTests = [ # on CPU, these expect artifacts from previous GPU run "test_load_cuda_params_to_cpu" diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix index 1f1a5948f586..19a85037b016 100644 --- a/pkgs/development/python-modules/torch/source/default.nix +++ b/pkgs/development/python-modules/torch/source/default.nix @@ -389,7 +389,7 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: { # Otherwise, torch compile will fail at runtime if openmp is not available # torch._inductor.exc.InductorError: CppCompileError: C++ compile error # fatal error: 'omp.h' file not found - + lib.optionalString stdenv.hostPlatform.isDarwin '' + + lib.optionalString stdenv.cc.isClang '' substituteInPlace torch/csrc/inductor/cpp_prefix.h \ --replace-fail \ "#include " \ diff --git a/pkgs/development/python-modules/torchao/default.nix b/pkgs/development/python-modules/torchao/default.nix index ae20677483af..d401264b71c2 100644 --- a/pkgs/development/python-modules/torchao/default.nix +++ b/pkgs/development/python-modules/torchao/default.nix @@ -77,13 +77,6 @@ buildPythonPackage (finalAttrs: { cpuinfo ]; - propagatedBuildInputs = lib.optionals isDarwin [ - # Otherwise, torch will fail to include `omp.h`: - # torch._inductor.exc.InductorError: CppCompileError: C++ compile error - # OpenMP support not found. - llvmPackages.openmp - ]; - dependencies = [ torch ]; diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index 9c1e4b494cc7..5c3eba58afdb 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -4,9 +4,6 @@ buildPythonPackage, fetchFromGitHub, - # buildInputs - llvmPackages, - # build-system setuptools, @@ -89,13 +86,9 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { cudaPackages.cuda_nvcc ]; - buildInputs = - lib.optionals cudaSupport [ - cudaPackages.cuda_cudart - ] - ++ lib.optionals torch.stdenv.cc.isClang [ - llvmPackages.openmp - ]; + buildInputs = lib.optionals cudaSupport [ + cudaPackages.cuda_cudart + ]; dependencies = [ torch diff --git a/pkgs/development/python-modules/torchmd-net/default.nix b/pkgs/development/python-modules/torchmd-net/default.nix index 5651c4428ef9..6eea291ec433 100644 --- a/pkgs/development/python-modules/torchmd-net/default.nix +++ b/pkgs/development/python-modules/torchmd-net/default.nix @@ -22,7 +22,6 @@ pytest-xdist, pytestCheckHook, writableTmpDirAsHomeHook, - llvmPackages, }: buildPythonPackage (finalAttrs: { @@ -66,12 +65,6 @@ buildPythonPackage (finalAttrs: { writableTmpDirAsHomeHook ]; - checkInputs = lib.optionals stdenv.cc.isClang [ - # torch._inductor.exc.InductorError: CppCompileError: C++ compile error - # fatal error: 'omp.h' file not found - llvmPackages.openmp - ]; - disabledTests = [ # Require internet access "test_dataset_s66x8" From b3f0f9057fa40226c7192faea38e94158a1ae8d4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 28 Jun 2026 23:00:31 +0000 Subject: [PATCH 243/252] python3Packages.skorch: re-enable on darwin --- pkgs/development/python-modules/skorch/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index ede1c6551fa4..e3380eb8166e 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -90,10 +90,5 @@ buildPythonPackage rec { changelog = "https://github.com/skorch-dev/skorch/blob/master/CHANGES.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bcdarwin ]; - badPlatforms = [ - # Most tests fail with: - # Fatal Python error: Segmentation fault - lib.systems.inspect.patterns.isDarwin - ]; }; } From 589077b08ac0139f013342a9ea3e044bdd0f5a73 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 28 Jun 2026 23:00:38 +0000 Subject: [PATCH 244/252] python3Packages.skorch: cleanup --- .../python-modules/skorch/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index e3380eb8166e..82e9d14614f7 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -1,35 +1,40 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system + setuptools, + + # dependencies numpy, + pandas, scikit-learn, scipy, - setuptools, tabulate, torch, tqdm, + + # tests flaky, - llvmPackages, openssl, - pandas, pytest-cov-stub, pytestCheckHook, safetensors, transformers, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "skorch"; version = "1.4.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "skorch-dev"; repo = "skorch"; - tag = "v${version}"; - sha256 = "sha256-il3S5cfW47tKvMQGr/BfbEjMEMVzBF4gSrQhR1uKxks="; + tag = "v${finalAttrs.version}"; + hash = "sha256-il3S5cfW47tKvMQGr/BfbEjMEMVzBF4gSrQhR1uKxks="; }; build-system = [ setuptools ]; @@ -75,6 +80,7 @@ buildPythonPackage rec { "skorch/tests/test_dataset.py" "skorch/tests/test_hf.py" "skorch/tests/llm/test_llm_classifier.py" + # These tests fail when running in parallel for all platforms with: # "RuntimeError: The server socket has failed to listen on any local # network address because they use the same hardcoded port." @@ -91,4 +97,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bcdarwin ]; }; -} +}) From a74832c7732d22f485db72d83ff00bc65a3f598f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 28 Jun 2026 23:05:27 +0000 Subject: [PATCH 245/252] python3Packages.torchaudio: add missing test dependencies --- .../python-modules/torchaudio/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index 5c3eba58afdb..a727d78159fe 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -14,12 +14,17 @@ # tests expecttest, inflect, + librosa, parameterized, pytestCheckHook, pytorch-lightning, + requests, scipy, sentencepiece, + soundfile, unidecode, + # linux-only: + fairseq, # passthru torchaudio, @@ -106,11 +111,21 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { scipy sentencepiece unidecode + librosa + requests + soundfile + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + fairseq ]; disabledTestPaths = [ # Require internet access "test/integration_tests" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Passes, but hangs the build after Pytest completes + "test/torchaudio_unittest/models/models_test.py::TestConvTasNet" ]; disabledTests = [ From 219b236583e83255913d1da7a6d79e0261da8194 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 29 Jun 2026 09:55:32 +0000 Subject: [PATCH 246/252] python3Packages.compressed-tensors: skip failing test on darwin --- pkgs/development/python-modules/compressed-tensors/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/compressed-tensors/default.nix b/pkgs/development/python-modules/compressed-tensors/default.nix index 5d89c2097ad0..2c143c869b5c 100644 --- a/pkgs/development/python-modules/compressed-tensors/default.nix +++ b/pkgs/development/python-modules/compressed-tensors/default.nix @@ -93,6 +93,9 @@ buildPythonPackage (finalAttrs: { "test_mxfp8_scales_e2e" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # AssertionError: Numerical precision error + "test_quantization_enabled_disabled" + # torch._inductor.exc.InductorError: ImportError: dlopen(/nix/var/nix/builds/nix-25002-542173852/torchinductor__nixbld1/xo/cxovsevcfanmw7lgoddbnyhoxes3nzlu7ecugxedaq2zr4f6b2qh.main.so, 0x0002): # symbol not found in flat namespace '___kmpc_barrier' "test_compress_decompress_module" From 6507a11a46009c66b7310c52f682a8ce2bd188a6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 2 Jul 2026 22:48:47 +0000 Subject: [PATCH 247/252] python3Packages.torchmd-net: allow test to run without MPS support on darwin --- pkgs/development/python-modules/torchmd-net/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/torchmd-net/default.nix b/pkgs/development/python-modules/torchmd-net/default.nix index 6eea291ec433..2d1750a5141d 100644 --- a/pkgs/development/python-modules/torchmd-net/default.nix +++ b/pkgs/development/python-modules/torchmd-net/default.nix @@ -42,6 +42,13 @@ buildPythonPackage (finalAttrs: { setuptools-scm ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # NotImplementedError: The operator 'torchmdnet::warp_neighbor_brute_fwd' is not currently implemented for the MPS device. + # As a temporary fix, you can set the environment variable `PYTORCH_ENABLE_MPS_FALLBACK=1` to use the CPU as a fallback for this op. + # WARNING: this will be slower than running natively on MPS. + PYTORCH_ENABLE_MPS_FALLBACK = true; + }; + pythonRemoveDeps = [ # Not a runtime dependency "setuptools" From 88ef80234b8137b8d14bb2dad887ee40096f7657 Mon Sep 17 00:00:00 2001 From: Zain Kergaye Date: Tue, 30 Jun 2026 20:16:39 -0600 Subject: [PATCH 248/252] vimPlugins.neovim-session-manager: init at 0-unstable-2026-01-26 https://github.com/shatur/neovim-session-manager --- .../applications/editors/vim/plugins/generated.nix | 14 ++++++++++++++ .../applications/editors/vim/plugins/overrides.nix | 6 ++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 21 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index e0d4bf9c60c4..e3c57c3d9957 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -11764,6 +11764,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + neovim-session-manager = buildVimPlugin { + pname = "neovim-session-manager"; + version = "0-unstable-2026-01-26"; + src = fetchFromGitHub { + owner = "shatur"; + repo = "neovim-session-manager"; + rev = "89d253a6c68af60b49570044591d5b8701866601"; + hash = "sha256-d7lXPIy6qJDPvFk8twwkqKUWI205HfTqXMspnVRkng0="; + }; + meta.homepage = "https://github.com/shatur/neovim-session-manager/"; + meta.license = getLicenseFromSpdxId "GPL-3.0-only"; + meta.hydraPlatforms = [ ]; + }; + neovim-tips = buildVimPlugin { pname = "neovim-tips"; version = "0.8.4"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index cf9135882aa8..88efdcacbe04 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3025,6 +3025,12 @@ assertNoAdditions { }; }); + neovim-session-manager = super.neovim-session-manager.overrideAttrs { + dependencies = with self; [ + plenary-nvim + ]; + }; + neovim-tips = super.neovim-tips.overrideAttrs { dependencies = [ self.nui-nvim diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d82da3ff21fb..6b3fbe378e93 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -838,6 +838,7 @@ https://github.com/Shatur/neovim-ayu/,, https://github.com/cloudhead/neovim-fuzzy/,, https://github.com/coffebar/neovim-project/,, https://github.com/jeffkreeftmeijer/neovim-sensible/,, +https://github.com/shatur/neovim-session-manager/,, https://github.com/saxon1964/neovim-tips/,, https://github.com/trunk-io/neovim-trunk/,, https://github.com/Shougo/neoyank.vim/,, From 195b95f5acea38cdc9f00738326b2892b393cc7f Mon Sep 17 00:00:00 2001 From: Grace Lovelace Date: Fri, 3 Jul 2026 09:37:00 -0700 Subject: [PATCH 249/252] peertube: 8.1.8 -> 8.2.2 Important security fix, CR comments. --- pkgs/by-name/pe/peertube/package.nix | 58 ++++++++++++++-------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix index dcc6bac700ac..408dd20c1d2d 100644 --- a/pkgs/by-name/pe/peertube/package.nix +++ b/pkgs/by-name/pe/peertube/package.nix @@ -21,13 +21,16 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "peertube"; - version = "8.1.8"; + version = "8.2.2"; + + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ei7MgEyHDJyLXnjI8mT7S7pLno+pTmFWZHc6oEZaTcM="; + hash = "sha256-huyuaCWJ3w1KHCcQFjH2ZcofPjqwjLpLt+dg6auD/dQ="; }; outputs = [ @@ -40,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-fQ0FyBPZ3v3lCSoWYz1ccbOSrfgnzwQvOyE7Dp3ZGRY="; + hash = "sha256-qrx8JtIAmn0JEsFwptrHlOL0IaYPJPLzjuDWNs7XFfc="; }; nativeBuildInputs = [ @@ -49,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { jq pnpmConfigHook pnpm_10 + nodejs_24 which ]; @@ -69,8 +73,6 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - export HOME=$PWD - # Build PeerTube server npm run build:server @@ -79,22 +81,22 @@ stdenv.mkDerivation (finalAttrs: { # Build PeerTube cli npm run build:peertube-cli - patchShebangs ~/apps/peertube-cli/dist/peertube.mjs + patchShebangs ./apps/peertube-cli/dist/peertube.mjs # Build PeerTube runner npm run build:peertube-runner - patchShebangs ~/apps/peertube-runner/dist/peertube-runner.mjs + patchShebangs ./apps/peertube-runner/dist/peertube-runner.mjs # Clean up declaration files find \ - ~/dist/ \ - ~/packages/core-utils/dist/ \ - ~/packages/ffmpeg/dist/ \ - ~/packages/models/dist/ \ - ~/packages/node-utils/dist/ \ - ~/packages/server-commands/dist/ \ - ~/packages/transcription/dist/ \ - ~/packages/typescript-utils/dist/ \ + ./dist/ \ + ./packages/core-utils/dist/ \ + ./packages/ffmpeg/dist/ \ + ./packages/models/dist/ \ + ./packages/node-utils/dist/ \ + ./packages/server-commands/dist/ \ + ./packages/transcription/dist/ \ + ./packages/typescript-utils/dist/ \ \( -name '*.d.ts' -o -name '*.d.ts.map' \) -type f -delete runHook postBuild @@ -104,21 +106,21 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out/dist - mv ~/dist $out - mv ~/node_modules $out/node_modules + mv ./dist $out + mv ./node_modules $out/node_modules mkdir $out/client - mv ~/client/{dist,node_modules,package.json} $out/client + mv ./client/{dist,node_modules,package.json} $out/client mkdir -p $out/packages/{core-utils,ffmpeg,models,node-utils,server-commands,transcription,typescript-utils} - mv ~/packages/core-utils/{dist,package.json} $out/packages/core-utils - mv ~/packages/ffmpeg/{dist,package.json} $out/packages/ffmpeg - mv ~/packages/models/{dist,package.json} $out/packages/models - mv ~/packages/node-utils/{dist,package.json} $out/packages/node-utils - mv ~/packages/server-commands/{dist,package.json} $out/packages/server-commands - mv ~/packages/transcription/{dist,package.json} $out/packages/transcription - mv ~/packages/typescript-utils/{dist,package.json} $out/packages/typescript-utils - mv ~/{config,support,CREDITS.md,FAQ.md,LICENSE,README.md,package.json,pnpm-lock.yaml} $out + mv ./packages/core-utils/{dist,package.json} $out/packages/core-utils + mv ./packages/ffmpeg/{dist,package.json} $out/packages/ffmpeg + mv ./packages/models/{dist,package.json} $out/packages/models + mv ./packages/node-utils/{dist,package.json} $out/packages/node-utils + mv ./packages/server-commands/{dist,package.json} $out/packages/server-commands + mv ./packages/transcription/{dist,package.json} $out/packages/transcription + mv ./packages/typescript-utils/{dist,package.json} $out/packages/typescript-utils + mv ./{config,support,CREDITS.md,FAQ.md,LICENSE,README.md,package.json,pnpm-lock.yaml} $out # Remove broken symlinks in node_modules from workspace packages that aren't needed # by the built artifact. If any new packages break the check for broken symlinks, @@ -129,11 +131,11 @@ stdenv.mkDerivation (finalAttrs: { rm $out/client/node_modules/@peertube/player mkdir -p $cli/bin - mv ~/apps/peertube-cli/{dist,node_modules,package.json} $cli + mv ./apps/peertube-cli/{dist,node_modules,package.json} $cli ln -s $cli/dist/peertube.mjs $cli/bin/peertube-cli mkdir -p $runner/bin - mv ~/apps/peertube-runner/{dist,node_modules,package.json} $runner + mv ./apps/peertube-runner/{dist,node_modules,package.json} $runner ln -s $runner/dist/peertube-runner.mjs $runner/bin/peertube-runner # Create static gzip and brotli files From 99f3e057bb3ea44ad2f5ba6fe78ef6413a6cfc03 Mon Sep 17 00:00:00 2001 From: kkimdev <503414+kkimdev@users.noreply.github.com> Date: Wed, 1 Jul 2026 09:21:46 +0900 Subject: [PATCH 250/252] opencode-desktop: fix desktop file name and StartupWMClass to match app_id The Electron app sets its application ID to 'ai.opencode.desktop' via app.setAppUserModelId(), but the nixpkgs desktop file used name='opencode-desktop' with StartupWMClass='OpenCode'. This mismatch caused desktop environments (especially ChromeOS Crostini/sommelier-rs) to fail associating the running window with the launcher icon. Fix both values to match the app_id set by the upstream Electron app, aligning with the electron-builder config which already generates the desktop file as 'ai.opencode.desktop.desktop' with the correct StartupWMClass. Assisted-by: opencode --- pkgs/by-name/op/opencode-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/opencode-desktop/package.nix b/pkgs/by-name/op/opencode-desktop/package.nix index 87b15e49ed0d..e2a51d1b6051 100644 --- a/pkgs/by-name/op/opencode-desktop/package.nix +++ b/pkgs/by-name/op/opencode-desktop/package.nix @@ -124,11 +124,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; desktopItems = lib.optional stdenvNoCC.hostPlatform.isLinux (makeDesktopItem { - name = "opencode-desktop"; + name = "ai.opencode.desktop"; desktopName = "OpenCode"; exec = "opencode-desktop %U"; icon = "opencode-desktop"; - startupWMClass = "OpenCode"; + startupWMClass = "ai.opencode.desktop"; categories = [ "Development" ]; mimeTypes = [ "x-scheme-handler/opencode" ]; }); From bb6e0bdd29cd868ebb363e1d806c0cca0e5da435 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 4 Jul 2026 00:46:47 +0200 Subject: [PATCH 251/252] ungoogled-chromium: 149.0.7827.200-1 -> 150.0.7871.46-1 https://developer.chrome.com/blog/new-in-chrome-150 https://developer.chrome.com/release_notes/150 https://chromereleases.googleblog.com/2026/06/stable-channel-update-for-desktop_0175352312.html This update includes 433 security fixes. --- .../networking/browsers/chromium/info.json | 325 +++++++++--------- 1 file changed, 170 insertions(+), 155 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 6e075e7f9b3b..5cfa7b5ec201 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -838,28 +838,28 @@ } }, "ungoogled-chromium": { - "version": "149.0.7827.200", + "version": "150.0.7871.46", "deps": { "depot_tools": { - "rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90", - "hash": "sha256-Ttklyw6IdNeMExlzeiQg/qsCkTmqVhUJ34MFgYmCWD4=" + "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583", + "hash": "sha256-3atvbwYnFTA40MonAxSQWkF58Jku7O7fUzelGPQvDyY=" }, "gn": { - "version": "0-unstable-2026-05-01", - "rev": "1740f5c25bcac5a650ee3d1c1ec22bfa25fcd756", - "hash": "sha256-oFs7fZAZEs/gQ7X1A4uigo9+Y+iEN9sMMQYwAjEuD04=" + "version": "0-unstable-2026-05-27", + "rev": "3357c4f51b1a9e676378c695dd9c7e9911c35ee6", + "hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8=" }, "ungoogled-patches": { - "rev": "149.0.7827.200-1", - "hash": "sha256-D7c1ToAoUzAMpXoe60YPimRqe6/LRe0T95TduXUeTFo=" + "rev": "150.0.7871.46-1", + "hash": "sha256-SuZTPUpv7onrHvDrwZO0Xo/mxLVcGUSxf2xb+OC//L8=" }, "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "c35c164b1b6d1adca9eddf914ed6d0d0743dba6a", - "hash": "sha256-b2gBRUzRjqVZEb/tWUL1JF6Afq5gHJ3aOM02My1FyYU=", + "rev": "5b586c06e0d27582900f17e2d59c5370d8d6e0bb", + "hash": "sha256-OAZNyZtR5WFWW42r74RSy9fT7Eb7CNZwzoIHhuoqR28=", "recompress": true }, "src/third_party/clang-format/script": { @@ -869,13 +869,13 @@ }, "src/third_party/compiler-rt/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git", - "rev": "0408cce08083f3d81379ed7d9f5bd26c03e1495b", - "hash": "sha256-kR5osTmp2girvNRVHzEKMZDCelgux9RrRuMoXMCRSGM=" + "rev": "03641f7a5b05e48e318d64369057db577cafc594", + "hash": "sha256-KnWESGG6aI0S+fkJ3/T1x4QSiIYaOOvWUAm6l6l9iME=" }, "src/third_party/libc++/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "be1c391acca009d8d80535ce924e3d285451cdfa", - "hash": "sha256-zKb9PUiiBvhVhWnbQwR8uOFJ9gt3uYmfJ4M9ijpgKRc=" + "rev": "5abc7f839700f0f17338434e1c1c6a8c87c00c11", + "hash": "sha256-vT1km7JgVpotDoNK+ae1gplSHcwrVNLsv/QAFUrDsIM=" }, "src/third_party/libc++abi/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", @@ -884,13 +884,13 @@ }, "src/third_party/libunwind/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "71192be150bbe04d87bb5298512d464e38d2f654", - "hash": "sha256-PxXemxdWZoEavKDOovi67IVWEr2YW8YK2F0LXM3LZPw=" + "rev": "d6c7a21e978f0adaa43accaad53bc64f0b64f6ec", + "hash": "sha256-EuaVSYiR7qrlYqBR0UqdWCvwdzJSn0RS2wC/lnP19AE=" }, "src/third_party/llvm-libc/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git", - "rev": "deb95b5e48e875920a2eaae799c8dbcd76a6a4db", - "hash": "sha256-oAgIT3+vjBrX86jgi/Pb0SCyco0lozjBjXlrKm6i56M=" + "rev": "6e5ec6f78d8b9f2e8a50fcc5692d1fc8b2964bde", + "hash": "sha256-qrkx8Z1fc088Ja32obIUPxDwklI7i1wdEw051UZ08u8=" }, "src/chrome/test/data/perf/canvas_bench": { "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", @@ -909,8 +909,8 @@ }, "src/docs/website": { "url": "https://chromium.googlesource.com/website.git", - "rev": "c9a9ad55e9ec9934244e58a5a8cab9a295526010", - "hash": "sha256-2GKWEnlExrTzoIYMxeP4n2klLLT/phB5ZVJ5Nj3/aoY=" + "rev": "3da515a67f412be05ea1ea6b39832a69aef8f54e", + "hash": "sha256-wrkFsPX7jrsjD/Ow1gna/xLvk0E49m5GVxP1G7Vx7HM=" }, "src/media/cdm/api": { "url": "https://chromium.googlesource.com/chromium/cdm.git", @@ -919,8 +919,8 @@ }, "src/net/third_party/quiche/src": { "url": "https://quiche.googlesource.com/quiche.git", - "rev": "fafc2fe9efc9f2e28a0815229fc14ca30c266ba8", - "hash": "sha256-4UmjE41MOFCBa3APDMyyJwkeV6LhHl5UsMxZpPRDsRY=" + "rev": "997d654308b6a1a17435e472ef5190aecb12e3eb", + "hash": "sha256-xgDgW2foZZEWpr0ibSG21kf028FN07/1ecOqFCkNj/I=" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git", @@ -929,8 +929,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "355cc61af2aadd8f0494800325b2bf9908138108", - "hash": "sha256-fgaCyO0oaz90aTaWMHH8ocySA0hXDHsPEl6vtMj4BY0=" + "rev": "bbf3d8a4755268f016087be2f56099fa5a5f3f6e", + "hash": "sha256-8iuHtNgHumlMXeXj2k0ZPcvnTeJ00di298+789OjScs=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -944,13 +944,18 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "3fe33a325af90c1c820b1e8109f11ea0f4b60c9b", - "hash": "sha256-JgOdlwtjC5HiCWBAaeM+Ffp9KlbI7+erT0ZRZBlWxXI=" + "rev": "01471f4b3846c97eceb5b16b8acad950808791b2", + "hash": "sha256-SrL+G3osTtJGQslfCBEYbslb2kWtHRrwO87PHi+5o6E=" }, "src/third_party/anonymous_tokens/src": { "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", - "rev": "208ea23596884f6d86476ea88b64e7931cdec08a", - "hash": "sha256-HLUX0mUzA3xcXbw71sIxFBNEkL8x86urcdJH2Yuuy04=" + "rev": "92d1fdf881a932e7aa2a9b20e006136a659c7a20", + "hash": "sha256-llPt+UR8hY0yaJkYmq+A3ZfRRReuaXN09qpap6C28jc=" + }, + "src/third_party/aria-practices/src": { + "url": "https://chromium.googlesource.com/external/github.com/w3c/aria-practices.git", + "rev": "7b134ce6d19497cce8a67db4a9f59980baf853dc", + "hash": "sha256-POnvoO1KfzJj4CbcMPI0pUTRk5EtHLTOyKKmJCZdXOc=" }, "src/third_party/readability/src": { "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git", @@ -964,13 +969,13 @@ }, "src/third_party/dav1d/libdav1d": { "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "5cfc3832687e3229117203905faf5425ac6bc0d7", - "hash": "sha256-MWDDrb8P5AIFszY0u5gCrK+kZlbYffIt9Y1b/thXL7I=" + "rev": "62501cc7db378532d7e85ea434b70d57e1ba2cb0", + "hash": "sha256-5cpKTUnhR+QzQJR4KbAvdvqsWnT1fpH0g9MObv8Nx0c=" }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "54b4153cfef88e048f365f99b962478f0087dfe8", - "hash": "sha256-Bv30zz/pCNVzUl+mKCpusWc94poytv9ZFelZIcs+2B8=" + "rev": "01249a97332468dbdd6cf5edb8dd7bae77875de5", + "hash": "sha256-tzomo+GTec2zixxk61gtlma/sjcBImgbLMwA+mIp1LM=" }, "src/third_party/dawn/third_party/glfw3/src": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -979,8 +984,8 @@ }, "src/third_party/dawn/third_party/directx-shader-compiler/src": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "d73829d4e677ef00931e8e57de6d544396ab46cb", - "hash": "sha256-BIXNgVeF5x3BZWFWZ1Gz+zpNSOEl+hZWB0GgMEaNS2w=" + "rev": "35c1b99e9e552267da5efaea07c003e322d65777", + "hash": "sha256-pzBk+jUp/FUV8ahHquE0942Qw/DjAUemSM9fxdFJ0JA=" }, "src/third_party/dawn/third_party/directx-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", @@ -989,8 +994,8 @@ }, "src/third_party/dawn/third_party/OpenGL-Registry/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry", - "rev": "9cb90ca4902d588bef3c830fbb1da484893bd5fb", - "hash": "sha256-mWVORjrbNFINr5WKAIDVnPs2T+96vkxWqZdJwp8oT9I=" + "rev": "a30033d3e812c9bf10094f1010374a6b15e192eb", + "hash": "sha256-xLacUOSy783bCtv+wUnjVnNLwTQ3eLwUJtYXmELqekY=" }, "src/third_party/dawn/third_party/EGL-Registry/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry", @@ -999,8 +1004,8 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "5c6b119c4fa0d9059c45f7637df1fe26fc80a6e4", - "hash": "sha256-9DAdS2u2YtrCFJu0KTuwRJjTUNexFxdmnn7LkwQ+KiQ=" + "rev": "f08551b0fc4d6cfa5ba582a0235b571aa363102d", + "hash": "sha256-f5kWMnaod/Ved1Fz/vTkdL0ihSUnNM8XN5Ht3Vs1YpU=" }, "src/third_party/dawn/third_party/webgpu-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers", @@ -1024,8 +1029,8 @@ }, "src/third_party/boringssl/src": { "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "65818adf16411ca394625f5747a1af28faf95d2c", - "hash": "sha256-tcTTzQnBp8Od1jdDMrFoCr9bnW0OCjGqUjH3QMnusmo=" + "rev": "3a9254f16eda7a4c5d2260039ff23456a0a34de4", + "hash": "sha256-JuMnNppWhIFHYfk6ANIZLC7ABhqMseoV5LYV7slevBE=" }, "src/third_party/breakpad/breakpad": { "url": "https://chromium.googlesource.com/breakpad/breakpad.git", @@ -1039,13 +1044,8 @@ }, "src/third_party/catapult": { "url": "https://chromium.googlesource.com/catapult.git", - "rev": "6e4188cabb4f37314ea41e9adfcb2cf9b64e2641", - "hash": "sha256-/kleYYllR22KjxHT2gTMGf6LEUZ1Ud7j593fIIAgqAA=" - }, - "src/third_party/catapult/third_party/webpagereplay": { - "url": "https://chromium.googlesource.com/webpagereplay.git", - "rev": "b7ac48f52cd298e966a76eb054412915c3e445d4", - "hash": "sha256-smtwB6vzLgCAePz0jNfrpm8TxrxBnBkigLxERhxUEvE=" + "rev": "2852bb7e91e4995502ffb72b7ed21412ee157914", + "hash": "sha256-XYufVvzOXD4voZUWUvumQQqLNsx9sy0QmQzNzrgNEWg=" }, "src/third_party/ced/src": { "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", @@ -1064,13 +1064,13 @@ }, "src/third_party/cpu_features/src": { "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git", - "rev": "d3b2440fcfc25fe8e6d0d4a85f06d68e98312f5b", - "hash": "sha256-IBJc1sHHh4G3oTzQm1RAHHahsEECC+BDl14DHJ8M1Ys=" + "rev": "81d13c49649f0714dd41fb56bb246398b6584085", + "hash": "sha256-TrC1WMLAhko57rAyDCiAC/IJ0unAqVhyjkh7gKibyi4=" }, "src/third_party/cpuinfo/src": { "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "3681f0ce1446167d01dfe125d6db96ba2ac31c3c", - "hash": "sha256-PhWbzQgZSUb3eVyx+JTSnxVOAC2WzL2Dw1I9/6LEIsw=" + "rev": "ea6b9f1bb6e1001d8b21574d5bc78ddef62e499d", + "hash": "sha256-/QsOjDik0TnH3FnK7LOwsJkvX+O+2DRFX4eF3MxD3fc=" }, "src/third_party/crc32c/src": { "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", @@ -1079,28 +1079,28 @@ }, "src/third_party/cros_system_api": { "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "7ecd2b41460516ecd7b7d6e5c298db25e1436b6f", - "hash": "sha256-ehbAXv4DZStWDMC3iOjmWkAc4PhAamyI4C9bdXO7FfA=" + "rev": "1c69e700a01a7fd3dd331f526c8a31ac1e5e49d0", + "hash": "sha256-qIwUs0KVU9xYFLN3UUayPLfz0ObA+EN6owKPW61J/5w=" }, "src/third_party/crossbench": { "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "cecd70a5f49f777f603d38d11ac1f66c03c3e8af", - "hash": "sha256-zLwIY8fQVebkfN4KFMbitZODhmiN65JK2s9IG/5Cd+o=" + "rev": "7d52b4ffbc319a7d5a0e0a0ebff744e5281d60c5", + "hash": "sha256-iwwvvIOuRMo/ZEu8Gk0lZaS4P5uGt8zpnYMChpZPcUo=" }, "src/third_party/crossbench-web-tests": { "url": "https://chromium.googlesource.com/chromium/web-tests.git", - "rev": "baf176aadedccc44329231d5dd40346874c2a63e", - "hash": "sha256-oY1/uGB6ykePIklWe35rmJWsnpu/wjkER4TJeP4TTdw=" + "rev": "7b3de17542cc613aaddbfc72c6e12be37eed7b73", + "hash": "sha256-7ly4vaK+Pj4y91t6Q+igQ0890CqKyu9jNBhJnxbNGjI=" }, "src/third_party/depot_tools": { "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90", - "hash": "sha256-Ttklyw6IdNeMExlzeiQg/qsCkTmqVhUJ34MFgYmCWD4=" + "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583", + "hash": "sha256-3atvbwYnFTA40MonAxSQWkF58Jku7O7fUzelGPQvDyY=" }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "33c2f401a9c8ddad2159eb0ab83aa244a5247361", - "hash": "sha256-M9aULI+HECgA0ptAG47OPK0QuB+xzmb29iOtJ3whpB0=" + "rev": "1d67dc0dafa344bbd6ca75c124e2d6d9d53074d8", + "hash": "sha256-VBXch2YwnKm+lMcZ5L0SlW+vAYeaSwgZvcOhg1TE5/A=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -1114,8 +1114,8 @@ }, "src/third_party/eigen3/src": { "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "2cf9891537250255f50df5109ffe9e700e2a73de", - "hash": "sha256-1bu1Y9itHIKcwY5J0sF08DSyfElLHiZ6SRsNZkFjz8o=" + "rev": "662ba79d796a2851b10cdafc6668e45b65b1120f", + "hash": "sha256-6bZFDeo7TqWNunkkQv8OJ+7/hfKwoIUtqZoXaeLp6M8=" }, "src/third_party/farmhash/src": { "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", @@ -1124,18 +1124,18 @@ }, "src/third_party/fast_float/src": { "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git", - "rev": "05087a303dad9c98768b33c829d398223a649bc6", - "hash": "sha256-ZQm8kDMYdwjKugc2vBG5mwTqXa01u6hODQc/Tai2I9A=" + "rev": "cfd12ebcf1f82c4fd44a950b1815dd0549bc8d89", + "hash": "sha256-hzoB+Mmok3oe6B494uLc5ReWpUcB89zCGPYw4gvanK0=" }, "src/third_party/federated_compute/src": { "url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git", - "rev": "3112513bf1a80872311e7718c5385f535a819b89", - "hash": "sha256-jnG3PCxjaYcClRgzOfIkHbbD3xU9TDLyQR3VZUwHIgU=" + "rev": "8de5837b817f28abc54a387a9417631b905ba90a", + "hash": "sha256-GZYo0FjgW8XCplAi6jzzruwDlIzsWjNEVQuCwXBCPz8=" }, "src/third_party/ffmpeg": { "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "f45bab87ce4c5fafc67fd53fcde777578d01bfa0", - "hash": "sha256-fsZSqmG6vFOPJYuBgG6OSWkzRu27B3mv/PqAP8s4ARk=" + "rev": "ad41607c61898cf7150e0fb20fe4bbabd44922a3", + "hash": "sha256-41qpsOTedB51WMzzHXDiXA19OIzA7wG/Qgbz6IkmWpk=" }, "src/third_party/flac": { "url": "https://chromium.googlesource.com/chromium/deps/flac.git", @@ -1164,8 +1164,8 @@ }, "src/third_party/freetype/src": { "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "b6bcd2177f72bb4842c7701d7b7f633bb3fc951a", - "hash": "sha256-TUz3yUD9HxqUMCOpLk74rEf8J0tMTh4ZCuD94AD4+q4=" + "rev": "b08a2eb0dd37f4a6c886fa5b0ecf5b3e1d27aac7", + "hash": "sha256-xnYeUAJx5n8LSg04AknfiudonfmlUdlj8nzHzSZi65I=" }, "src/third_party/fxdiv/src": { "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", @@ -1174,13 +1174,13 @@ }, "src/third_party/harfbuzz/src": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "e6741e2205309752839da60ff075b7fa2e7cddd3", - "hash": "sha256-XjUuY17fcZi+dIZFojq+eDsDVrBxtAWRydPdudt56+8=" + "rev": "d639197ed529b05c27f38ebaab365a621d5edad5", + "hash": "sha256-uT4zK2hwHzEH6Nrd2rAeyzpQA1TmwtrdcujKYEUbLsY=" }, "src/third_party/ink/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink.git", - "rev": "a988417b6d0b1ea03fb0b40269fbc42313acc6fd", - "hash": "sha256-6O+N/ULn8sqsdgFw7VZ7TMjWvCAZbYo398PruPScU/k=" + "rev": "0f9c6172b2ccc6b830ae313d522caf09e6933e06", + "hash": "sha256-LF+OcqNeg+KRuYmGuMZb4tmnr53sZHn/ZW1jg9ArPfc=" }, "src/third_party/instrumented_libs": { "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git", @@ -1204,8 +1204,8 @@ }, "src/third_party/libgav1/src": { "url": "https://chromium.googlesource.com/codecs/libgav1.git", - "rev": "40f58ed32ff39071c3f2a51056dbc49a070af0dc", - "hash": "sha256-gisU0p0HDL7Po/ZXIIZVOTnxnOuVvSE/FYo9DaEUFfo=" + "rev": "66ac17620652635392f6ab24065c77b035e281c9", + "hash": "sha256-6/zMaX2DPSKpsaqirhrgi3nL/88Qr2VXacmyL5IyJ3U=" }, "src/third_party/googletest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", @@ -1229,8 +1229,8 @@ }, "src/third_party/jsoncpp/source": { "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", - "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", - "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=" + "rev": "d4d072177213b117fb81d4cfda140de090616161", + "hash": "sha256-q+DOwkjRlHacgfWf5UVY02aqfnKK9M/1YRBX6aMce9g=" }, "src/third_party/leveldatabase/src": { "url": "https://chromium.googlesource.com/external/leveldb.git", @@ -1244,8 +1244,8 @@ }, "src/third_party/fuzztest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "e24a91020ab19c3d6f590bd0911b7acb492f81be", - "hash": "sha256-wFjuvJzGEaal+pIo5UtkdLHYTpoWxRE6Vf5OGLObGQk=" + "rev": "da27bcae1a8902af1ae6a5c55d3674f22709bbf5", + "hash": "sha256-317zRhJPc0D9A58W8fdCGFmpNZ5vACfd/tlZOsp/Cvw=" }, "src/third_party/domato/src": { "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git", @@ -1254,18 +1254,18 @@ }, "src/third_party/libaddressinput/src": { "url": "https://chromium.googlesource.com/external/libaddressinput.git", - "rev": "e20690c8d5178bb282641d5eb06ef0298ff4cbc5", - "hash": "sha256-rX7LQNUgk5ZljUrayD1a/SUrBrvpomW0Cs0KBw3lYu4=" + "rev": "81eb9628382b07d371d8ea0b11badf7de3857fd5", + "hash": "sha256-6yDZpZ+CwxGqNO4+lZLFB6ESREeVku1BoOMtR+hKQ3I=" }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "33dba9e12a9f12e737eaa7c2624e8c580950a89a", - "hash": "sha256-01DbV0kQFg1yyFpVeo82KBoZHhizA7xnZ1qOuu4HTcs=" + "rev": "137bcff61e73fdd2836dc04e8258bfb49cef595e", + "hash": "sha256-oDubKvgqMk3w0luM//rR3NnCOk1h/WVTyRkuCmYASrw=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", - "rev": "c433c9a32320aed983e4106931596fbbae3f77ee", - "hash": "sha256-yw1cXB6s6biD2vj2K/3sVbKiaNK7bt+NkbQovbYlJ2Q=" + "rev": "5e140b5abb9a91eb25b5ef66d29f6ee784ab7eab", + "hash": "sha256-tN+2YH2O9FTV50o4OVhKcKdwRwTI8NuNA0WqljUcrmo=" }, "src/third_party/nearby/src": { "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", @@ -1279,8 +1279,8 @@ }, "src/third_party/jetstream/main": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", - "rev": "de88e36ae91d5bd13126fa4cc4b0e0346d779842", - "hash": "sha256-ZpU0ONqIVmY2VR0MxqtYj8KPNlK0L21gLJuT/Ff7KI8=" + "rev": "b7babdf323e64e69bd2f6c376189c15825f5c73a", + "hash": "sha256-s6UMdUYWZqk/MbhyCi2zdQNgni98gGsYxcuUh/5AUy0=" }, "src/third_party/jetstream/v2.2": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", @@ -1319,8 +1319,8 @@ }, "src/third_party/cros-components/src": { "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "e580888fcc1c108e25c218ccf8b7a4372de18d57", - "hash": "sha256-p0Wfvhg/j8v9xL9Pueo7xPVHBKowOLI00AeIZXPQw4k=" + "rev": "0abb2efaa3d16db861c9710b193c39e657ac3bdf", + "hash": "sha256-viuntf6umyLZwDR9BXG+ZOakp9f8rvpZYDBYAUkKzL4=" }, "src/third_party/libdrm/src": { "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", @@ -1329,8 +1329,8 @@ }, "src/third_party/expat/src": { "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", - "rev": "f31adfd584b7f6c50bbf4d22eb928538ffc9145a", - "hash": "sha256-tLz4RejYQ/kFXhsWTduuGcinfUkqxYKPCpsou+WlvBc=" + "rev": "9bdfbc77e3355405ceefbe59420abed953a5657e", + "hash": "sha256-veGg5/QjtBSmxYa8IyHF0NxEdJzlcJSZfzw8ay3ASVU=" }, "src/third_party/libipp/libipp": { "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", @@ -1339,8 +1339,8 @@ }, "src/third_party/libjpeg_turbo": { "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "d1f5f2393e0d51f840207342ae86e55a86443288", - "hash": "sha256-KGeB/lTjhm8DQBDZVSPENvZEGSHeLTkviJrYsFh5vEM=" + "rev": "640f254ad0fa03f6b1f29f89b7dd9366f2f6e533", + "hash": "sha256-wor4RTF3/5BFL9EWcGEofY+M4HN2+/KJUaOY+u86K5Q=" }, "src/third_party/liblouis/src": { "url": "https://chromium.googlesource.com/external/liblouis-github.git", @@ -1349,8 +1349,8 @@ }, "src/third_party/libphonenumber/src": { "url": "https://chromium.googlesource.com/external/libphonenumber.git", - "rev": "ade546d8856475d0493863ee270eb3be9628106b", - "hash": "sha256-cLtsM35Ir3iG3j8+Cy2McL1ysRB0Y1PXealAKl05Twg=" + "rev": "c25558e39e2bcc9f26f7a2a1ef804324169eaf8f", + "hash": "sha256-Lr/gB5Em+TE092McPwJdOU0Ab4zyP4/2ZxlavMZMm+s=" }, "src/third_party/libprotobuf-mutator/src": { "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", @@ -1374,8 +1374,8 @@ }, "src/third_party/libvpx/source/libvpx": { "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "d1268a5f3f3553ad7735911c614e8548381ca3cd", - "hash": "sha256-6IZTDhtjVWiqTv+jUC6Wr/tSqvql3thi9+mt+M3ixt4=" + "rev": "5f00413667d19ad683674524a9d03543d86d188b", + "hash": "sha256-uTteQ+z7t5KOtPuBoZazmonRHd8jGS1/YZAq+RAvhX4=" }, "src/third_party/libwebm/source": { "url": "https://chromium.googlesource.com/webm/libwebm.git", @@ -1389,8 +1389,8 @@ }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "644251f252a84bf8ce91ff0aca86a9b16b069ab8", - "hash": "sha256-DsoOY8bg0sPOF8tF67Gk7fRqdQzG1hc9fVMlZVjKWU4=" + "rev": "3c5fa6ef272f6077d76816ee3d6a697ef1d6d272", + "hash": "sha256-FXFSC9dRb/KhSQdhJUqKEUpZbzU8ZpVnoSXtF/HPiJI=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", @@ -1409,8 +1409,8 @@ }, "src/third_party/nasm": { "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", - "rev": "358842b6b7dd69b2ed635bef17f941e030a05e5f", - "hash": "sha256-YwjwubijMZ9OvYeMUVMSunWZ2VCuqUFEOyv/MK/oojc=" + "rev": "525a09a813be0f75b646ee93fc2a31c27b87d722", + "hash": "sha256-uC6bGxSdz1V2SXIQjMsDd6555b3gAPN1Y0ZQtWoqDww=" }, "src/third_party/neon_2_sse/src": { "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", @@ -1424,8 +1424,8 @@ }, "src/third_party/openscreen/src": { "url": "https://chromium.googlesource.com/openscreen", - "rev": "684bcd767271a21f3e5d475b17a0fd862f16c65e", - "hash": "sha256-Yjz2E1/h+zp7L2x0zE0l+ktQIiSrJ4ZknXOhaVPKQVE=" + "rev": "37ff938a93cb04c6b77e019b52328c8e9b320317", + "hash": "sha256-M57un/TVQPfTnKScVHS1VK1cUs8F/YPT3TwMVdo+mhM=" }, "src/third_party/openscreen/src/buildtools": { "url": "https://chromium.googlesource.com/chromium/src/buildtools", @@ -1439,13 +1439,13 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "be702d63baba7507bb1f6f6ff2d35be9c133c08c", - "hash": "sha256-hXqSJn1C0ISLWx68UicggiL8xzgQX2Y8l75vtpJgHeU=" + "rev": "c052afb72a08d79a26bcf3103d11f344981b09f1", + "hash": "sha256-zqfErp0pDXHXIvRpZ1TJu2UGXNZjATRbPgQWTniKTJs=" }, "src/third_party/perfetto": { "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git", - "rev": "97c58a94bb6495c4e202467fb1c55eaa22b5670f", - "hash": "sha256-qtClkWAluLDRZn7yrHLU7qp9szP+/WsiG5JZZzRKd38=" + "rev": "9ede949f025303868fa0c42418f122ac47312539", + "hash": "sha256-IRzEqgunO4Nfz+FkYir8G/Ht+Zsn6wpzncgkEFpsC+k=" }, "src/third_party/protobuf-javascript/src": { "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript", @@ -1454,8 +1454,8 @@ }, "src/third_party/pthreadpool/src": { "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git", - "rev": "a56dcd79c699366e7ac6466792c3025883ff7704", - "hash": "sha256-WfyuPfII4eSmLskZV0TAcu4K6OyW38TjkDHm+VUx5eY=" + "rev": "02460584c6092e527c8b89f7df4de143d70e801f", + "hash": "sha256-4EHJzZT+Gbhs8SkOhjSvDIPEqIQU93oJmtF3c/T+qjw=" }, "src/third_party/pyelftools": { "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", @@ -1484,13 +1484,18 @@ }, "src/third_party/search_engines_data/resources": { "url": "https://chromium.googlesource.com/external/search_engines_data.git", - "rev": "2345fee6ce4ae24d9c365d5c0884ece593c55c67", - "hash": "sha256-5qkra6FURaMvEOk+ZKMRH1hc8ixEnk3u4rxNm0G8tuQ=" + "rev": "1aab872af8d44dcf59362d7ba8255922f74fafde", + "hash": "sha256-5/XnNx6Pyk4KBb9krVo9u6i7LWNrsLLOIi4qhEY2PZc=" + }, + "src/third_party/sframe/src": { + "url": "https://chromium.googlesource.com/external/github.com/cisco/sframe", + "rev": "b14090904433bed0d4ec3f875b9b39f3e0555930", + "hash": "sha256-bw+6ycUpnFZJhtXFUzr7XTOljNrs+7oFdVY+LN0Rqek=" }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "75c589e1f436688fca8f5b7f7a8affeafaa4f923", - "hash": "sha256-x0jEek7iJv7WBNdkOUPc5VvIYJw9QPzzTChFUofqErM=" + "rev": "14d05ec761901b6e9e9193af8b347ab3a7f6fed0", + "hash": "sha256-KZGrztOKaT368KSCxiJAqnsgINpNODUlaXnH/maQNIA=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -1504,13 +1509,13 @@ }, "src/third_party/sqlite/src": { "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "508ab21dc25702ed6690c4dd77da209a6bcd1239", - "hash": "sha256-SfvLfBKdPjFvZ7CzUeFMcyoHdCzQgNRQwZyzb6MRtJg=" + "rev": "fc121d7d03cd6cbf499ec06a5112b263471b1181", + "hash": "sha256-hf9PxQhXEKT49GbkFYCvRPBT0Qu+hDnDpebI92yO1Oo=" }, "src/third_party/swiftshader": { "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "f9d5d49a3c599a315e3493dc1e9b5309cffb3305", - "hash": "sha256-kBfqgXXJeEPT80mu6CJ2Bwmdv/y8jVzM6TedMXbzo4o=" + "rev": "fce27a96526f54c6d31fdccf57629788e3712220", + "hash": "sha256-bmXZLpz3wv7eQWoqTjZmjwnnILWSIjZ8iqo8CeLk5fw=" }, "src/third_party/text-fragments-polyfill/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", @@ -1519,23 +1524,23 @@ }, "src/third_party/tflite/src": { "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "2216f531fb72119745382c62f232acf9790f4b6e", - "hash": "sha256-zySLNPmug5HS5pwJ/lEMAWjjZSOuxdTgup7Y90k7NZI=" + "rev": "999d49c10046e240cd5366d349d3a5f6af16a0d4", + "hash": "sha256-eSqaWXtzZ4Bi9ilaJYGdZamzUjmo+AtDZ9KeZhsc/fY=" }, "src/third_party/litert/src": { "url": "https://chromium.googlesource.com/external/github.com/google-ai-edge/LiteRT.git", - "rev": "9b5418dd7a1a318eed20395743dcc868df17d8b0", - "hash": "sha256-80amwDPF3RrcoTaTQsunNmlvBGs6KCv369FW3J/Xcts=" + "rev": "09b4b05203fd7a9402ffcce9cc736d887ff7e3fc", + "hash": "sha256-skMOzpsn67mmOAp7Mf6UrJdi2lbiQQ8b6kBy4Ik2ED8=" }, "src/third_party/vulkan-deps": { "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "d234b7b29748c07ef389279dd24f533ebd04cadc", - "hash": "sha256-w49HOjPixSI/C5IGlxQMj/Ol9f/Lr2zI2oMhQzzu1zk=" + "rev": "669a28b1f31f89bfc46b74791f127bcc5e5b2f06", + "hash": "sha256-lsR+sh+XQP/wKgkBbie6Gp+kQNFnnC8TeNWpiWTdevw=" }, "src/third_party/glslang/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "458ff50a67cb69371850068a62b78f1990a1ff9a", - "hash": "sha256-2WauVjAEeZn16b4fE4ImKPX3wjDmeN92mqWi3NMiXSw=" + "rev": "f6d9303ddaf2e879b9155f7186cd234f5a79079c", + "hash": "sha256-ru3QVyyyqxZRcvSpy9pYhHHhkjuLVhQbgOT/vQJ/oIw=" }, "src/third_party/spirv-cross/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", @@ -1544,43 +1549,43 @@ }, "src/third_party/spirv-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "126038020c2bd47efaa942ccc364ca5353ffccde", - "hash": "sha256-QBX2M+ZSWgVvCx58NeDIdf6mIkdJbecDktBfUWGPvNc=" + "rev": "1e770e7de8373a8dd49f23416cf7ca4001d01040", + "hash": "sha256-t8Shkoa90TJt1MbTOefnLaguW4eYKsRFO1Jd0AUc70Y=" }, "src/third_party/spirv-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "2ec8457ab33d539b6f1fecc998360c0b8b05ed4f", - "hash": "sha256-9TBb/gnDXgZRZXhF27KEQ0XQI5itRHKJQjLrkFDQq7Q=" + "rev": "b38c4f83024546d4000b2db8e2294cf81b7f26e0", + "hash": "sha256-q5G4B75xBIXl1aG/vzbIDrc3Hs/MFoQ4nwh4ozb8hys=" }, "src/third_party/vulkan-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "f6a6f7ab165cedbfa2a7d0c93fe27a2d01ce09c8", - "hash": "sha256-ZbjmxbRUiVJADNRWziCH0UIM09qKf+lm9PRnWOhZFhQ=" + "rev": "015e25c3c91b70eb1a754d36fb14c4ba6ad9b0b9", + "hash": "sha256-pUxPwFGbOzP8ymTooeA1slFWEFsRoqUROSnndVtLiY8=" }, "src/third_party/vulkan-loader/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "15a84652b94e465e9a7b25eb507193929863bc2f", - "hash": "sha256-pdC3YCM0Nzeabi5TPD+qR5PVdsxmWMnf2L9HsOcbv84=" + "rev": "cf0cf82ea16c0ff0be75940f282540d6085b2d3b", + "hash": "sha256-uyoysS7lSBNDRfvcwPT+gQqhE20UxiYUEw1UXnYS3fY=" }, "src/third_party/vulkan-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "7c46da2b39036a80ce088576d5794bf39e667f56", - "hash": "sha256-nAyNVveeGg9sA0E37YiEPm+UdKsy48nAOjnUYHQnuqw=" + "rev": "e3d18f90c0b8ef1f52539e0674a42f0adfe30381", + "hash": "sha256-Hs9N0FM3eWWjLm4BrDJoZIrsPDVFx0iRAJeQ4gHTM7o=" }, "src/third_party/vulkan-utility-libraries/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "2c909c1ab6f9c6caba39a84a4887186b3fafdead", - "hash": "sha256-k3xeKHQbd2rTQJsOZKXEMPrYjcHwoCC1N12F6AIP6Ho=" + "rev": "8383c46b129c2b3a5f3833e602d946d2fcc57e39", + "hash": "sha256-ZBie5uDTVEehxRQW1GZY5Ki/bnp82LoW3jfMUFL0O9A=" }, "src/third_party/vulkan-validation-layers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "b105d8ea361af258abed65efb5a1565c031dcf1c", - "hash": "sha256-GgznBGYgnCFMNaqAOQ15dlw2dOFfSp3mAV2KokVLzgk=" + "rev": "044eaba8a34a6e3bfb1d6aafac7c01068813a2b6", + "hash": "sha256-i3hochkK0LZPg8CsZMFkAL+8tf8QuuwtApAc4FDd0RM=" }, "src/third_party/vulkan_memory_allocator": { "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", - "rev": "cb0597213b0fcb999caa9ed08c2f88dc45eb7d50", - "hash": "sha256-yBCs3zfqs/60htsZAOscjcyKhVbAWE6znweuXcs1oKo=" + "rev": "7e55b011e16182fc349149abbd3aaf3b1db46421", + "hash": "sha256-fOnFkcQDEGIe5yB507qnP9nA1LBBPFblncNiJ8JxAwI=" }, "src/third_party/wayland/src": { "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", @@ -1614,18 +1619,23 @@ }, "src/third_party/webgpu-cts/src": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "3b327ebc44f11212fd3872972a6dd394634fb9e3", - "hash": "sha256-RSZVKv2Z0pg2cGa3Elr2r5VZqdxlRJ+6mzm1Au1qg1I=" + "rev": "b507bd117e53db86f2fb52d0d858d3ae7d684a85", + "hash": "sha256-6Y5Z0ErtsZdbuWTHa+PEiOxcZSbjBcnuOHbgtI1/+80=" }, "src/third_party/webpagereplay": { "url": "https://chromium.googlesource.com/webpagereplay.git", - "rev": "b7ac48f52cd298e966a76eb054412915c3e445d4", - "hash": "sha256-smtwB6vzLgCAePz0jNfrpm8TxrxBnBkigLxERhxUEvE=" + "rev": "b2b856131e36c99e9de9c419fe8ca02f857082ba", + "hash": "sha256-+hcaP7C5Eh3SLl5B8mRgOVdM/tvnFnb/oqUIWPoe0NA=" + }, + "src/third_party/webpagereplay/third_party/clang-format/script": { + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", + "rev": "6eddfb5ec5f92127a531eda66c568d3a11e7ec11", + "hash": "sha256-Cm6BOOlEyD0kdYxMSmk6Fj1Dnfs3zCzXsm+BOXgBme0=" }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "28311abc149a9bb7e6761a3d54f362a8d77e6793", - "hash": "sha256-WuaxKrbISJ1nwyoj2sPAhGCNz33xEYSX1WlDiM+zxpw=" + "rev": "1f975dfd761af6e5d76d28333191973b258d82a8", + "hash": "sha256-ucH+9HBkFyOKEItAWVoYmEzyU7h/UgWIvp/eC/JqGWU=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -1639,8 +1649,8 @@ }, "src/third_party/xnnpack/src": { "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "2ad25fc09167df69c6c02eb8082a0b9658dd5e80", - "hash": "sha256-vBMGBXzJPCcsc2kMyGecjti68oZHWUwJKd7tkKub6kg=" + "rev": "56ac34b3f45fae2eca1f32584f7f0b279be2cf1f", + "hash": "sha256-uw3r5g5rWamlFubBkXDb4KRx3hkOAoQyFo8l95GYGZI=" }, "src/third_party/libei/src": { "url": "https://chromium.googlesource.com/external/gitlab.freedesktop.org/libinput/libei.git", @@ -1649,13 +1659,18 @@ }, "src/third_party/zstd/src": { "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "3ae099b48dfcfe02b1b3ba81ab85457f8a922e9f", - "hash": "sha256-futF0sM6z9HAl6AMJwUULBRByN92FTBjRIzYb2vBFGg=" + "rev": "5233c58e6ca0b1c4c6b353ad79649191ed195bdc", + "hash": "sha256-vEl0s7Mjh+5rciOMxm99PNWiamtCk+sTN4lRYKCIZ+8=" }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "933ce636c562cd54d68e7f7c93ab5cdffd685fca", - "hash": "sha256-zYArO6QS9nDIVWPINRVaDN1uX8X/wchBDeZHPZnwHYk=" + "rev": "968f19a8970f8d91702d86f0ec1522f3909781b7", + "hash": "sha256-x3rCWvC3hEjyJq6PNThhZEp4oRF9Y1JJEPnZTqVNVrY=" + }, + "src/agents/shared": { + "url": "https://chromium.googlesource.com/chromium/agents.git", + "rev": "e75efa515896f6bf1dea92eaffbcf8ee711a65d8", + "hash": "sha256-z2GrzF8jDkdfBdq1HP3gTgQpoqjmhc80kEZBmlue0os=" } } } From 9ab8fa73753fa9b1f20eb27eaf526556bcd72429 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Fri, 3 Jul 2026 19:00:46 -0400 Subject: [PATCH 252/252] check-meta: compare with null instead of using isNull --- pkgs/stdenv/generic/check-meta.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 049be19b4e6a..cc51c3e3528e 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -495,7 +495,7 @@ let let values = attrValues cpeParts; in - (length values == 11) && !any isNull values; + (length values == 11) && !any (v: v == null) values; makeCPE = { part, @@ -687,7 +687,7 @@ let }: let withError = - if isNull error then + if error == null then true else let @@ -725,15 +725,15 @@ let invalid = checkValidity' attrs; problems = checkProblems attrs; in - if isNull invalid then - if isNull problems then + if invalid == null then + if problems == null then { valid = "yes"; handled = true; } else { - valid = if isNull problems.error then "warn" else "no"; + valid = if problems.error == null then "warn" else "no"; handled = handle { inherit attrs meta; inherit (problems) error warnings;