From 56ed98058e500b1fe259bad65d97f1dcfb005c3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 00:24:14 +0000 Subject: [PATCH 01/67] input-remapper: 2.1.1 -> 2.2.0 --- pkgs/tools/inputmethods/input-remapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/tools/inputmethods/input-remapper/default.nix index 49a41fd31d8f..719953dc2c7e 100644 --- a/pkgs/tools/inputmethods/input-remapper/default.nix +++ b/pkgs/tools/inputmethods/input-remapper/default.nix @@ -38,14 +38,14 @@ let in (buildPythonApplication rec { pname = "input-remapper"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "sezanzeb"; repo = "input-remapper"; tag = version; - hash = "sha256-GMKcs2UK1yegGT/TBsLGgTBJROQ38M6WwnLbJIuAZwg="; + hash = "sha256-MZO40Y8ym/lwHB8PETdtByAJb/UMMM6pRAAgAYao8UI="; }; postPatch = '' From 0c348240119fbcdbea030c47462fba084d0dea43 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Mon, 24 Nov 2025 19:45:35 +0100 Subject: [PATCH 02/67] maintainers: add hythera --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 74cd657e6148..8ef85f3be870 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10799,6 +10799,12 @@ githubId = 2090758; keys = [ { fingerprint = "24F4 1925 28C4 8797 E539 F247 DB2D 93D1 BFAA A6EA"; } ]; }; + hythera = { + name = "Hythera"; + github = "Hythera"; + githubId = 87016780; + matrix = "@hythera:matrix.org"; + }; hyzual = { email = "hyzual@gmail.com"; github = "Hyzual"; From 220cab498a99840bc9d39692f9a14aa158a28f2a Mon Sep 17 00:00:00 2001 From: patka Date: Wed, 10 Dec 2025 22:36:09 +0100 Subject: [PATCH 03/67] rainfrog: 0.3.10 -> 0.3.11 --- pkgs/by-name/ra/rainfrog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index fe7701d5447e..8c95154409bd 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -7,7 +7,7 @@ rainfrog, }: let - version = "0.3.10"; + version = "0.3.11"; in rustPlatform.buildRustPackage { inherit version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "achristmascarl"; repo = "rainfrog"; tag = "v${version}"; - hash = "sha256-Up/ZjIppQ3EYceSzY8DBV3lK8fd+sylm2Jl7lvO4VdY="; + hash = "sha256-NzXVC2frFcExZZEdzIzy6VUPwzd2Xa/xoCPSAaKBHsg="; }; - cargoHash = "sha256-PzBvshoVxa4FaSygDPTR0+EuzfmQBkdb64jOWOpAgYY="; + cargoHash = "sha256-ZKobMGiBWzj7YQiXfdtja+BN+skjj5wBERHUMYz4H44="; passthru = { tests.version = testers.testVersion { From 1d8392109cc69ed67d9f4e190a25d462c2439b3e Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 10 Dec 2025 17:48:47 +0100 Subject: [PATCH 04/67] nodejs_24: 24.11.1 -> 24.12.0 --- pkgs/development/web/nodejs/v24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix index 2385a2d79967..4a2068abc0eb 100644 --- a/pkgs/development/web/nodejs/v24.nix +++ b/pkgs/development/web/nodejs/v24.nix @@ -25,8 +25,8 @@ let in buildNodejs { inherit enableNpm; - version = "24.11.1"; - sha256 = "ea4da35f1c9ca376ec6837e1e30cee30d491847fe152a3f0378dc1156d954bbd"; + version = "24.12.0"; + sha256 = "6d3e891a016b90f6c6a19ea5cbc9c90c57eef9198670ba93f04fa82af02574ae"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then From b94b630c864bd686928cb6f41cfcd0a6cb9f2333 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Thu, 11 Dec 2025 13:45:03 -0500 Subject: [PATCH 05/67] super-productivity: bugfix electron 37 is required --- pkgs/by-name/su/super-productivity/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 31fe69b8c7ac..91b6d2c972f5 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -1,7 +1,7 @@ { buildNpmPackage, copyDesktopItems, - electron, + electron_37, fetchFromGitHub, lib, makeDesktopItem, @@ -11,7 +11,9 @@ rsync, stdenv, }: - +let + electron = electron_37; +in buildNpmPackage rec { pname = "super-productivity"; version = "16.5.0"; From 1dd3dc4d2ac8dbcd3124bff3dd2ecbad68d459b8 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Thu, 11 Dec 2025 13:46:15 -0500 Subject: [PATCH 06/67] super-pdoductivity: 16.5.0 -> 16.5.5 changelog: https://github.com/johannesjo/super-productivity/blob/v16.5.5/CHANGELOG.md --- pkgs/by-name/su/super-productivity/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 91b6d2c972f5..777ee6009118 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -16,13 +16,13 @@ let in buildNpmPackage rec { pname = "super-productivity"; - version = "16.5.0"; + version = "16.5.5"; src = fetchFromGitHub { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-FBquRpn+g5wOwvM62MqL7RZ41LXer0CskVN5+5mD9kM="; + hash = "sha256-0V68wkkuyOFcv4Wl2Kqk4Soa/nOB7CizelYyI0TKU+8="; postFetch = '' find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \; @@ -65,7 +65,7 @@ buildNpmPackage rec { dontInstall = true; outputHashMode = "recursive"; - hash = "sha256-r0xlODXi4+C+Aat3e3goMIBvBordes/KVlsBG696ZWs="; + hash = "sha256-gsGzwwzt54Ww9CyHaHVAM4v1mHM2vQePw5vM8x1EGao="; } ); From ced6284b97530cd17542a47eb961e641117100a5 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Thu, 11 Dec 2025 13:46:39 -0500 Subject: [PATCH 07/67] super-productivity: add tebriel as maintainer --- pkgs/by-name/su/super-productivity/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 777ee6009118..b4d163e4626f 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -170,6 +170,7 @@ buildNpmPackage rec { maintainers = with lib.maintainers; [ offline pineapplehunter + tebriel ]; mainProgram = "super-productivity"; }; From 2d3b37aa7d38486d564c97460310124b7e01200a Mon Sep 17 00:00:00 2001 From: Louis Opter Date: Thu, 11 Dec 2025 22:38:13 +0000 Subject: [PATCH 08/67] bazel_7: fix build on Darwin Set `--macos_sdk_version` as in [`package.nix` for bazel_8]: ``` sedVerbose compile.sh \ -e "/bazel_build /a\ --macos_sdk_version=${stdenv.hostPlatform.darwinMinVersion} \\\\" \ ``` To `darwinPatches` in order to fix: ``` ERROR: /nix/var/nix/builds/nix-85698-1094223598/bazel_src/src/main/native/BUILD:72:10: Compiling src/main/native/unix_jni.cc failed: (Exit 1): cc_wrapper.sh failed: error executing CppCompile command (from target //src/main/native:libunix_jni.so) (cd /nix/var/nix/builds/nix-85698-1094223598/bazel_POvonAvR/out/execroot/_main && \ exec env - \ PATH=/nix/store/xcjk9ill54kjk8mzgq6yydnx9015lidg-python3-3.13.9/bin:/nix/store/8010ag4a7cn1rhra7agjzwsap8jfj1wg-unzip-6.0/bin:/nix/store/nqf7x67vacqf73jrdw76hg8fjb29n0dn-which-2.23/bin:/nix/store/iv78g496sjrz537sw8y5dq826mk0442l-zip-3.0/bin:/nix/store/z99r3kjs85i4hqp2cblr2pxim5gkhkzw-cctools-1010.6/bin:/nix/store/qk20nysrc2170f1mal5k6r0axqn6jmfj-clang-wrapper-21.1.2/bin:/nix/store/w5wjc54p5cgl4cr1mfkd3lisnaiszaq7-clang-21.1.2/bin:/nix/store/1swaqmkr1329q50ky497sps80p16fn95-coreutils-9.8/bin:/nix/store/1sjw5a4m3904rss6fv1ix9gj7m4j67la-cctools-binutils-darwin-wrapper-1010.6/bin:/nix/store/yi44mca7gaps25sin6qwvp26pqfa3kp7-cctools-binutils-darwin-1010.6/bin:/nix/store/qqgnrrsacp13sil10wkfbaq0fjkjp4ly-xcbuild-0.1.1-unstable-2019-11-20-xcrun/bin:/nix/store/zng56j969rl5xnkz5v5c7j9fsxpm7sm1-zulu-ca-jdk-21.0.8/bin:/nix/store/6kh7pqnkls1wyhrvh37nlchnc308dy2h-bash/bin:/nix/store/19zw2r9dl44wk3j5ncwsk743zr9fc584-bash-interactive-5.3p3/bin:/nix/store/qkxnh5r8ihcmqagg6ixmffv8splnyxsf-diffutils-3.12/bin:/nix/store/x27cqyk5gazfxk4s982y3sv1ss7d2z56-file-5.45/bin:/nix/store/bc9nvjzr9bc3bras5gawzm8gdqapsd35-findutils-4.10.0/bin:/nix/store/wk6hmvlw0d7xi36c1sy5lljakzwj0r3x-gawk-5.3.2/bin:/nix/store/1r5p3mwlq9m50yvcdaf64xdv7v5gq581-gnugrep-3.12/bin:/nix/store/mr0a0xdlg1v5q5p24x6vx8dpaxxjrykp-patch-2.8/bin:/nix/store/ipgh18959gxm39fhy7b9db4cn6vl0p0j-gnused-4.9/bin:/nix/store/7lyx6px91wm2yybqxf4q8xyh4bqy1g9g-gnutar-1.35/bin:/nix/store/cv7wmmrbf07h4laz3r4laj1qga57i7bq-gzip-1.14/bin:/nix/store/9kffgbvhza212ishsam4p8wklh92ih9v-libiconv-109.100.2/bin:/nix/store/1swaqmkr1329q50ky497sps80p16fn95-coreutils-9.8/bin:/nix/store/bc9nvjzr9bc3bras5gawzm8gdqapsd35-findutils-4.10.0/bin:/nix/store/qkxnh5r8ihcmqagg6ixmffv8splnyxsf-diffutils-3.12/bin:/nix/store/ipgh18959gxm39fhy7b9db4cn6vl0p0j-gnused-4.9/bin:/nix/store/1r5p3mwlq9m50yvcdaf64xdv7v5gq581-gnugrep-3.12/bin:/nix/store/wk6hmvlw0d7xi36c1sy5lljakzwj0r3x-gawk-5.3.2/bin:/nix/store/7lyx6px91wm2yybqxf4q8xyh4bqy1g9g-gnutar-1.35/bin:/nix/store/cv7wmmrbf07h4laz3r4laj1qga57i7bq-gzip-1.14/bin:/nix/store/nrrvblhsinfighjdvgxsb8nignvd2zdd-bzip2-1.0.8-bin/bin:/nix/store/himpsafkr92afwx35m02cfqqkayjp7ab-gnumake-4.4.1/bin:/nix/store/p0k9r5h8qs7220xdbdihhfgzwjcly70x-bash-5.3p3/bin:/nix/store/bffz5h9mi6z7n83rllpyz3f09gd3msmc-patch-2.8/bin:/nix/store/3cqxjnil2vb4nz4i0kwmrncgpx06v1ar-xz-5.8.1-bin/bin:/nix/store/x27cqyk5gazfxk4s982y3sv1ss7d2z56-file-5.45/bin \ PWD=/proc/self/cwd \ external/bazel_tools~cc_configure_extension~local_config_cc/cc_wrapper.sh -U_FORTIFY_SOURCE -fstack-protector -Wall -Wthread-safety -Wself-assign -Wunused-but-set-parameter -Wno-free-nonheap-object -fcolor-diagnostics -fno-omit-frame-pointer -g0 -O2 '-D_FORTIFY_SOURCE=1' -DNDEBUG -ffunction-sections -fdata-sections '-std=c++14' -MD -MF bazel-out/darwin_arm64-opt/bin/src/main/native/_objs/libunix_jni.so/unix_jni.d '-frandom-seed=bazel-out/darwin_arm64-opt/bin/src/main/native/_objs/libunix_jni.so/unix_jni.o' -DBLAZE_OPENSOURCE -iquote . -iquote bazel-out/darwin_arm64-opt/bin -iquote external/blake3~ -iquote bazel-out/darwin_arm64-opt/bin/external/blake3~ -isystem src/main/native -isystem bazel-out/darwin_arm64-opt/bin/src/main/native -isystem external/blake3~ -isystem bazel-out/darwin_arm64-opt/bin/external/blake3~ '-mmacosx-version-min=10.11' -fPIC '-DBLAZE_JAVA_CPU=k8' -no-canonical-prefixes -Wno-builtin-macro-redefined '-D__DATE__="redacted"' '-D__TIMESTAMP__="redacted"' '-D__TIME__="redacted"' -c src/main/native/unix_jni.cc -o bazel-out/darwin_arm64-opt/bin/src/main/native/_objs/libunix_jni.so/unix_jni.o) src/main/native/unix_jni.cc:512:7: error: 'utimensat' is only available on macOS 10.13 or newer [-Werror,-Wunguarded-availability-new] 512 | if (::utimensat(AT_FDCWD, path_chars, times, 0) == -1) { | ^~~~~~~~~~~ /nix/store/npzkc6q10x37mb969v8c19klfsghb70l-apple-sdk-14.4/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/sys/stat.h:402:9: note: 'utimensat' has been marked as being introduced in macOS 10.13 here, but the deployment target is macOS 10.11.0 402 | int utimensat(int __fd, const char *__path, const struct timespec __times[2], | ^ src/main/native/unix_jni.cc:512:7: note: enclose 'utimensat' in a __builtin_available check to silence this warning 512 | if (::utimensat(AT_FDCWD, path_chars, times, 0) == -1) { | ^~~~~~~~~~~ 513 | PostException(env, errno, path_chars); 514 | } | 1 error generated. INFO: Elapsed time: 15.349s, Critical Path: 6.22s INFO: 1067 processes: 839 internal, 184 local, 44 worker. ERROR: Build did NOT complete successfully ERROR: Could not build Bazel ``` [`package.nix` for bazel_8]: https://github.com/nixos/nixpkgs/blob/9c81a0c598a5bb583c0ea46c4e45be1921a3a8f1/pkgs/by-name/ba/bazel_8/package.nix#L105 --- pkgs/by-name/ba/bazel_7/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ba/bazel_7/package.nix b/pkgs/by-name/ba/bazel_7/package.nix index d8c7ea384e90..a30d5ad78086 100644 --- a/pkgs/by-name/ba/bazel_7/package.nix +++ b/pkgs/by-name/ba/bazel_7/package.nix @@ -431,6 +431,11 @@ stdenv.mkDerivation rec { sedVerbose $wrapper \ -e "s,/usr/bin/xcrun install_name_tool,${cctools}/bin/install_name_tool,g" done + + # set --macos_sdk_version to make utimensat visible: + sedVerbose compile.sh \ + -e "/bazel_build /a\ --macos_sdk_version=${stdenv.hostPlatform.darwinMinVersion} \\\\" \ + ''; genericPatches = '' From 1fd13b20b465e157f177f4e8820320c2182dd061 Mon Sep 17 00:00:00 2001 From: Amelia Aronsohn Date: Sat, 13 Dec 2025 17:07:11 -0800 Subject: [PATCH 09/67] maid: 0.10.0 -> 0.11.2 https://github.com/maid/maid/releases/tag/v0.11.2 --- pkgs/by-name/ma/maid/Gemfile | 2 +- pkgs/by-name/ma/maid/Gemfile.lock | 10 +++++----- pkgs/by-name/ma/maid/gemset.nix | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ma/maid/Gemfile b/pkgs/by-name/ma/maid/Gemfile index 9ac699f872dc..d8cd7bb75e05 100644 --- a/pkgs/by-name/ma/maid/Gemfile +++ b/pkgs/by-name/ma/maid/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem 'maid', '~> 0.10.0' +gem 'maid', '~> 0.11.2' gem 'rake' diff --git a/pkgs/by-name/ma/maid/Gemfile.lock b/pkgs/by-name/ma/maid/Gemfile.lock index 3b706c80212c..510e04803717 100644 --- a/pkgs/by-name/ma/maid/Gemfile.lock +++ b/pkgs/by-name/ma/maid/Gemfile.lock @@ -21,7 +21,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.7.0) - maid (0.10.0) + maid (0.11.2) deprecated (~> 3.0.0) dimensions (>= 1.0.0, < 2.0) escape (>= 0.0.1, < 0.1.0) @@ -31,7 +31,7 @@ GEM mime-types (~> 3.0, < 4.0) rubyzip (~> 2.3.2) rufus-scheduler (~> 3.8.2) - thor (~> 1.2.1) + thor (~> 1.4.0) xdg (~> 2.2.3) mime-types (3.7.0) logger @@ -45,7 +45,7 @@ GEM rubyzip (2.3.2) rufus-scheduler (3.8.2) fugit (~> 1.1, >= 1.1.6) - thor (1.2.2) + thor (1.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) xdg (2.2.5) @@ -54,8 +54,8 @@ PLATFORMS ruby DEPENDENCIES - maid (~> 0.10.0) + maid (~> 0.11.2) rake BUNDLED WITH - 2.6.6 + 2.7.2 diff --git a/pkgs/by-name/ma/maid/gemset.nix b/pkgs/by-name/ma/maid/gemset.nix index d7618cccc983..01ba5e80287a 100644 --- a/pkgs/by-name/ma/maid/gemset.nix +++ b/pkgs/by-name/ma/maid/gemset.nix @@ -160,10 +160,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v1lhwgxyli10rinw6h33ikhskx9j3b20h7plrx8c69z05sfsdd9"; + sha256 = "154rhbdplhrirxpli2jwwsmzcrk8vj51cn6zh8r7lp97vlrkybgp"; type = "gem"; }; - version = "0.10.0"; + version = "0.11.2"; }; mime-types = { dependencies = [ @@ -256,10 +256,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; + sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7"; type = "gem"; }; - version = "1.2.2"; + version = "1.4.0"; }; tzinfo = { dependencies = [ "concurrent-ruby" ]; From a33d3dba0238f1120dfc78848240805d392216e6 Mon Sep 17 00:00:00 2001 From: Henry Date: Sat, 13 Dec 2025 23:14:48 -0600 Subject: [PATCH 10/67] gradle_9: 9.1.0 -> 9.2.1 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 309e3abe5792..c6b337734e08 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -364,8 +364,8 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_9 = mkGradle { - version = "9.1.0"; - hash = "sha256-oX3dhaJran9d23H/iwX8UQTAICxuZHgkKXkMkzaGyAY="; + version = "9.2.1"; + hash = "sha256-cvRMn468sa9Dg49F7lxKqcVESJizRoqz9K97YHbFvD8="; defaultJava = jdk21; }; gradle_8 = mkGradle { From 7be3d9275c88e5b86dc17a4da098038b9a20e7c5 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Sun, 14 Dec 2025 11:12:05 +0100 Subject: [PATCH 11/67] clojure-lsp: 2025.08.25-14.21.46 -> 2025.11.28-12.47.43 release notes: https://github.com/clojure-lsp/clojure-lsp/releases/tag/2025.11.28-12.47.43 --- pkgs/by-name/cl/clojure-lsp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clojure-lsp/package.nix b/pkgs/by-name/cl/clojure-lsp/package.nix index 00bc09a9ea95..3ae353c04a75 100644 --- a/pkgs/by-name/cl/clojure-lsp/package.nix +++ b/pkgs/by-name/cl/clojure-lsp/package.nix @@ -12,11 +12,11 @@ buildGraalvmNativeImage (finalAttrs: { pname = "clojure-lsp"; - version = "2025.08.25-14.21.46"; + version = "2025.11.28-12.47.43"; src = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${finalAttrs.version}/clojure-lsp-standalone.jar"; - hash = "sha256-J89RHgxLJHSRQfbSLT0MhX7kDMsZEWjK8RGGIyx6dik="; + hash = "sha256-An7sTudpP2Ct32sYShNhgRsHgJJIN9H+sR5MlQ8i+7o="; }; extraNativeImageBuildArgs = [ From 7887f450822f3d9f05dbcadc8dd02faf61cf23d6 Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Sun, 14 Dec 2025 12:52:57 +0100 Subject: [PATCH 12/67] fastlane: 2.227.2 -> 2.229.1 --- pkgs/by-name/fa/fastlane/Gemfile.lock | 65 +++++++------- pkgs/by-name/fa/fastlane/gemset.nix | 117 +++++++++++++++----------- 2 files changed, 104 insertions(+), 78 deletions(-) diff --git a/pkgs/by-name/fa/fastlane/Gemfile.lock b/pkgs/by-name/fa/fastlane/Gemfile.lock index d8c0b76d959f..20bfdd697a86 100644 --- a/pkgs/by-name/fa/fastlane/Gemfile.lock +++ b/pkgs/by-name/fa/fastlane/Gemfile.lock @@ -1,40 +1,40 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.7) - base64 - nkf - rexml + CFPropertyList (3.0.8) abbrev (0.1.2) - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) + addressable (2.8.8) + public_suffix (>= 2.0.2, < 8.0) artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.3.2) - aws-partitions (1.1106.0) - aws-sdk-core (3.224.0) + aws-eventstream (1.4.0) + aws-partitions (1.1194.0) + aws-sdk-core (3.239.2) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) base64 + bigdecimal jmespath (~> 1, >= 1.6.1) logger - aws-sdk-kms (1.101.0) - aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-kms (1.118.0) + aws-sdk-core (~> 3, >= 3.239.1) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.186.1) - aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-s3 (1.206.0) + aws-sdk-core (~> 3, >= 3.234.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.11.0) + aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) + bigdecimal (3.3.1) claide (1.1.0) colored (1.2) colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) + csv (3.3.5) declarative (0.0.20) digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) @@ -54,14 +54,14 @@ GEM faraday-rack (~> 1.0) faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) - faraday-cookie_jar (0.0.7) + faraday-cookie_jar (0.0.8) faraday (>= 0.8.0) - http-cookie (~> 1.0.0) + http-cookie (>= 1.0.0) faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) + faraday-em_synchrony (1.0.1) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.1.0) + faraday-multipart (1.1.1) multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) @@ -71,15 +71,18 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.0) - fastlane (2.227.2) + fastlane (2.229.1) CFPropertyList (>= 2.3, < 4.0.0) + abbrev (~> 0.1.2) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) + base64 (~> 0.2.0) bundler (>= 1.12.0, < 3.0.0) colored (~> 1.2) commander (~> 4.6) + csv (~> 3.3) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) excon (>= 0.71.0, < 1.0.0) @@ -99,7 +102,9 @@ GEM jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) multipart-post (>= 2.0.0, < 3.0.0) + mutex_m (~> 0.3.0) naturally (~> 2.2) + nkf (~> 0.2.0) optparse (>= 0.1.1, < 1.0.0) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) @@ -158,37 +163,37 @@ GEM httpclient (2.9.0) mutex_m jmespath (1.6.2) - json (2.12.1) - jwt (2.10.1) + json (2.18.0) + jwt (2.10.2) base64 logger (1.7.0) mini_magick (4.13.2) mini_mime (1.1.5) - multi_json (1.15.0) + multi_json (1.18.0) multipart-post (2.4.1) mutex_m (0.3.0) nanaimo (0.4.0) - naturally (2.2.1) + naturally (2.3.0) nkf (0.2.0) - optparse (0.6.0) + optparse (0.8.1) os (1.1.4) plist (3.7.2) - public_suffix (6.0.2) - rake (13.2.1) + public_suffix (7.0.0) + rake (13.3.1) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.4.1) + rexml (3.4.4) rouge (3.28.0) ruby2_keywords (0.0.5) rubyzip (2.4.1) security (0.1.5) - signet (0.20.0) + signet (0.21.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) - jwt (>= 1.5, < 3.0) + jwt (>= 1.5, < 4.0) multi_json (~> 1.10) simctl (1.6.10) CFPropertyList @@ -225,4 +230,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.6.6 + 2.7.2 diff --git a/pkgs/by-name/fa/fastlane/gemset.nix b/pkgs/by-name/fa/fastlane/gemset.nix index fbf71e8fb866..b11eb5df1f52 100644 --- a/pkgs/by-name/fa/fastlane/gemset.nix +++ b/pkgs/by-name/fa/fastlane/gemset.nix @@ -15,10 +15,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; + sha256 = "0mxhjgihzsx45l9wh2n0ywl9w0c6k70igm5r0d63dxkcagwvh4vw"; type = "gem"; }; - version = "2.8.7"; + version = "2.8.8"; }; artifactory = { groups = [ "default" ]; @@ -45,20 +45,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y"; + sha256 = "0fqqdqg15rgwgz3mn4pj91agd20csk9gbrhi103d20328dfghsqi"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.0"; }; aws-partitions = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12svi07s5hss8wq9xpaxwy1ibl64bd00hsn12v810wvz19fw823l"; + sha256 = "04887dhff1nw3pwrfxmqwl0mwd1dzmxfdvjgn6f6n9pl6mbwdinw"; type = "gem"; }; - version = "1.1106.0"; + version = "1.1194.0"; }; aws-sdk-core = { dependencies = [ @@ -66,6 +66,7 @@ "aws-partitions" "aws-sigv4" "base64" + "bigdecimal" "jmespath" "logger" ]; @@ -73,10 +74,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1b0pi1iibp644dn78g53s7hs7gcxghfa7h8rz3lvz8ivykisl5y6"; + sha256 = "0fgjki9wja72m5ip1dq5zx8msn1sdw9qid4z7wd0dnqbxr2ii056"; type = "gem"; }; - version = "3.224.0"; + version = "3.239.2"; }; aws-sdk-kms = { dependencies = [ @@ -87,10 +88,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mv8jc8sbvim2m3y3zxm8z4i5sh4x9ds7y9h5z04qfg7kjvbbn24"; + sha256 = "1gbgf7xgg2hrrc51g3mpf0isba801w0r0z45mjnh45agdmcm3iy9"; type = "gem"; }; - version = "1.101.0"; + version = "1.118.0"; }; aws-sdk-s3 = { dependencies = [ @@ -102,10 +103,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00sq22mfibxq3rjy9c4vj1s8yjszv8988di7z7rs8v62my53nw2v"; + sha256 = "1v9as5bvkxk5nqfbchram8v7rsimnpp0v8wxcp20bwdw3dlf9yc5"; type = "gem"; }; - version = "1.186.1"; + version = "1.206.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -113,10 +114,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h"; + sha256 = "003ch8qzh3mppsxch83ns0jra8d222ahxs96p9cdrl0grfazywv9"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.1"; }; babosa = { groups = [ "default" ]; @@ -138,20 +139,25 @@ }; version = "0.2.0"; }; - CFPropertyList = { - dependencies = [ - "base64" - "nkf" - "rexml" - ]; + bigdecimal = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0k1w5i4lb1z941m7ds858nly33f3iv12wvr1zav5x3fa99hj2my4"; + sha256 = "0612spks81fvpv2zrrv3371lbs6mwd7w6g5zafglyk75ici1x87a"; type = "gem"; }; - version = "3.0.7"; + version = "3.3.1"; + }; + CFPropertyList = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0qa226xndfs9r6c7qj7zs6yhzrcbmicvvxsjn9x3svakh3cx169c"; + type = "gem"; + }; + version = "3.0.8"; }; claide = { groups = [ "default" ]; @@ -194,6 +200,16 @@ }; version = "4.6.0"; }; + csv = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf"; + type = "gem"; + }; + version = "3.3.5"; + }; declarative = { groups = [ "default" ]; platforms = [ ]; @@ -287,10 +303,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk"; + sha256 = "1fwx5720g33w3zycyq636m4fbn5fd94fxk4g0b3n7k7q4dc60h01"; type = "gem"; }; - version = "0.0.7"; + version = "0.0.8"; }; faraday-em_http = { groups = [ "default" ]; @@ -307,10 +323,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + sha256 = "0l0pz1wk2mk6p6hbfd86jfad59jyk201y1db379qhc2lrxfy8g5z"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; faraday-excon = { groups = [ "default" ]; @@ -338,10 +354,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5"; + sha256 = "00w9imp55hi81q0wsgwak90ldkk7gbyb8nzmmv8hy0s907s8z8bp"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; faraday-net_http = { groups = [ "default" ]; @@ -417,12 +433,15 @@ fastlane = { dependencies = [ "CFPropertyList" + "abbrev" "addressable" "artifactory" "aws-sdk-s3" "babosa" + "base64" "colored" "commander" + "csv" "dotenv" "emoji_regex" "excon" @@ -442,7 +461,9 @@ "jwt" "mini_magick" "multipart-post" + "mutex_m" "naturally" + "nkf" "optparse" "plist" "rubyzip" @@ -461,10 +482,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1dw9smmpzhlca2zzp2pgmr2slhwnz8926s5rnjfjrclilz33p22z"; + sha256 = "08q875hq41yvw44n55lsjz41pfawys85c4ws9swg5jwx7hf8rv3z"; type = "gem"; }; - version = "2.227.2"; + version = "2.229.1"; }; fastlane-sirp = { dependencies = [ "sysrandom" ]; @@ -668,10 +689,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fr0dxwn5a7z5m3i16v66pc35wmwc6mgj9f8dg7ch2bwq42y73zw"; + sha256 = "01fmiz052cvnxgdnhb3qwcy88xbv7l3liz0fkvs5qgqqwjp0c1di"; type = "gem"; }; - version = "2.12.1"; + version = "2.18.0"; }; jwt = { dependencies = [ "base64" ]; @@ -679,10 +700,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6"; + sha256 = "1x64l31nkqjwfv51s2vsm0yqq4cwzrlnji12wvaq761myx3fxq9i"; type = "gem"; }; - version = "2.10.1"; + version = "2.10.2"; }; logger = { groups = [ "default" ]; @@ -719,10 +740,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + sha256 = "0vsrfm36zlg7jbrd1fjbr8kmdvr8bfayrw0hdlza75987vvhrxr3"; type = "gem"; }; - version = "1.15.0"; + version = "1.18.0"; }; multipart-post = { groups = [ "default" ]; @@ -759,10 +780,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04x1nkx6gkqzlc4phdvq05v3vjds6mgqhjqzqpcs6vdh5xyqrf59"; + sha256 = "00cy2wg40rsasnbl0cjcj3jcghq068v445rh90q63rn2fv7j76a5"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.0"; }; nkf = { groups = [ "default" ]; @@ -779,10 +800,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1306kdvq0xr333xma4452zvvvw6mx7fw20fwi6508i6dq5lh9s95"; + sha256 = "06mx0g76bqwyrv8hxdikhyziyq8x8j8rk9l0y3scyz4hac6s3gj2"; type = "gem"; }; - version = "0.6.0"; + version = "0.8.1"; }; os = { groups = [ "default" ]; @@ -809,20 +830,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz"; + sha256 = "15dhl6k4gbax0xz8frfs4nsb6lg5zgax9vkr1pqzjmhfxddhn2gp"; type = "gem"; }; - version = "6.0.2"; + version = "7.0.0"; }; rake = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; + sha256 = "175iisqb211n0qbfyqd8jz2g01q6xj038zjf4q0nm8k6kz88k7lc"; type = "gem"; }; - version = "13.2.1"; + version = "13.3.1"; }; representable = { dependencies = [ @@ -854,10 +875,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; + sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r"; type = "gem"; }; - version = "3.4.1"; + version = "3.4.4"; }; rouge = { groups = [ "default" ]; @@ -910,10 +931,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18s7xiclzajp9w9cmq8k28iy5ig1zpx1zv1mrm416cb2c0m0wrmw"; + sha256 = "0nydm087m5c3j85gvzvz30w1qb9pl2lzpznw746jha29ybxyj5yn"; type = "gem"; }; - version = "0.20.0"; + version = "0.21.0"; }; simctl = { dependencies = [ From c63c57feb6a54ec8474bcd6407e632c85aca3d52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 18:06:22 +0000 Subject: [PATCH 13/67] networkmanager-l2tp: 1.20.20 -> 1.20.22 --- pkgs/by-name/ne/networkmanager-l2tp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/networkmanager-l2tp/package.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix index 3e1ccfdd95eb..51abfafae5ba 100644 --- a/pkgs/by-name/ne/networkmanager-l2tp/package.nix +++ b/pkgs/by-name/ne/networkmanager-l2tp/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; pname = "NetworkManager-l2tp"; - version = "1.20.20"; + version = "1.20.22"; src = fetchFromGitHub { owner = "nm-l2tp"; repo = "network-manager-l2tp"; rev = version; - hash = "sha256-AmbDWBCUG9fvqA6iJopYtbitdRwv2faWvIeKN90p234="; + hash = "sha256-TuYLNjogR3psb1B9zonHzRQext0ROS4ueD2WcWkseJk="; }; patches = [ From b7494c8f266c7d5745842139b8088a950c50fe89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 21:07:51 +0000 Subject: [PATCH 14/67] python3Packages.ihm: 2.7 -> 2.8 --- pkgs/development/python-modules/ihm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index 08223acd1b79..7830ba09d1b5 100644 --- a/pkgs/development/python-modules/ihm/default.nix +++ b/pkgs/development/python-modules/ihm/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ihm"; - version = "2.7"; + version = "2.8"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; tag = version; - hash = "sha256-ZMHVYuNcUjhMKJUr5bCIELO6F0CNi0ESfbsBm5vOiA4="; + hash = "sha256-sT2wZRKyW+N0gd6xwOAEXImMnWKWq8h9UX1b3qkDLGQ="; }; nativeBuildInputs = [ swig ]; From 6ef911330077b6d56e78eecb86b030150e3dee30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 22:11:53 +0000 Subject: [PATCH 15/67] gate: 0.61.0 -> 0.62.0 --- pkgs/by-name/ga/gate/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix index 46dec148531d..3f624e395b24 100644 --- a/pkgs/by-name/ga/gate/package.nix +++ b/pkgs/by-name/ga/gate/package.nix @@ -6,7 +6,7 @@ let pname = "gate"; - version = "0.61.0"; + version = "0.62.0"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "minekube"; repo = "gate"; tag = "v${version}"; - hash = "sha256-HCxsydmCjhbL2hiZ4EEjsODXKWoAv2Azi/HvUU6aOIg="; + hash = "sha256-8zvHC6Ghf2IziCLYTxGe/z3u6li37EBOb5AK2gGhoUQ="; }; vendorHash = "sha256-f7SkECS80Lwkd0xSzHq+x05ZBjBYKXsA4rPidyIAYak="; From 80b339e1b0bfc8fc7ee024a84fe812ace840e15e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Dec 2025 01:08:03 +0000 Subject: [PATCH 16/67] grafanaPlugins.victoriametrics-logs-datasource: 0.22.3 -> 0.22.4 --- .../plugins/victoriametrics-logs-datasource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix index 9a478cbc399f..178e818049ad 100644 --- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "victoriametrics-logs-datasource"; - version = "0.22.3"; - zipHash = "sha256-j4cH6b3nZcl9rWrUXBox/EaEm8V7KHXvFAOMRw+9fzU="; + version = "0.22.4"; + zipHash = "sha256-xDq8p86N2tgzFaNoE5/r4hgFc560bVl7VWGGL2teHuA="; meta = { description = "Grafana datasource for VictoriaLogs"; license = lib.licenses.asl20; From 34f8cacaa6c1119fedb17d1d0568aca352b208f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Dec 2025 01:25:13 +0000 Subject: [PATCH 17/67] goa: 3.23.2 -> 3.23.4 --- pkgs/by-name/go/goa/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/goa/package.nix b/pkgs/by-name/go/goa/package.nix index d3db636c31f2..9832455a1979 100644 --- a/pkgs/by-name/go/goa/package.nix +++ b/pkgs/by-name/go/goa/package.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "goa"; - version = "3.23.2"; + version = "3.23.4"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - hash = "sha256-8AcpYTc909MyQYJBArHypMOefNcj1DaJcM2w4NpmcLI="; + hash = "sha256-7+hOXJU2a39ytn08FlR/YAhOnAmVL5JxdcvF1AlOxHk="; }; - vendorHash = "sha256-2H5VtNZiOnx1gFSVaBu7q4HTeLhBbIDK01fixBB66M4="; + vendorHash = "sha256-VSjiEgkjLMFRThNI4G7O91wpF8CYaIVYOrtE49S/o3w="; subPackages = [ "cmd/goa" ]; From 8f9744c8cef366374be1531f11984afcfb3cfae9 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Mon, 15 Dec 2025 18:26:49 +0100 Subject: [PATCH 18/67] noriskclient-launcher-unwrapped: init at 0.6.14 --- .../disable-bundling.patch | 22 +++++ .../java-from-path.patch | 34 +++++++ .../package.nix | 93 +++++++++++++++++++ 3 files changed, 149 insertions(+) create mode 100644 pkgs/by-name/no/noriskclient-launcher-unwrapped/disable-bundling.patch create mode 100644 pkgs/by-name/no/noriskclient-launcher-unwrapped/java-from-path.patch create mode 100644 pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix diff --git a/pkgs/by-name/no/noriskclient-launcher-unwrapped/disable-bundling.patch b/pkgs/by-name/no/noriskclient-launcher-unwrapped/disable-bundling.patch new file mode 100644 index 000000000000..8666b86ddfef --- /dev/null +++ b/pkgs/by-name/no/noriskclient-launcher-unwrapped/disable-bundling.patch @@ -0,0 +1,22 @@ +diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json +index bb58d13..c1046f8 100644 +--- a/src-tauri/tauri.conf.json ++++ b/src-tauri/tauri.conf.json +@@ -100,7 +100,7 @@ + } + } + }, +- "active": true, ++ "active": false, + "targets": ["app", "dmg", "deb", "appimage", "nsis"], + "icon": [ + "icons/32x32.png", +@@ -109,7 +109,7 @@ + "icons/icon.icns", + "icons/icon.ico" + ], +- "createUpdaterArtifacts": true, ++ "createUpdaterArtifacts": false, + "fileAssociations": [ + { + "ext": ["noriskpack"], diff --git a/pkgs/by-name/no/noriskclient-launcher-unwrapped/java-from-path.patch b/pkgs/by-name/no/noriskclient-launcher-unwrapped/java-from-path.patch new file mode 100644 index 000000000000..3403c305ee2c --- /dev/null +++ b/pkgs/by-name/no/noriskclient-launcher-unwrapped/java-from-path.patch @@ -0,0 +1,34 @@ +diff --git a/src-tauri/src/minecraft/downloads/java_download.rs b/src-tauri/src/minecraft/downloads/java_download.rs +index 25ab9b2..d1af896 100644 +--- a/src-tauri/src/minecraft/downloads/java_download.rs ++++ b/src-tauri/src/minecraft/downloads/java_download.rs +@@ -9,6 +9,7 @@ use flate2::read::GzDecoder; + use futures::future::try_join_all; + use log::{debug, error, info}; + use reqwest; ++use std::env; + use std::fs::File; + use std::io::Cursor; + use std::path::PathBuf; +@@ -526,6 +527,21 @@ impl JavaDownloadService { + ], + }; + ++ let target = format!("openjdk-{}", version); ++ match env::var_os("PATH") { ++ Some(paths) => { ++ for path in env::split_paths(&paths) { ++ if let Some(path_str) = path.to_str() { ++ if path_str.contains(&target) { ++ debug!("Found Java binary at: {:?}", path); ++ return Ok(path) ++ } ++ } ++ } ++ } ++ none => debug!("PATH is not defined"), ++ } ++ + // Try all possible paths + for java_binary in java_binary_paths { + debug!("Checking for Java binary at: {:?}", java_binary); diff --git a/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix b/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix new file mode 100644 index 000000000000..107fee8ecac5 --- /dev/null +++ b/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix @@ -0,0 +1,93 @@ +{ + cargo-tauri, + desktop-file-utils, + fetchFromGitHub, + fetchYarnDeps, + glib, + gtk3, + libayatana-appindicator, + lib, + nix-update-script, + nodejs, + openssl, + pkg-config, + rustPlatform, + stdenv, + webkitgtk_4_1, + yarnConfigHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "noriskclient-launcher-unwrapped"; + version = "0.6.14"; + + src = fetchFromGitHub { + owner = "NoRiskClient"; + repo = "noriskclient-launcher"; + tag = "v${finalAttrs.version}"; + hash = "sha256-9UUNIS8r/695maQ2j2+Wj2L5qy55Wfs/MNhKJnwC6GI="; + }; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-IWgP4VEyEBNsxALKGMpk8WZCIc76qcEu5K+kYqsdYkQ="; + }; + + patches = [ + # The tauri.conf.json is configured to build multiple apps. We don't want that here. + ./disable-bundling.patch + + # Make the launcher find java from PATH, instead of downloading its own, which is not going to work on NixOS. + ./java-from-path.patch + ]; + + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + ''; + + cargoHash = "sha256-heSUEW7r9Lt26Fu68Jo/7BHW6Qmp8GrRSavukCS+ySk="; + + cargoRoot = "src-tauri"; + buildAndTestSubdir = finalAttrs.cargoRoot; + + nativeBuildInputs = [ + cargo-tauri.hook + desktop-file-utils + nodejs + pkg-config + yarnConfigHook + ]; + + buildInputs = [ + glib + gtk3 + libayatana-appindicator + openssl + webkitgtk_4_1 + ]; + + postInstall = '' + desktop-file-edit \ + --set-name "NoRiskClient Launcher" \ + --set-comment "Launcher for NoRiskClient" \ + --set-key="Categories" --set-value="Game" \ + --set-key="Keywords" --set-value="nrc;minecraft;mc;" \ + $out/share/applications/NoRisk\ Launcher.desktop + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Minecraft Launcher for NoRisk Client"; + homepage = "https://norisk.gg"; + license = lib.licenses.gpl3; + longDescription = '' + An easy way to launch the NoRisk Client, create modpacks, + manage content for Minecraft, and much more - written in tauri. + ''; + maintainers = with lib.maintainers; [ hythera ]; + mainProgram = "noriskclient-launcher-v3"; + platforms = lib.platforms.linux; + }; +}) From cb94a30e8a73ce82863db968519e27ff3200d5a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Dec 2025 18:24:04 +0000 Subject: [PATCH 19/67] zap: 2.16.1 -> 2.17.0 --- pkgs/by-name/za/zap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/za/zap/package.nix b/pkgs/by-name/za/zap/package.nix index 5dbf70e3a184..09eb0d8aca0a 100644 --- a/pkgs/by-name/za/zap/package.nix +++ b/pkgs/by-name/za/zap/package.nix @@ -10,10 +10,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "zap"; - version = "2.16.1"; + version = "2.17.0"; src = fetchurl { url = "https://github.com/zaproxy/zaproxy/releases/download/v${finalAttrs.version}/ZAP_${finalAttrs.version}_Linux.tar.gz"; - hash = "sha256-Wy64MZsIUSGm6K1Q1p1n2++MhnFm9xqTe/yIjSR6KsE="; + hash = "sha256-7+eZqqNifbaDtD8AycIQrqC3XADMjwoPBDTRK7Pd3lo="; }; desktopItems = [ From 82963b47ead0fb35537eedfc9e91f1edd5e1c98a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 15 Dec 2025 21:56:31 +0100 Subject: [PATCH 20/67] ocamlPackages.extunix: fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix src url (now the package knows about its version). Set minimalOCamlVersion (this library needs ppxlib ≥ 0.36). --- pkgs/development/ocaml-modules/extunix/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/extunix/default.nix b/pkgs/development/ocaml-modules/extunix/default.nix index da2bc782a2a1..5cc8a576abe3 100644 --- a/pkgs/development/ocaml-modules/extunix/default.nix +++ b/pkgs/development/ocaml-modules/extunix/default.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage, - fetchFromGitHub, + fetchurl, dune-configurator, ppxlib, }: @@ -10,11 +10,11 @@ buildDunePackage (finalAttrs: { pname = "extunix"; version = "0.4.4"; - src = fetchFromGitHub { - owner = "ygrek"; - repo = "extunix"; - tag = "v${finalAttrs.version}"; - hash = "sha256-7wJDGv19etkDHRwwQ+WONtJswxNMjr2Q2Vhis4WgFek="; + minimalOCamlVersion = "5.3.0"; + + src = fetchurl { + url = "https://github.com/ygrek/extunix/releases/download/v${finalAttrs.version}/extunix-${finalAttrs.version}.tbz"; + hash = "sha256-kzTIkjFiI+aK73lcpystQp1O7Apkf0GLA142oFPRSX0="; }; postPatch = '' From 0f5049b654b471125f90ca15fe3fa56da378ebc6 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 16 Dec 2025 08:00:25 +0100 Subject: [PATCH 21/67] python3.pkgs.beautifulsoup4: 4.13.4 -> 4.14.3 Changelog: https://git.launchpad.net/beautifulsoup/tree/CHANGELOG?h=4.14.2&id=fc02060f68535fa478cf8301bb7ee5ce95a70ffd (pypi release 4.13.3 does not have a git tag) --- .../python-modules/beautifulsoup4/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 405161169116..431ec3b1194c 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.13.4"; + version = "4.14.3"; pyproject = true; outputs = [ @@ -45,18 +45,9 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-27PE4c6uau/r2vJCMkcmDNBiQwpBDjjGbyuqUKhDcZU="; + hash = "sha256-YpKxxRhtNWu6Zp759/BRdXCZVlrZraXdYwvZ3l+n+4Y="; }; - patches = [ - # backport test fix for behavior changes in libxml 2.14.3 - (fetchpatch { - url = "https://git.launchpad.net/beautifulsoup/patch/?id=53d328406ec8c37c0edbd00ace3782be63e2e7e5"; - excludes = [ "CHANGELOG" ]; - hash = "sha256-RtavbpnfT6x0A8L3tAvCXwKUpty1ASPGJKdks7evBr8="; - }) - ]; - build-system = [ hatchling ]; nativeBuildInputs = [ sphinxHook ]; From 960ddd7b27f09fe758a0373897423234dc6283e1 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 16 Dec 2025 08:08:06 +0100 Subject: [PATCH 22/67] python3.pkgs.beautifulsoup4: add patch for python 3.14.1 Fixes #470964 --- .../python-modules/beautifulsoup4/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 431ec3b1194c..b32ee083f165 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -48,6 +48,15 @@ buildPythonPackage rec { hash = "sha256-YpKxxRhtNWu6Zp759/BRdXCZVlrZraXdYwvZ3l+n+4Y="; }; + patches = [ + # Fix tests with python 3.13.10 / 3.14.1 + (fetchpatch { + url = "https://git.launchpad.net/beautifulsoup/patch/?id=55f655ffb7ef03bdd1df0f013743831fe54e3c7a"; + excludes = [ "CHANGELOG" ]; + hash = "sha256-DJl1pey0NdJH+SyBH9+y6gwUvQCmou0D9xcRAEV8OBw="; + }) + ]; + build-system = [ hatchling ]; nativeBuildInputs = [ sphinxHook ]; From 7bf4cc2038f4b2dd11e1abafb7b894631bfcc049 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Dec 2025 09:14:05 +0000 Subject: [PATCH 23/67] terraform-providers.dnsimple_dnsimple: 1.10.0 -> 2.0.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 6e2ff5a47312..bfe82c45e9eb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -318,13 +318,13 @@ "vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE=" }, "dnsimple_dnsimple": { - "hash": "sha256-Zx4M0TKamyfm5Z5EAtiHWQQTNX/VT0EkAaHM7x/2SGk=", + "hash": "sha256-zPvHTSmptdm5w28rpgmwrYBIo+0Y077wZ+FNKbKHaT4=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v1.10.0", + "rev": "v2.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-M6Z/wMOKhQncuHAhkSPfWT77b14lIZ/sVQT7DmM60FI=" + "vendorHash": "sha256-DRMbcAR+DDrxrg1jNgnoWUg+OjlKm7wkqgIN6Hhkp3U=" }, "dnsmadeeasy_dme": { "hash": "sha256-JH9YcM9Fvd1x0BJpLUZCm6a9hZZxySrkFVLP89FO3fU=", From 58071b89703da188f7a7ae93587fff8d0d054594 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Wed, 17 Sep 2025 21:36:53 +0300 Subject: [PATCH 24/67] timidity: fix build with gcc15 - add "-std=gnu17" to `env.NIX_CFLAGS_COMPILE` Upstream had no version updates since 2018 Other distros also opted for "-std=gnu11" or "-std=gnu17": https://src.fedoraproject.org/rpms/timidity++/c/ce4c5633a1d10d9065a0da748e27308a7c5c4bc7 https://github.com/gentoo/gentoo/commit/80744c4db244cadc7a5bf9da9d975404222431d6 Fixes build failure with gcc15: ``` nkflib.c:389:5: error: conflicting types for 'line_fold'; have 'int(void)' 389 | int line_fold(); | ^~~~~~~~~ nkflib.c:319:17: note: previous declaration of 'line_fold' with type 'int(int, int)' 319 | static int line_fold(int c2,int c1); | ^~~~~~~~~ nkflib.c: In function 'e_oconv': nkflib.c:1594:16: error: too many arguments to function 'line_fold'; expected 0, have 2 1594 | switch(line_fold(c2,c1)) { | ^~~~~~~~~ ~~ nkflib.c:389:5: note: declared here 389 | int line_fold(); | ^~~~~~~~~ nkflib.c: In function 's_oconv': nkflib.c:1646:16: error: too many arguments to function 'line_fold'; expected 0, have 2 1646 | switch(line_fold(c2,c1)) { | ^~~~~~~~~ ~~ nkflib.c:389:5: note: declared here 389 | int line_fold(); | ^~~~~~~~~ nkflib.c: In function 'j_oconv': nkflib.c:1694:16: error: too many arguments to function 'line_fold'; expected 0, have 2 1694 | switch(line_fold(c2,c1)) { | ^~~~~~~~~ ~~ nkflib.c:389:5: note: declared here 389 | int line_fold(); | ^~~~~~~~~ nkflib.c: At top level: nkflib.c:1829:1: error: conflicting types for 'line_fold'; have 'int(int, int)' 1829 | line_fold(int c2, int c1) | ^~~~~~~~~ nkflib.c:389:5: note: previous declaration of 'line_fold' with type 'int(void)' 389 | int line_fold(); | ^~~~~~~~~ ``` --- pkgs/by-name/ti/timidity/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ti/timidity/package.nix b/pkgs/by-name/ti/timidity/package.nix index 73300dfa3cd5..1d26190c5b52 100644 --- a/pkgs/by-name/ti/timidity/package.nix +++ b/pkgs/by-name/ti/timidity/package.nix @@ -99,6 +99,9 @@ stdenv.mkDerivation rec { sed -i 's/^\(calcnewt\$(EXEEXT):\).*/\1/g' timidity/Makefile ''; + # Fix build with gcc15 + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + # the instruments could be compressed (?) postInstall = '' mkdir -p $out/share/timidity/; From 5a122362d246fabd77ad637f1157fc5c68ebeef5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Dec 2025 18:21:29 +0000 Subject: [PATCH 25/67] terraform-providers.ibm-cloud_ibm: 1.86.0 -> 1.86.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 6e2ff5a47312..34444d75c05a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -714,13 +714,13 @@ "vendorHash": null }, "ibm-cloud_ibm": { - "hash": "sha256-S1Azsq42GEqgpqVB3Wpi6EJAL8x+s+i+oTJFPQCVfeI=", + "hash": "sha256-xiiQKp4ZBLAR1OM31D8UWJbaZ2SkzrBIr3uW3N3iSZg=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.86.0", + "rev": "v1.86.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-IDv2L1fFqhbThc3kO6UNM+6hRJ+DZkT7voc/m3c5BCA=" + "vendorHash": "sha256-vHgeVhZV9JLH2vXwFUO0N8xp8BLBPk7ypK+kkWwtbTk=" }, "icinga_icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", From b92751652ea0565b8c6922131c5b81f63d297e10 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Tue, 16 Dec 2025 20:23:53 +0100 Subject: [PATCH 26/67] pypy: remove explicit darwin minimum SDK PyPy sets an explicit minimum SDK version for darwin that is much older than what we we default to on nixpkgs (currently 14.0). Simply removing the explicit flag makes it use our default instead. This fixes a build failure where PyPy tries to access APIs that are not available in the macOS SDK it is targetting. This is technically not relevant for upstream as this is an opt-in warning which we have recently enabled by default (as error) on nixpkgs, but they too should bump the minimum target to at least 10.15 from their current target of 10.13. --- .../python/pypy/darwin_version_min.patch | 19 +++++++++++++++++++ .../interpreters/python/pypy/default.nix | 5 +++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/interpreters/python/pypy/darwin_version_min.patch diff --git a/pkgs/development/interpreters/python/pypy/darwin_version_min.patch b/pkgs/development/interpreters/python/pypy/darwin_version_min.patch new file mode 100644 index 000000000000..18b5726ce13d --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/darwin_version_min.patch @@ -0,0 +1,19 @@ +diff --git a/rpython/translator/platform/darwin.py b/rpython/translator/platform/darwin.py +index 8c824a8459..f407fb6c07 100644 +--- a/rpython/translator/platform/darwin.py ++++ b/rpython/translator/platform/darwin.py +@@ -26,12 +26,12 @@ class Darwin(posix.BasePosix): + standalone_only = ('-mdynamic-no-pic',) + shared_only = () + +- link_flags = (DARWIN_VERSION_MIN,) ++ link_flags = () + cflags = ('-O3', + '-fomit-frame-pointer', + # The parser turns 'const char *const *includes' into 'const const char **includes' + '-Wno-duplicate-decl-specifier', +- DARWIN_VERSION_MIN,) ++ ) + + so_ext = 'dylib' + DEFAULT_CC = 'clang' diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 727e76b7fd7a..bfe766fc2917 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -171,6 +171,11 @@ stdenv.mkDerivation rec { inherit (sqlite) out dev; libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"; }) + + # PyPy sets an explicit minimum SDK version for darwin that is much older + # than what we default to on nixpkgs. + # Simply removing the explicit flag makes it use our default instead. + ./darwin_version_min.patch ]; postPatch = '' From 90be4a2cf36dd1848a86c60b0ff2fc803b235f21 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 16 Dec 2025 15:16:45 -0500 Subject: [PATCH 27/67] vector: 0.51.1 -> 0.52.0 Changelog: https://github.com/vectordotdev/vector/releases/tag/v0.52.0 --- pkgs/by-name/ve/vector/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix index 36f5a85f4da3..9c15e9e9f788 100644 --- a/pkgs/by-name/ve/vector/package.nix +++ b/pkgs/by-name/ve/vector/package.nix @@ -26,16 +26,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "vector"; - version = "0.51.1"; + version = "0.52.0"; src = fetchFromGitHub { owner = "vectordotdev"; repo = "vector"; tag = "v${finalAttrs.version}"; - hash = "sha256-EjG8FFz4PDAgCPTkHAxJieW+t6RAPx3MTSku8QGXjYg="; + hash = "sha256-jwEJ+myovZYcohvxH1VvvOW8xok3HSLvhtMsLC2M3KY="; }; - cargoHash = "sha256-17hmdom7ZZQQ4vYte3IKZnqlLEv7D7LY6tyWqdeuUHk="; + cargoHash = "sha256-EfgDL5asygFqr8pVcTR9BsYU3fcG28xhrCn5nCkVfcA="; nativeBuildInputs = [ pkg-config From eb6325e2047600db39222c22af8c61ed22e58b75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Dec 2025 21:50:08 +0000 Subject: [PATCH 28/67] python3Packages.millheater: 0.14.1 -> 0.15.0 --- pkgs/development/python-modules/millheater/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix index e43d3e2559c0..429a16ba0e5f 100644 --- a/pkgs/development/python-modules/millheater/default.nix +++ b/pkgs/development/python-modules/millheater/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.14.1"; + version = "0.15.0"; pyproject = true; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pymill"; tag = version; - hash = "sha256-CDPk3AiLFNOovjNi4fDy91BBcxpbyFV9FCN1uU5bxbc="; + hash = "sha256-7Jqk5WarCA/YBpmFuF4/dbWpQHtKKRH8hYRT2FXn2n8="; }; build-system = [ setuptools ]; From e049eee38219bcac99f56761d651b76faa4ee347 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Dec 2025 22:10:46 +0000 Subject: [PATCH 29/67] python3Packages.fastcore: 1.8.17 -> 1.9.2 --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 5d0c383549be..448a05333f71 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.8.17"; + version = "1.9.2"; pyproject = true; src = fetchFromGitHub { owner = "fastai"; repo = "fastcore"; tag = version; - hash = "sha256-RugbfTqgoM+GWswxjYL3vpLdEifGCDaUI7McfQ/mpZ8="; + hash = "sha256-78zqQ8M0XZ6QcaH+6gw4IJDLk9d1WxjPiCr6puY/srM="; }; build-system = [ setuptools ]; From 0ef272c7e932d64bc21c07e9f20c47ab62d35f01 Mon Sep 17 00:00:00 2001 From: Samuel Silva Date: Tue, 16 Dec 2025 20:59:30 -0300 Subject: [PATCH 30/67] renode: rename binary name Signed-off-by: Samuel Silva --- pkgs/by-name/re/renode/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix index 85f4a4dd846d..229582271888 100644 --- a/pkgs/by-name/re/renode/package.nix +++ b/pkgs/by-name/re/renode/package.nix @@ -183,6 +183,10 @@ buildDotnetModule rec { --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \ ''; + postFixup = '' + mv $out/bin/Renode $out/bin/renode + ''; + executables = [ "Renode" ]; passthru.updateScript = nix-update-script { }; From 4818f01febeb41bfa3b0c444aaab65705e8aedaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 02:06:22 +0000 Subject: [PATCH 31/67] blackmagic-desktop-video: 15.3 -> 15.3.1 --- pkgs/by-name/bl/blackmagic-desktop-video/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix index 07db3178fb0a..a4dbb8b53717 100644 --- a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix +++ b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "blackmagic-desktop-video"; - version = "15.3"; + version = "15.3.1"; buildInputs = [ autoPatchelfHook @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-QcM/FTEYkG1Zteb2TNysQjP/mNS1B2Wa8rqkJ70m24s="; + outputHash = "sha256-4Y7bmN08fZ9hRsyFKP4cfGb4fggLY9bdm32+UTIGiTs="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; From c047671c703f0bac04eafa709668c5832f9d7f4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 03:31:39 +0000 Subject: [PATCH 32/67] penelope: 0.14.8 -> 0.14.14 --- pkgs/by-name/pe/penelope/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pe/penelope/package.nix b/pkgs/by-name/pe/penelope/package.nix index 312ec68d46fd..4aa5ca554bdf 100644 --- a/pkgs/by-name/pe/penelope/package.nix +++ b/pkgs/by-name/pe/penelope/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "penelope"; - version = "0.14.8"; + version = "0.14.14"; pyproject = true; src = fetchFromGitHub { owner = "brightio"; repo = "penelope"; tag = "v${version}"; - hash = "sha256-m4EYP1lKte8r9Xa/xAuv6aiwMNha+B8HXUCizH0JgmI="; + hash = "sha256-rSZkktq/XtlDV/bHC7ad4uhOzT3cnCxrHX7NH1t9cO0="; }; postPatch = '' From 7b75c5f71b9355eec9c8dd27c6cab70eb5557a40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 04:40:59 +0000 Subject: [PATCH 33/67] terraform-providers.scaleway_scaleway: 2.64.0 -> 2.65.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 a3a64785c26d..2f961a0707d0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1174,13 +1174,13 @@ "vendorHash": "sha256-f3b4NULINH8XworCn46fiz4GmBM31ROdAJy1j4GKkx4=" }, "scaleway_scaleway": { - "hash": "sha256-V0mR72RJa+DgWZxnvSCWI6HwZpqewbHT5FKLdSiwGw4=", + "hash": "sha256-LR1e8gAF8htYpxfj/m/Ge266sFRFc8tijaE/9uKYYBw=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.64.0", + "rev": "v2.65.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-Z9EKIWBkmKptQMJFRh5SK2hhKwh5z5Lij0ZwXChOarY=" + "vendorHash": "sha256-HWAaBgKD/viiFaxvyHE4BuWdsY0tCSQFaf8YJq4PS/0=" }, "scottwinkler_shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", From 7be732d69a6b39893837d2da4a5195803080f258 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 04:42:54 +0000 Subject: [PATCH 34/67] python3Packages.drf-pydantic: 2.9.0 -> 2.9.1 --- pkgs/development/python-modules/drf-pydantic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/drf-pydantic/default.nix b/pkgs/development/python-modules/drf-pydantic/default.nix index 2be1211baed3..826a1b2ebe3b 100644 --- a/pkgs/development/python-modules/drf-pydantic/default.nix +++ b/pkgs/development/python-modules/drf-pydantic/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "drf-pydantic"; - version = "2.9.0"; + version = "2.9.1"; pyproject = true; src = fetchFromGitHub { owner = "georgebv"; repo = "drf-pydantic"; tag = "v${version}"; - hash = "sha256-RvDTequtxHyCsXV8IpNWdYNzdjkKEr8aAyS3ZFZTW1A="; + hash = "sha256-/dMhKlAMAh63JlhanfSfe15ECMZvtnd1huD8L3Xo2AQ="; }; build-system = [ From 2d587a560397d4e33019423249b1bb988d812de3 Mon Sep 17 00:00:00 2001 From: matthiasdotsh Date: Wed, 17 Dec 2025 09:05:12 +0100 Subject: [PATCH 35/67] lgpio: Fix cross-compilation build The upstream Makefile [1] supports the CROSS_PREFIX variable to specify the cross-compiler toolchain prefix. Without this, the build fails when cross-compiling (e.g., for aarch64-multiplatform) because it tries to use the native 'gcc' instead of the target compiler. This fix allows building lgpio for other architectures using pkgsCross. [1] https://github.com/joan2937/lg/blob/v0.2.2/Makefile#L4 --- pkgs/by-name/lg/lgpio/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/lg/lgpio/package.nix b/pkgs/by-name/lg/lgpio/package.nix index 73d8c4853d1e..21051bcfa660 100644 --- a/pkgs/by-name/lg/lgpio/package.nix +++ b/pkgs/by-name/lg/lgpio/package.nix @@ -55,6 +55,7 @@ mkDerivation rec { makeFlags = [ "prefix=$(out)" + "CROSS_PREFIX=${stdenv.cc.targetPrefix}" ]; meta = { From 8784eec751743123e221fe36e7382979dd891c6a Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Mon, 15 Dec 2025 18:27:01 +0100 Subject: [PATCH 36/67] noriskclient-launcher: init at 0.6.14 --- .../package.nix | 5 +- .../no/noriskclient-launcher/package.nix | 101 ++++++++++++++++++ 2 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/no/noriskclient-launcher/package.nix diff --git a/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix b/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix index 107fee8ecac5..b4b8adfbea7c 100644 --- a/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix +++ b/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix @@ -12,7 +12,6 @@ openssl, pkg-config, rustPlatform, - stdenv, webkitgtk_4_1, yarnConfigHook, }: @@ -41,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ./java-from-path.patch ]; - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' + postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" ''; @@ -81,7 +80,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Minecraft Launcher for NoRisk Client"; homepage = "https://norisk.gg"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; longDescription = '' An easy way to launch the NoRisk Client, create modpacks, manage content for Minecraft, and much more - written in tauri. diff --git a/pkgs/by-name/no/noriskclient-launcher/package.nix b/pkgs/by-name/no/noriskclient-launcher/package.nix new file mode 100644 index 000000000000..19dfce8d4c5a --- /dev/null +++ b/pkgs/by-name/no/noriskclient-launcher/package.nix @@ -0,0 +1,101 @@ +{ + addDriverRunpath, + alsa-lib, + flite, + glib, + glib-networking, + gsettings-desktop-schemas, + jdk17, + jdk21, + jdk8, + jdks ? [ + jdk8 + jdk17 + jdk21 + ], + lib, + libGL, + libjack2, + libpulseaudio, + libX11, + libXcursor, + libXext, + libXrandr, + libXxf86vm, + noriskclient-launcher-unwrapped, + pipewire, + stdenv, + symlinkJoin, + udev, + wrapGAppsHook4, +}: + +symlinkJoin { + pname = "noriskclient-launcher"; + inherit (noriskclient-launcher-unwrapped) version; + + paths = [ noriskclient-launcher-unwrapped ]; + + strictDeps = true; + + nativeBuildInputs = [ + glib + wrapGAppsHook4 + ]; + + buildInputs = [ + glib-networking + gsettings-desktop-schemas + ]; + + runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux ( + lib.makeLibraryPath [ + addDriverRunpath.driverLink + + # glfw + libGL + libX11 + libXcursor + libXext + libXrandr + libXxf86vm + + # narrator support + flite + + # openal + alsa-lib + libjack2 + libpulseaudio + pipewire + + # oshi + udev + ] + ); + + postBuild = '' + gappsWrapperArgs+=( + --prefix PATH : ${lib.makeSearchPath "bin/java" jdks} + ${lib.optionalString stdenv.hostPlatform.isLinux '' + --set LD_LIBRARY_PATH $runtimeDependencies + ''} + ) + + glibPostInstallHook + gappsWrapperArgsHook + wrapGAppsHook + ''; + + meta = { + inherit (noriskclient-launcher-unwrapped.meta) + description + homepage + license + longDescription + maintainers + mainProgram + platforms + ; + }; +} From 4c1d6d36dc93700dc71bdd9e9376b6e707077e2c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Dec 2025 09:38:34 +0100 Subject: [PATCH 37/67] python313Packages.iamdata: 0.1.202512161 -> 0.1.202512171 Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202512161...v0.1.202512171 Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202512171 --- pkgs/development/python-modules/iamdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 4b75bc47a760..601f6f392aac 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202512161"; + version = "0.1.202512171"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-i8eNsCX56h0PrJm3Qd4TzSPAVoK5Un0W5AH2eMOXH68="; + hash = "sha256-VQ97KOd05h1CYTSi554jVrKPtiDN6IAqnq86qHvULdI="; }; __darwinAllowLocalNetworking = true; From c4538d378bf7921ab664c19f416d2a07290a7079 Mon Sep 17 00:00:00 2001 From: Mynacol Date: Wed, 17 Dec 2025 08:45:00 +0000 Subject: [PATCH 38/67] maintainers: Rename name of Mynacol --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 83f8a52c10f7..90cad4727704 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18068,7 +18068,7 @@ mynacol = { github = "Mynacol"; githubId = 26695166; - name = "Paul Prechtel"; + name = "Mynacol"; }; myrl = { email = "myrl.0xf@gmail.com"; From ccdd950074d536e5030f2e43cad7992f3bb3bf42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 08:51:57 +0000 Subject: [PATCH 39/67] zwave-js-ui: 11.8.2 -> 11.9.0 --- pkgs/by-name/zw/zwave-js-ui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix index 8d427429671f..029b5c62cfe7 100644 --- a/pkgs/by-name/zw/zwave-js-ui/package.nix +++ b/pkgs/by-name/zw/zwave-js-ui/package.nix @@ -7,15 +7,15 @@ buildNpmPackage rec { pname = "zwave-js-ui"; - version = "11.8.2"; + version = "11.9.0"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-ui"; tag = "v${version}"; - hash = "sha256-OXvdj8DzaVK+5YmFh56FToB43OOOh7+7JZvmW7IQkKE="; + hash = "sha256-rUrpmjmcVfWY4Z6d7MvLKTxaog3NH5ieEbxVvma2ALI="; }; - npmDepsHash = "sha256-388Iu0rDFNIk3FUy2/TySejgR6sFWc/9BP19KEmfQKk="; + npmDepsHash = "sha256-Q7FjXLMl14caowfofShhm5It7cCMxI255ahXebsG8u0="; passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui; From 65cdddf2b2e68b3ff4ba273b1830d3ddc323361c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Dec 2025 10:25:41 +0100 Subject: [PATCH 40/67] python313Packages.tencentcloud-sdk-python: 3.1.12 -> 3.1.13 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.1.12...3.1.13 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.1.13/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 70b5d7187c18..9a7d00ee58b4 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.1.12"; + version = "3.1.13"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-rLAsDXmQ4gmGJctfcOhp+0u6dd6f+u6dTuAGH28QJs8="; + hash = "sha256-FGRoef5KloVuBlgBF2t4fyo1+cP5865oOrBZRoy2kQg="; }; build-system = [ setuptools ]; From 56d44b8eb5c8c245b5d66b028a68011480016d83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Dec 2025 10:32:24 +0100 Subject: [PATCH 41/67] python313Packages.streamlit-notify: init at 0.3.1 Queues and displays Streamlit Status Elements notifications https://github.com/pgarrett-scripps/Streamlit_Notify --- .../streamlit-notify/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/streamlit-notify/default.nix diff --git a/pkgs/development/python-modules/streamlit-notify/default.nix b/pkgs/development/python-modules/streamlit-notify/default.nix new file mode 100644 index 000000000000..309cf41d09dd --- /dev/null +++ b/pkgs/development/python-modules/streamlit-notify/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + packaging, + pytestCheckHook, + setuptools, + streamlit, +}: + +buildPythonPackage rec { + pname = "streamlit-notify"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pgarrett-scripps"; + repo = "Streamlit_Notify"; + tag = "v${version}"; + hash = "sha256-MI+8fh7aKk7kOVxq3677cVWsiMmE0NSXWukN+Bc0noM="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + packaging + streamlit + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "streamlit_notify" ]; + + meta = { + description = "Queues and displays Streamlit Status Elements notifications"; + homepage = "https://github.com/pgarrett-scripps/Streamlit_Notify"; + changelog = "https://github.com/pgarrett-scripps/Streamlit_Notify/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9649073b073..36fa70b4c41b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18178,6 +18178,8 @@ self: super: with self; { streamlit-folium = callPackage ../development/python-modules/streamlit-folium { }; + streamlit-notify = callPackage ../development/python-modules/streamlit-notify { }; + streamz = callPackage ../development/python-modules/streamz { }; strenum = callPackage ../development/python-modules/strenum { }; From 812e0536cc8c1b45c92cd3c58ff00ee02c60d526 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Dec 2025 10:40:22 +0100 Subject: [PATCH 42/67] python313Packages.streamlit-avatar: init at 0.1.3 Component to display avatar icon in Streamlit https://pypi.org/project/streamlit-avatar/ --- .../streamlit-avatar/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/streamlit-avatar/default.nix diff --git a/pkgs/development/python-modules/streamlit-avatar/default.nix b/pkgs/development/python-modules/streamlit-avatar/default.nix new file mode 100644 index 000000000000..b8e61ffefbd8 --- /dev/null +++ b/pkgs/development/python-modules/streamlit-avatar/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + streamlit, +}: + +buildPythonPackage rec { + pname = "streamlit-avatar"; + version = "0.1.3"; + pyproject = true; + + src = fetchPypi { + pname = "streamlit_avatar"; + inherit version; + hash = "sha256-AjiTvYDbWpI9OX/GTSfHqXIQfaTwvqD+uZoy+TY/JpE="; + }; + + build-system = [ setuptools ]; + + dependencies = [ streamlit ]; + + pythonImportsCheck = [ "streamlit_avatar" ]; + + # Module has no tests + doCheck = false; + + meta = { + description = "Component to display avatar icon in Streamlit"; + homepage = "https://pypi.org/project/streamlit-avatar/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9649073b073..b67e3417aafd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18176,6 +18176,8 @@ self: super: with self; { streamlit = callPackage ../development/python-modules/streamlit { }; + streamlit-avatar = callPackage ../development/python-modules/streamlit-avatar { }; + streamlit-folium = callPackage ../development/python-modules/streamlit-folium { }; streamz = callPackage ../development/python-modules/streamz { }; From 83fa20c8f4d3c9106ea027de646b03fa0f5ff581 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Dec 2025 02:43:23 +0100 Subject: [PATCH 43/67] python313Packages.extra-streamlit-components: init at 0.1.81 Additional components for streamlit https://pypi.org/project/extra-streamlit-components/ --- .../extra-streamlit-components/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/extra-streamlit-components/default.nix diff --git a/pkgs/development/python-modules/extra-streamlit-components/default.nix b/pkgs/development/python-modules/extra-streamlit-components/default.nix new file mode 100644 index 000000000000..c3a5a1d7ab9e --- /dev/null +++ b/pkgs/development/python-modules/extra-streamlit-components/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + streamlit, +}: + +buildPythonPackage rec { + pname = "extra-streamlit-components"; + version = "0.1.81"; + pyproject = true; + + src = fetchPypi { + pname = "extra_streamlit_components"; + inherit version; + hash = "sha256-65vre6z+iz0jjxiIohx4rGz6VpNBvkhLygjD6gsV8g0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ streamlit ]; + + pythonImportsCheck = [ "extra_streamlit_components" ]; + + # Module has no tests + doCheck = false; + + meta = { + description = "Additional components for streamlit"; + homepage = "https://pypi.org/project/extra-streamlit-components/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e45622952ab8..d04f0cfc3335 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5105,6 +5105,10 @@ self: super: with self; { extension-helpers = callPackage ../development/python-modules/extension-helpers { }; + extra-streamlit-components = + callPackage ../development/python-modules/extra-streamlit-components + { }; + extract-msg = callPackage ../development/python-modules/extract-msg { }; extractcode = callPackage ../development/python-modules/extractcode { }; From 39781bb2fc239cb4e0405b162345cf4a3d104df4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Dec 2025 11:00:51 +0100 Subject: [PATCH 44/67] greenmask: 0.2.14 -> 0.2.15 Diff: https://github.com/GreenmaskIO/greenmask/compare/v0.2.14...v0.2.15 Changelog: https://github.com/GreenmaskIO/greenmask/releases/tag/v0.2.15 --- pkgs/by-name/gr/greenmask/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix index ccaa0d09617c..f2971bd2e96c 100644 --- a/pkgs/by-name/gr/greenmask/package.nix +++ b/pkgs/by-name/gr/greenmask/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "greenmask"; - version = "0.2.14"; + version = "0.2.15"; src = fetchFromGitHub { owner = "GreenmaskIO"; repo = "greenmask"; tag = "v${version}"; - hash = "sha256-AHZJWYHfUKYNXPP6vFIM5tdr5aQ8q2pkqB/M1lhxUic="; + hash = "sha256-/At0boolTyge4VNy1EDpK09Yo7hLAdq6SvCbyBTKGbw="; }; vendorHash = "sha256-t2U65GAGBGdMRXPTkCQCuXfLuqohA6erTlvAN/xx/ek="; From 41d1fab811cf06633df8b69c19d3606feaff5e38 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Dec 2025 11:05:10 +0100 Subject: [PATCH 45/67] python313Packages.pypoolstation: 0.5.7 -> 0.5.8 --- pkgs/development/python-modules/pypoolstation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypoolstation/default.nix b/pkgs/development/python-modules/pypoolstation/default.nix index 670e6e28af2a..c77bcbb21320 100644 --- a/pkgs/development/python-modules/pypoolstation/default.nix +++ b/pkgs/development/python-modules/pypoolstation/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pypoolstation"; - version = "0.5.7"; + version = "0.5.8"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hSlEChNjoDToA0tgWQiusBEpL08SMuOeHRr9W7Qgh/U="; + hash = "sha256-GIRx66esht82tKBJDhCDrwPkxsdBPi1w9tSQ7itF0qQ="; }; nativeBuildInputs = [ poetry-core ]; From ea248acec041c2e5e28755a04473b102296b278c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Dec 2025 11:08:13 +0100 Subject: [PATCH 46/67] python313Packages.pypoolstation: modernize --- .../development/python-modules/pypoolstation/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pypoolstation/default.nix b/pkgs/development/python-modules/pypoolstation/default.nix index c77bcbb21320..59edbf93e407 100644 --- a/pkgs/development/python-modules/pypoolstation/default.nix +++ b/pkgs/development/python-modules/pypoolstation/default.nix @@ -6,24 +6,21 @@ fetchPypi, importlib-metadata, poetry-core, - pythonOlder, }: buildPythonPackage rec { pname = "pypoolstation"; version = "0.5.8"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-GIRx66esht82tKBJDhCDrwPkxsdBPi1w9tSQ7itF0qQ="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp backoff importlib-metadata From fffc2e7c820768a8ff48ca678e750f9644362a44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 11:14:43 +0000 Subject: [PATCH 47/67] watchgha: 2.4.2 -> 2.5.0 --- pkgs/by-name/wa/watchgha/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/watchgha/package.nix b/pkgs/by-name/wa/watchgha/package.nix index ac87868e3033..5d8ac59d53b7 100644 --- a/pkgs/by-name/wa/watchgha/package.nix +++ b/pkgs/by-name/wa/watchgha/package.nix @@ -5,13 +5,13 @@ }: python3Packages.buildPythonApplication rec { pname = "watchgha"; - version = "2.4.2"; + version = "2.5.0"; pyproject = true; src = fetchPypi { inherit version; pname = "watchgha"; - hash = "sha256-RtmCC+twOk+viWY7WTbTzuxHTM3MOww+sRuEvlemCcI="; + hash = "sha256-jjQk/X9kd8qhqgvivSIsvg0BOp6zh6yqpPiAS6ak/Ps="; }; build-system = with python3Packages; [ From af9f1ddf9604c1cea30aaabd02c5106f9bdced6e Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Wed, 17 Dec 2025 12:38:43 +0100 Subject: [PATCH 48/67] perlPackages.TextBibTeX: 0.89 -> 0.91 fixes build https://metacpan.org/release/AMBS/Text-BibTeX-0.90 https://metacpan.org/release/AMBS/Text-BibTeX-0.91 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b105d6e0300a..786ad62e3a76 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -35648,15 +35648,15 @@ with self; TextBibTeX = buildPerlModule { pname = "Text-BibTeX"; - version = "0.89"; + version = "0.91"; buildInputs = [ CaptureTiny ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { - url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.89.tar.gz"; - hash = "sha256-iKeOvwiOx1AvQBxaKxOMhiz1RYU0t3MiO786r0EiQZY="; + url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.91.tar.gz"; + hash = "sha256-PwETz4/nHcdIRjbcjipYFjfsvMgtC+KbvUbQvz+M2zc="; }; # libbtparse.so: cannot open shared object file patches = [ ../development/perl-modules/TextBibTeX-use-lib.patch ]; From e67ae02b83681a17601d639a45f4c7f96b168ebe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Dec 2025 02:31:42 +0000 Subject: [PATCH 49/67] lctime: 0.0.26 -> 0.0.27 --- pkgs/by-name/lc/lctime/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lc/lctime/package.nix b/pkgs/by-name/lc/lctime/package.nix index 08db563674bd..ceaa45443ccd 100644 --- a/pkgs/by-name/lc/lctime/package.nix +++ b/pkgs/by-name/lc/lctime/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { pname = "lctime"; - version = "0.0.26"; + version = "0.0.27"; pyproject = true; src = fetchFromGitea { @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "librecell"; repo = "lctime"; tag = version; - hash = "sha256-oNmeV8r1dtO2y27jAJnlx4mKGjhzL07ad2yBdOLwgF0="; + hash = "sha256-KKZhsKNTr+J5+rLUdlwGMsUCa6NYY1X9yaujPe1c0Do="; }; build-system = with python3Packages; [ @@ -30,7 +30,6 @@ python3Packages.buildPythonApplication rec { joblib klayout liberty-parser - matplotlib networkx numpy pyspice @@ -38,6 +37,8 @@ python3Packages.buildPythonApplication rec { sympy ]; + optional-dependencies.debug = with python3Packages; [ matplotlib ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ngspice From 4e60f592d50d519668dc8e2ce34913a7e3ded941 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 12:01:58 +0000 Subject: [PATCH 50/67] anytype: 0.50.5 -> 0.52.4 --- pkgs/by-name/an/anytype-heart/package.nix | 6 +++--- pkgs/by-name/an/anytype/package.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix index 298e7313c18e..e4dc887abb0e 100644 --- a/pkgs/by-name/an/anytype-heart/package.nix +++ b/pkgs/by-name/an/anytype-heart/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { # Use only versions specified in anytype-ts middleware.version file: # https://github.com/anyproto/anytype-ts/blob/v/middleware.version - version = "0.44.5"; + version = "0.46.3"; # Update only together with 'anytype' package. # nixpkgs-update: no auto update @@ -34,10 +34,10 @@ buildGoModule (finalAttrs: { owner = "anyproto"; repo = "anytype-heart"; tag = "v${finalAttrs.version}"; - hash = "sha256-wSZcDcGPKbtUWf7hYXiQrS8a4sgnbItW7bu4hxQ2yFM="; + hash = "sha256-g3YAi7T6E0o2xjCpmnwmKUugEKyziJIYRaPU4dQH9xw="; }; - vendorHash = "sha256-T7CPD6mbxkN1x53oe9jsS2XMqluqWv8VPPd1pnXZvlc="; + vendorHash = "sha256-s/otpfRwXFUOek8oVr5eUcKH4Vwd5BbtB0GH+hjzjwI="; subPackages = [ "cmd/grpcserver" ]; tags = [ diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 5b132cc39318..45e76c9890c8 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -14,23 +14,23 @@ buildNpmPackage (finalAttrs: { pname = "anytype"; - version = "0.50.5"; + version = "0.52.4"; src = fetchFromGitHub { owner = "anyproto"; repo = "anytype-ts"; tag = "v${finalAttrs.version}"; - hash = "sha256-HLYYuMtgvF0UHHnThEWSpLIZEvLxNrOtkoXEhSAT24A="; + hash = "sha256-4R0ROpMH49BrUcjd9Xcgs7wRo1flMg7kEsZS51uL5nE="; }; locales = fetchFromGitHub { owner = "anyproto"; repo = "l10n-anytype-ts"; - rev = "aaa83aae39a7dbf59c3c8580be4700edf7481893"; - hash = "sha256-MOR7peovTYYQR96lOoxyETY0aOH6KcB9vXCqpXKxI/4="; + rev = "910cbb5b05cc390e53205fe275768166c946c041"; + hash = "sha256-H6f/3paRKJd/GdZBJt0IHLbaGbbXpsbqjvDPu628JGE="; }; - npmDepsHash = "sha256-ohlHY7zw+GyaNuwI2t7dQj1bQkXH//LiyiHyi2B+/9I="; + npmDepsHash = "sha256-k6iAWWbLmKSoqvWFyd//zlNy/LrdD77qlngL9QeP+nw="; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; From 7c18d6613f4ee975b3de8df3d766e2019a2a3c6b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 17 Dec 2025 20:09:57 +0800 Subject: [PATCH 51/67] cinnamon: 6.6.0 -> 6.6.2 https://github.com/linuxmint/cinnamon/compare/6.6.0...6.6.2 --- pkgs/by-name/ci/cinnamon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix index f51bd9f4fb16..27688bf852e5 100644 --- a/pkgs/by-name/ci/cinnamon/package.nix +++ b/pkgs/by-name/ci/cinnamon/package.nix @@ -74,13 +74,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon"; - version = "6.6.0"; + version = "6.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; tag = version; - hash = "sha256-DiAc1Ng03xzNYYpf79g9p338syPScKftmviNw6Y5i5o="; + hash = "sha256-evjXa42mo7wkLh5HDax+2Tsc/x/oG3tPHU1tczoxmJU="; }; patches = [ From 3a52a93572db3d6cf72b6a0e136e6a59cd4a2fdf Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 17 Dec 2025 20:09:59 +0800 Subject: [PATCH 52/67] cinnamon-desktop: 6.6.0 -> 6.6.1 https://github.com/linuxmint/cinnamon-desktop/compare/6.6.0...6.6.1 --- pkgs/by-name/ci/cinnamon-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-desktop/package.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix index 9c701219bafb..2a7f908e50d5 100644 --- a/pkgs/by-name/ci/cinnamon-desktop/package.nix +++ b/pkgs/by-name/ci/cinnamon-desktop/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "6.6.0"; + version = "6.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon-desktop"; tag = version; - hash = "sha256-9qgt+E5qbzq+x9fJKkoSBFgA96HBDLysQvg6b04WbMU="; + hash = "sha256-vBRaUXsPAPOpMEs2pl6AaaKIMeeXB0UdCb1hzYd43KY="; }; outputs = [ From 2cf2ce125b41cd07cb4109307e7a13b3943c1ffe Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 17 Dec 2025 20:10:00 +0800 Subject: [PATCH 53/67] cinnamon-screensaver: 6.6.0 -> 6.6.1 https://github.com/linuxmint/cinnamon-screensaver/compare/6.6.0...6.6.1 --- pkgs/by-name/ci/cinnamon-screensaver/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix index 4f02353c48c3..57f16731c8bf 100644 --- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix +++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "6.6.0"; + version = "6.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon-screensaver"; tag = version; - hash = "sha256-Jo9GRsiPvqGZ2ITaewV5H4VMc5EotTTXIaqzXwDA+Z4="; + hash = "sha256-NK33cIrcTicLs59eJ550FghjuWS93yD642ObAS55Dtk="; }; patches = [ From 8a43c4b0f85629f6482a2bc9915d6fbb1be75071 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 17 Dec 2025 20:10:05 +0800 Subject: [PATCH 54/67] mint-l-theme: 2.0.3 -> 2.0.4 https://github.com/linuxmint/mint-l-theme/compare/2.0.3...2.0.4 --- pkgs/by-name/mi/mint-l-theme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mint-l-theme/package.nix b/pkgs/by-name/mi/mint-l-theme/package.nix index 91b28a253aba..fb0088632f1c 100644 --- a/pkgs/by-name/mi/mint-l-theme/package.nix +++ b/pkgs/by-name/mi/mint-l-theme/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-theme"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "mint-l-theme"; rev = version; - hash = "sha256-RdcojX+8SQDJ9LPb81iMzdoCZBpoypf/+aQcgotnVGE="; + hash = "sha256-jrNVeeqOBDf77Lz68qyjHllA4C3PQRySYQH7Sva2UHU="; }; nativeBuildInputs = [ From 314d3bd0eab5e4d70b26b649009cf8bcdf90ce8d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 17 Dec 2025 20:10:06 +0800 Subject: [PATCH 55/67] mint-themes: 2.3.4 -> 2.3.5 https://github.com/linuxmint/mint-themes/compare/2.3.4...2.3.5 --- pkgs/by-name/mi/mint-themes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mint-themes/package.nix b/pkgs/by-name/mi/mint-themes/package.nix index 3cd8d52327c2..44797cc78cb5 100644 --- a/pkgs/by-name/mi/mint-themes/package.nix +++ b/pkgs/by-name/mi/mint-themes/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = "mint-themes"; rev = version; - hash = "sha256-A4k9iy0d9pGPSYa4m3tAv2GKhFuJPrQODbv+LcP/YXU="; + hash = "sha256-folnnA4By1Dd1amriGiTl5mOxpcnaFjdp/UsjacE8GA="; }; nativeBuildInputs = [ From dde3aa7b2abcb1dda268576fa3553a430ad50625 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 17 Dec 2025 20:10:09 +0800 Subject: [PATCH 56/67] nemo: 6.6.1 -> 6.6.2 https://github.com/linuxmint/nemo/compare/6.6.1...6.6.2 --- pkgs/by-name/ne/nemo/package.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ne/nemo/package.nix b/pkgs/by-name/ne/nemo/package.nix index e39f7697da29..9098e2b6e052 100644 --- a/pkgs/by-name/ne/nemo/package.nix +++ b/pkgs/by-name/ne/nemo/package.nix @@ -14,6 +14,7 @@ cinnamon-desktop, xapp, xapp-symbolic-icons, + xdg-user-dirs, libexif, json-glib, exempi, @@ -36,13 +37,13 @@ let in stdenv.mkDerivation rec { pname = "nemo"; - version = "6.6.1"; + version = "6.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "nemo"; rev = version; - hash = "sha256-oJvGuPm6FOknSe+5TDLNf0eoE3xC+i78SkYdJUBY4PU="; + hash = "sha256-5jgD2C71sQkqnAGsnsjK8W9qaLtNtGeYLXsV2+7u2jU="; }; patches = [ @@ -95,13 +96,19 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : ${ + --prefix XDG_DATA_DIRS : "${ lib.makeSearchPath "share" [ # For non-fd.o icons. xapp xapp-symbolic-icons ] - } + }" + --prefix PATH : "${ + lib.makeBinPath [ + # For xdg-user-dirs-update. + xdg-user-dirs + ] + }" ) ''; From a6b4a008134630c6c21c3f2b3fef2f4512d3cc42 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Wed, 17 Dec 2025 13:41:37 +0100 Subject: [PATCH 57/67] perlPackages.YAMLSyck: 1.34 -> 1.36 Adds -std=gnu11 cflag to fix build with gcc15 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 786ad62e3a76..25c3fb7f2c84 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -39069,11 +39069,12 @@ with self; YAMLSyck = buildPerlPackage { pname = "YAML-Syck"; - version = "1.34"; + version = "1.36"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.34.tar.gz"; - hash = "sha256-zJFWzK69p5jr/i8xthnoBld/hg7RcEJi8X/608bjQVk="; + url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.36.tar.gz"; + hash = "sha256-Tc2dmzsM48ZaL/K5tMb/+LZJ/fJDv9fhiJVDvs25GlI="; }; + env.NIX_CFLAGS_COMPILE = "-std=gnu11"; meta = { description = "Fast, lightweight YAML loader and dumper"; homepage = "https://github.com/toddr/YAML-Syck"; From 680bdcaa971b6528361f774960d96e2b547206ff Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Wed, 17 Dec 2025 13:53:19 +0100 Subject: [PATCH 58/67] perlPackages.Tk: fix build with gcc15 --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 786ad62e3a76..06ef08b0e6c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -37048,6 +37048,7 @@ with self; NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-int" "-Wno-error=incompatible-pointer-types" + "-std=gnu17" ]; }; doCheck = false; # Expects working X11. From 5924854cb73302ab3aff5b75269df2ab38c84802 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 17 Dec 2025 20:53:30 +0800 Subject: [PATCH 59/67] wechat: 4.1.5.26-32281 -> 4.1.6.11-33044 for darwin --- pkgs/by-name/we/wechat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix index 4201668ee1bb..649b01b2470f 100644 --- a/pkgs/by-name/we/wechat/package.nix +++ b/pkgs/by-name/we/wechat/package.nix @@ -30,14 +30,14 @@ let # https://dldir1.qq.com/weixin/mac/mac-release.xml any-darwin = let - version = "4.1.5.26-32281"; + version = "4.1.6.11-33044"; version' = lib.replaceString "-" "_" version; in { inherit version; src = fetchurl { url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg"; - hash = "sha256-hiq6L51w0ToQrmB0Lq3HrcMdwrPpVIy+ePMP899JRfg="; + hash = "sha256-A9K5NvBaQev0PXPlwbGmS6nMhbDNI5S+NMhYHaLhcLo="; }; }; in From 895a3c616afdcce91ec91ae1d1badc61fe30a258 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 12:59:28 +0000 Subject: [PATCH 60/67] terraform: 1.14.2 -> 1.14.3 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 0ecca50b4bad..839899a9d760 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -194,8 +194,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.14.2"; - hash = "sha256-gYJW31cDsfs/SLBE9InZP1ghG6gbat2pkrmHLIAZVDY="; + version = "1.14.3"; + hash = "sha256-QPVKWtpm67z13hmPgM/YXm+CBOqiI8qZwttx2h6LboU="; vendorHash = "sha256-NDtBLa8vokrSRDCNX10lQyfMDzTrodoEj5zbDanL4bk="; patches = [ ./provider-path-0_15.patch ]; passthru = { From 9270b92e576ac9b1b09fb0b28e303a9bb45cbefc Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Wed, 17 Dec 2025 08:12:17 -0500 Subject: [PATCH 61/67] anytype: unpin electron --- pkgs/by-name/an/anytype/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 45e76c9890c8..1ce8a701df4d 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -6,7 +6,7 @@ pkg-config, anytype-heart, libsecret, - electron_37, + electron, makeDesktopItem, copyDesktopItems, commandLineArgs ? "", @@ -44,7 +44,7 @@ buildNpmPackage (finalAttrs: { npmFlags = [ # keytar needs to be built against electron's ABI - "--nodedir=${electron_37.headers}" + "--nodedir=${electron.headers}" ]; patches = [ @@ -87,7 +87,7 @@ buildNpmPackage (finalAttrs: { cp LICENSE.md $out/share - makeWrapper '${lib.getExe electron_37}' $out/bin/anytype \ + makeWrapper '${lib.getExe electron}' $out/bin/anytype \ --set-default ELECTRON_IS_DEV 0 \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags $out/lib/anytype/ \ From 51923a9517ecbcbb79d7ce61d7ff24e325b1d90f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 13:14:08 +0000 Subject: [PATCH 62/67] volanta: 1.14.3 -> 1.15.0 --- pkgs/by-name/vo/volanta/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vo/volanta/package.nix b/pkgs/by-name/vo/volanta/package.nix index 946fe77f2512..1977daa247e7 100644 --- a/pkgs/by-name/vo/volanta/package.nix +++ b/pkgs/by-name/vo/volanta/package.nix @@ -9,11 +9,11 @@ }: let pname = "volanta"; - version = "1.14.3"; - build = "4881d864"; + version = "1.15.0"; + build = "1240645b"; src = fetchurl { url = "https://cdn.volanta.app/software/volanta-app/${version}-${build}/volanta-${version}.AppImage"; - hash = "sha256-Rn/0GQSUbp7sG0EG9LlBLgaBRR+vP+C1TVpGnsi8QpY="; + hash = "sha256-6QF9o5BFeGZBjpusFMYrWlnYhAdItfxg+gS0Xf2q7io="; }; appImageContents = appimageTools.extract { inherit pname version src; }; in From ca66935e0c7b3e239f8eb1615f13f69d474027cc Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Wed, 17 Dec 2025 08:30:54 -0500 Subject: [PATCH 63/67] python3Packages.qnap-qsw: drop because replaced by aioqsw --- .../python-modules/qnap-qsw/default.nix | 36 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/development/python-modules/qnap-qsw/default.nix diff --git a/pkgs/development/python-modules/qnap-qsw/default.nix b/pkgs/development/python-modules/qnap-qsw/default.nix deleted file mode 100644 index 70a683335ed9..000000000000 --- a/pkgs/development/python-modules/qnap-qsw/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pythonOlder, - requests, -}: - -buildPythonPackage rec { - pname = "qnap-qsw"; - version = "0.3.0"; - format = "setuptools"; - - disabled = pythonOlder "3.9"; - - src = fetchFromGitHub { - owner = "Noltari"; - repo = "python-qnap-qsw"; - rev = version; - sha256 = "WP1bGt7aAtSVFOMJgPXKqVSbi5zj9K7qoIVrYCrPGqk="; - }; - - propagatedBuildInputs = [ requests ]; - - # Project has no tests - doCheck = false; - - pythonImportsCheck = [ "qnap_qsw" ]; - - meta = { - description = "Python library to interact with the QNAP QSW API"; - homepage = "https://github.com/Noltari/python-qnap-qsw"; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 6b9f2d3d2532..849581113aea 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -405,6 +405,7 @@ mapAliases { qiskit-ibmq-provider = throw "qiskit-imbq-provider has been removed, since it was deprecated upstream"; # added 2025-09-13 qiskit-ignis = throw "qiskit-ignis has been removed, since it was deprecated upstream"; # added 2025-09-13 qiskit-terra = throw "qiskit-terra has been removed, since it was deprecated upstream."; # added 2025-09-13 + qnap-qsw = throw "'qnap-qsw' has been replaced by 'aioqsw'"; # added 2025-12-17 Quandl = throw "'Quandl' has been renamed to/replaced by 'quandl'"; # Converted to throw 2025-10-29 querystring_parser = throw "'querystring_parser' has been renamed to/replaced by 'querystring-parser'"; # Converted to throw 2025-10-29 radian = throw "radian has been promoted to a top-level attribute name: `pkgs.radian`"; # added 2025-05-02 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9649073b073..775f2c1f23a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15939,8 +15939,6 @@ self: super: with self; { qiskit-optimization = callPackage ../development/python-modules/qiskit-optimization { }; - qnap-qsw = callPackage ../development/python-modules/qnap-qsw { }; - qnapstats = callPackage ../development/python-modules/qnapstats { }; qpageview = callPackage ../development/python-modules/qpageview { }; From 900055071c11aab6b8c5f6d44999fc9a581e1c4b Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Wed, 17 Dec 2025 08:10:36 -0500 Subject: [PATCH 64/67] python3Packages.tracing: drop because missing source code --- .../python-modules/tracing/default.nix | 29 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/development/python-modules/tracing/default.nix diff --git a/pkgs/development/python-modules/tracing/default.nix b/pkgs/development/python-modules/tracing/default.nix deleted file mode 100644 index 5628f0cfd5a6..000000000000 --- a/pkgs/development/python-modules/tracing/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchurl, - sphinx, -}: - -buildPythonPackage rec { - pname = "tracing"; - version = "0.8"; - format = "setuptools"; - - src = fetchurl { - url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_${version}.orig.tar.gz"; - sha256 = "1l4ybj5rvrrcxf8csyq7qx52izybd502pmx70zxp46gxqm60d2l0"; - }; - - buildInputs = [ sphinx ]; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = "https://liw.fi/tracing/"; - description = "Python debug logging helper"; - license = lib.licenses.gpl3; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 6b9f2d3d2532..9bcc59a5bf45 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -479,6 +479,7 @@ mapAliases { tikzplotlib = throw "tikzplotlib was removed because it is incompatible with recent versions of matplotlib and webcolors"; # added 2025-11-11 torchtnt-nightly = throw "'torchtnt-nightly' was only needed as a test dependency for 'torcheval', but these tests are no longer run"; # added 2025-11-12 torrent_parser = throw "'torrent_parser' has been renamed to/replaced by 'torrent-parser'"; # Converted to throw 2025-10-29 + tracing = throw "'tracing' has been removed because its source code has been removed"; # Added 2025-12-17 treeo = throw "treeo has been removed because it has been marked as broken since 2023."; # Added 2025-10-11 treex = throw "treex has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11 trezor_agent = throw "'trezor_agent' has been renamed to/replaced by 'trezor-agent'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9649073b073..9908b637aeb8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19075,8 +19075,6 @@ self: super: with self; { tracerite = callPackage ../development/python-modules/tracerite { }; - tracing = callPackage ../development/python-modules/tracing { }; - trackpy = callPackage ../development/python-modules/trackpy { }; trafilatura = callPackage ../development/python-modules/trafilatura { }; From 969f00def9ae492f3a22b7293eccda4a34f0c598 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Dec 2025 13:34:55 +0000 Subject: [PATCH 65/67] mdbook-toc: 0.15.1 -> 0.15.2 --- pkgs/by-name/md/mdbook-toc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/md/mdbook-toc/package.nix b/pkgs/by-name/md/mdbook-toc/package.nix index 1efceb72fe44..59ff38111c37 100644 --- a/pkgs/by-name/md/mdbook-toc/package.nix +++ b/pkgs/by-name/md/mdbook-toc/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-toc"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "badboy"; repo = "mdbook-toc"; tag = version; - sha256 = "sha256-FPbZH8cEYQ9wbSm6jA5/uiX8Wgx/FyuIJ/gPgSKUhBA="; + sha256 = "sha256-gzwsPRhsAQTraiK/N5dKEj8NTpV/mYmECpS4KVl4Ql8="; }; - cargoHash = "sha256-haHJkyYAc4+ODJNEWiXzbl1xbJ7pyrtnPX/+ubjvX44="; + cargoHash = "sha256-+YvEptJlNjomIsyS7cNImwYa1SxawY05e5vq9VmrktA="; meta = { description = "Preprocessor for mdbook to add inline Table of Contents support"; From c59f0bd5cc6fbbd0600c8b39fc8e01df946f2180 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 17 Dec 2025 21:42:38 +0800 Subject: [PATCH 66/67] prek: disable locale-dependent test --- pkgs/by-name/pr/prek/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix index 1a75ac6c5e06..aa67696130c7 100644 --- a/pkgs/by-name/pr/prek/package.nix +++ b/pkgs/by-name/pr/prek/package.nix @@ -143,6 +143,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "lua::remote_hook" # error message differs "run_in_non_git_repo" + # depends on locale + "init_nonexistent_repo" ]; passthru.updateScript = nix-update-script { }; From 513cc10c3a94544821a56f569d45aaae4d5f11f5 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Wed, 17 Dec 2025 11:14:56 +0530 Subject: [PATCH 67/67] nixos/reaction: systemd harden, improve nixostest Co-authored-by: eljamm Signed-off-by: phanirithvij --- nixos/modules/services/security/reaction.nix | 62 ++++++++++++-------- nixos/tests/reaction-firewall.nix | 54 ++++++++--------- nixos/tests/reaction.nix | 19 +++--- 3 files changed, 75 insertions(+), 60 deletions(-) diff --git a/nixos/modules/services/security/reaction.nix b/nixos/modules/services/security/reaction.nix index 0572913e3bc0..1edf4bcc698d 100644 --- a/nixos/modules/services/security/reaction.nix +++ b/nixos/modules/services/security/reaction.nix @@ -17,7 +17,6 @@ in { options.services.reaction = { enable = mkEnableOption "enable reaction"; - package = mkPackageOption pkgs "reaction" { }; settings = mkOption { @@ -102,8 +101,14 @@ in { # allows reading journal logs of processess users.users.reaction.extraGroups = [ "systemd-journal" ]; + # allows modifying ip firewall rules - systemd.services.reaction.AmbientCapabilities = [ "CAP_NET_ADMIN" ]; + systemd.services.reaction.unitConfig.ConditionCapability = "CAP_NET_ADMIN"; + systemd.services.reaction.serviceConfig = { + CapabilityBoundingSet = [ "CAP_NET_ADMIN" ]; + AmbientCapabilities = [ "CAP_NET_ADMIN" ]; + }; + # optional, if more control over ssh logs is needed services.openssh.settings.LogLevel = lib.mkDefault "VERBOSE"; } @@ -117,19 +122,14 @@ in cfg = config.services.reaction; generatedSettings = settingsFormat.generate "reaction.yml" cfg.settings; - namedGeneratedSettings = lib.optional (cfg.settings != { }) { - name = "reaction.yml"; - path = generatedSettings; - }; - - # SAFETY: We can discard the dependencies of "file" in the name attribute because we keep them in the path attribute - # See https://nix.dev/manual/nix/2.32/language/string-context - namedSettingsFiles = builtins.map (file: { - name = builtins.unsafeDiscardStringContext (builtins.baseNameOf file); - path = file; - }) cfg.settingsFiles; - - settingsDir = pkgs.linkFarm "reaction.d" (namedSettingsFiles ++ namedGeneratedSettings); + settingsDir = pkgs.runCommand "reaction-settings-dir" { } '' + mkdir -p $out + ${lib.concatMapStringsSep "\n" (file: '' + filename=$(basename "${file}") + ln -s "${file}" "$out/$filename" + '') cfg.settingsFiles} + ln -s ${generatedSettings} $out/reaction.yml + ''; in lib.mkIf cfg.enable { assertions = [ @@ -157,18 +157,12 @@ in '' ); - # Easier to debug conf when we have direct access to it, - # rather than having to look for it in the systemd service file. - environment.etc."reaction".source = settingsDir; - systemd.services.reaction = { - enable = true; description = "Scan logs and take action"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; partOf = lib.optionals cfg.stopForFirewall [ "firewall.service" ]; path = [ pkgs.iptables ]; - unitConfig.ConditionCapability = "CAP_NET_ADMIN"; serviceConfig = { Type = "simple"; User = if (!cfg.runAsRoot) then "reaction" else "root"; @@ -177,11 +171,29 @@ in lib.optionalString (cfg.loglevel != null) " -l ${cfg.loglevel}" } ''; - StateDirectory = "reaction"; - RuntimeDirectory = "reaction"; - WorkingDirectory = "/var/lib/reaction"; - CapabilityBoundingSet = [ "CAP_NET_ADMIN" ]; + NoNewPrivileges = true; + + RuntimeDirectory = "reaction"; + RuntimeDirectoryMode = "0750"; + WorkingDirectory = "%S/reaction"; + StateDirectory = "reaction"; + StateDirectoryMode = "0750"; + LogsDirectory = "reaction"; + LogsDirectoryMode = "0750"; + UMask = 0077; + + RemoveIPC = true; + PrivateTmp = true; + ProtectHome = true; + ProtectClock = true; + PrivateDevices = true; + ProtectHostname = true; + ProtectSystem = "strict"; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + ProtectKernelLogs = true; }; }; diff --git a/nixos/tests/reaction-firewall.nix b/nixos/tests/reaction-firewall.nix index 7efea1ad4ae0..a3d46cbfda8d 100644 --- a/nixos/tests/reaction-firewall.nix +++ b/nixos/tests/reaction-firewall.nix @@ -24,44 +24,44 @@ testScript = # py '' start_all() - machine.wait_for_unit("multi-user.target") - # Verify both services start successfully + machine.wait_for_unit("multi-user.target") machine.wait_for_unit("firewall.service") machine.wait_for_unit("reaction.service") - # Check reaction chain exists in iptables - output = machine.succeed("iptables -w -L -n") - assert "reaction" in output, "reaction chain not found in iptables" + def check_reaction_in_iptables(context = ""): + with subtest("check reaction chain exists"): + machine.sleep(3) + output = machine.succeed("iptables -nvL") + assert "reaction" in output, f"error: reaction chain missing in iptables, {context}" - # Reload firewall and verify there's no issues due to reaction chain - machine.succeed("systemctl reload firewall") - output = machine.succeed("journalctl -u reaction.service -u firewall.service --no-pager") - assert "ERROR" not in output, "firewall reload failed due to reaction" + check_reaction_in_iptables() - # Verify reaction chain still exists after reload - output = machine.succeed("iptables -w -L -n") - assert "reaction" in output, "reaction chain missing after firewall reload" + with subtest("reload firewall"): + machine.succeed("systemctl reload firewall") + output = machine.succeed("journalctl -u firewall.service --no-pager") + assert "ERROR" not in output, "firewall reload failed due to reaction" - # Restart firewall and verify reaction restarts as well - machine.succeed("systemctl restart firewall") - output = machine.succeed("journalctl -u reaction.service -u firewall.service --no-pager") - assert "INFO stop command" in output and "INFO start command" in output, "reaction did not restart when firewall was restarted" + check_reaction_in_iptables(context="after firewall reload") - output = machine.succeed("iptables -w -L -n") - assert "reaction" in output, "reaction chain missing after firewall restart" + with subtest("restart firewall"): + machine.succeed("systemctl restart firewall") + output = machine.succeed("journalctl -u reaction.service --no-pager") + assert "INFO stop command" in output and "INFO start command" in output, "reaction did not restart when firewall was restarted" - # Stop reaction manually and verify chains are cleaned up - machine.succeed("systemctl stop reaction") - output = machine.succeed("iptables -w -L -n || true") - assert "reaction" not in output, "reaction chain still exists after stop" + check_reaction_in_iptables(context="after firewall restart") - # Start reaction again and verify it works - machine.succeed("systemctl start reaction") - machine.wait_for_unit("reaction.service") + with subtest("stop reaction manually and verify chains are cleaned up"): + machine.succeed("systemctl stop reaction") + machine.sleep(3) + output = machine.succeed("iptables -nvL") + assert "reaction" not in output, "reaction chain still exists after the service was stopped" - output = machine.succeed("iptables -w -L -n") - assert "reaction" in output, "reaction chain not recreated" + with subtest("start reaction again and verify it works"): + machine.succeed("systemctl start reaction") + machine.wait_for_unit("reaction.service") + + check_reaction_in_iptables() ''; # Debug interactively with: diff --git a/nixos/tests/reaction.nix b/nixos/tests/reaction.nix index af743caa1260..730c230e4226 100644 --- a/nixos/tests/reaction.nix +++ b/nixos/tests/reaction.nix @@ -10,18 +10,22 @@ services.reaction = { enable = true; stopForFirewall = false; - settingsFiles = [ - "${pkgs.reaction}/share/examples/example.jsonnet" - # "${pkgs.reaction}/share/examples/example.yml" # can't specify both because conflicts - ]; + # example.jsonnet/example.yml can be copied and modified from ${pkgs.reaction}/share/examples + settingsFiles = [ "${pkgs.reaction}/share/examples/example.jsonnet" ]; runAsRoot = false; }; services.openssh.enable = true; + # If not running as root you need to give the reaction user and service the proper permissions - # required to access journal of sshd.service as runAsRoot = false + # allows reading journal logs of processess users.users.reaction.extraGroups = [ "systemd-journal" ]; - # required for allowing reaction to modifiy firewall rules - systemd.services.reaction.serviceConfig.AmbientCapabilities = [ "CAP_NET_ADMIN" ]; + + # allows modifying ip firewall rules + systemd.services.reaction.unitConfig.ConditionCapability = "CAP_NET_ADMIN"; + systemd.services.reaction.serviceConfig = { + CapabilityBoundingSet = [ "CAP_NET_ADMIN" ]; + AmbientCapabilities = [ "CAP_NET_ADMIN" ]; + }; users.users.nixos.isNormalUser = true; # neeeded to establish a ssh connection, by default root login is succeeding without any password }; @@ -42,7 +46,6 @@ server.wait_for_unit("multi-user.target") server.wait_for_unit("reaction") server.wait_for_unit("sshd") - client.wait_for_unit("multi-user.target") client_addr = "${(lib.head nodes.client.networking.interfaces.eth1.ipv4.addresses).address}" server_addr = "${(lib.head nodes.server.networking.interfaces.eth1.ipv4.addresses).address}"