From 340d0ca38ef4ab35fbcb4b4974b4ec24bcfd36fe Mon Sep 17 00:00:00 2001
From: Ben Brown <ben@demerara.io>
Date: Tue, 21 Jul 2026 14:08:53 +0100
Subject: [PATCH 01/91] python3Packages.detect-secrets: disable tests for
 optional dependencies

---
 .../python-modules/detect-secrets/default.nix        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/detect-secrets/default.nix b/pkgs/development/python-modules/detect-secrets/default.nix
index 2b5e7229b48e..9a705caca43b 100644
--- a/pkgs/development/python-modules/detect-secrets/default.nix
+++ b/pkgs/development/python-modules/detect-secrets/default.nix
@@ -65,8 +65,20 @@ buildPythonPackage rec {
     "test_make_decisions"
     "test_saves_to_baseline"
     "test_start_halfway"
+  ]
+  ++ lib.optionals (!withGibberish) [
+    "test_load_and_output"
+    "test_quit_if_baseline_is_changed_but_not_staged"
   ];
 
+  disabledTestPaths =
+    lib.optionals (!withGibberish) [
+      "tests/filters/gibberish_filter_test.py"
+    ]
+    ++ lib.optionals (!withWordList) [
+      "tests/filters/wordlist_filter_test.py"
+    ];
+
   pythonImportsCheck = [ "detect_secrets" ];
 
   meta = {

From 33790f6c2f41a739ceadd72514bb3efdeb4cd257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 14 Sep 2026 13:02:36 +0200
Subject: [PATCH 02/91] moonshine: 0.16.0 -> 0.16.1

Diff: https://github.com/hgaiser/moonshine/compare/v0.16.0...v0.16.1

Changelog: https://github.com/hgaiser/moonshine/releases/tag/v0.16.1
---
 pkgs/by-name/mo/moonshine/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/moonshine/package.nix b/pkgs/by-name/mo/moonshine/package.nix
index 43972b89d676..b76ffa4001d3 100644
--- a/pkgs/by-name/mo/moonshine/package.nix
+++ b/pkgs/by-name/mo/moonshine/package.nix
@@ -29,19 +29,19 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "moonshine";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "hgaiser";
     repo = "moonshine";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SpDGhIi6FTYAWDzMZwPdNbwPmDEA3w/xOi2z5wRR1Qc=";
+    hash = "sha256-CmSOU263HD4qDFwGRxyozo2u2BlM+bT8AE7EwFPEhnA=";
   };
 
   __structuredAttrs = true;
   strictDeps = true;
 
-  cargoHash = "sha256-GhHjXPx3aEYPO9OsuB1ZAiwvessXoOOQ8MqFwmORJOs=";
+  cargoHash = "sha256-g9X9tiO+mUW4eTYi16nvesHIvWsQgAft7ZLEK1/CQHg=";
 
   # Build Moonshine binary and Vulkan layer
   cargoBuildFlags = [

From 35e6d50e257bea832c276b0bf3f5d78b627eb1f9 Mon Sep 17 00:00:00 2001
From: marcg <marcgrec@tuta.com>
Date: Tue, 15 Sep 2026 17:30:30 +0300
Subject: [PATCH 03/91] pdf2image: patch remaining poppler_path defaults

The existing substituteInPlace was not matching all instances where the
`poppler_path` argument appeared.

This affects the signatures of `pdfinfo_from_path`,
`pdfinfo_from_bytes`, `_get_command_path` and `_get_poppler_version`.
---
 pkgs/development/python-modules/pdf2image/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix
index b18981d2ab62..5347ffbb5d08 100644
--- a/pkgs/development/python-modules/pdf2image/default.nix
+++ b/pkgs/development/python-modules/pdf2image/default.nix
@@ -20,7 +20,9 @@ buildPythonPackage rec {
     # replace all default values of paths to poppler-utils
     substituteInPlace pdf2image/pdf2image.py \
       --replace-fail 'poppler_path: Union[str, PurePath] = None' \
-                     'poppler_path: Union[str, PurePath] = "${poppler-utils}/bin"'
+                     'poppler_path: Union[str, PurePath] = "${poppler-utils}/bin"' \
+      --replace-fail 'poppler_path: str = None' \
+                     'poppler_path: str = "${poppler-utils}/bin"'
   '';
 
   propagatedBuildInputs = [ pillow ];

From 7b1e626a2bb2eb2f4f78443b15b48970d4819d3b Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Sat, 25 Apr 2026 22:03:57 +0100
Subject: [PATCH 04/91] haskellPackages: fix a lot of failures under darwin
 sandbox

---
 .../haskell-modules/configuration-darwin.nix  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index bdab68723322..710db8b53557 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -252,6 +252,42 @@ self: super:
     # Tests fail on macOS https://github.com/mrkkrp/zip/issues/112
     zip = dontCheck super.zip;
 
+    inherit
+      (lib.mapAttrs (
+        _:
+        overrideCabal (drv: {
+          __darwinAllowLocalNetworking = true;
+        })
+      ) super)
+      cisco-spark-api
+      context-http-client
+      context-wai-middleware
+      haskell-bee-redis
+      http-client-websockets
+      http-io-streams
+      katip-wai
+      keter
+      monad-metrics-extensible
+      mysql-haskell
+      network-transport-tcp
+      network-wait
+      om-socket
+      polysemy-webserver
+      port-utils
+      servant-hmac-auth
+      servant-prometheus
+      sydtest-servant
+      sydtest-wai
+      sydtest-yesod
+      wai-app-file-cgi
+      wai-make-assets
+      wai-token-bucket-ratelimiter
+      webex-teams-api
+      webex-teams-pipes
+      ws-chans
+      zeromq4-haskell
+      ;
+
     dap = overrideCabal (drv: {
       __darwinAllowLocalNetworking = true;
     }) super.dap;

From 48f5c78ce82564cc3616537470b553dc0be65c78 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Tue, 15 Sep 2026 14:49:15 +0100
Subject: [PATCH 05/91] haskellPackages: clean up darwin overrides

---
 .../haskell-modules/configuration-darwin.nix  | 84 ++++---------------
 1 file changed, 16 insertions(+), 68 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index 710db8b53557..ea76a96800e8 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -16,18 +16,6 @@ self: super:
     # see: https://github.com/psibi/shell-conduit/issues/12
     shell-conduit = dontCheck super.shell-conduit;
 
-    conduit-extra = overrideCabal (drv: {
-      __darwinAllowLocalNetworking = true;
-    }) super.conduit-extra;
-
-    spacecookie = overrideCabal (_: {
-      __darwinAllowLocalNetworking = true;
-    }) super.spacecookie;
-
-    streaming-commons = overrideCabal (_: {
-      __darwinAllowLocalNetworking = true;
-    }) super.streaming-commons;
-
     # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
     hakyll = overrideCabal {
       testToolDepends = [ ];
@@ -134,12 +122,6 @@ self: super:
       + (oldAttrs.preCompileBuildDriver or "");
     }) super.llvm-hs;
 
-    yesod-core = overrideCabal (drv: {
-      # Allow access to local networking when the Darwin sandbox is enabled, so yesod-core can
-      # run tests that access localhost.
-      __darwinAllowLocalNetworking = true;
-    }) super.yesod-core;
-
     hidapi = super.hidapi.override { systemd = null; };
 
     # Ensure the necessary frameworks are propagatedBuildInputs on darwin
@@ -234,12 +216,6 @@ self: super:
     # Otherwise impure gcc is used, which is Apple's weird wrapper
     c2hsc = addTestToolDepends [ pkgs.gcc ] super.c2hsc;
 
-    http2 = overrideCabal (drv: {
-      # Allow access to local networking when the Darwin sandbox is enabled, so http2 can run tests
-      # that access localhost.
-      __darwinAllowLocalNetworking = true;
-    }) super.http2;
-
     # https://hydra.nixos.org/build/230964714/nixlog/1
     inline-c-cpp = appendPatch (pkgs.fetchpatch {
       url = "https://github.com/fpco/inline-c/commit/e8dc553b13bb847409fdced649a6a863323cff8a.patch";
@@ -260,22 +236,37 @@ self: super:
         })
       ) super)
       cisco-spark-api
+      conduit-extra
       context-http-client
       context-wai-middleware
+      dap
+      essence-of-live-coding-warp
       haskell-bee-redis
       http-client-websockets
       http-io-streams
+      http-streams
+      http2
+      io-streams
+      io-streams-haproxy
+      jsaddle-warp
       katip-wai
       keter
       monad-metrics-extensible
       mysql-haskell
+      network
       network-transport-tcp
       network-wait
       om-socket
+      openssl-streams
       polysemy-webserver
       port-utils
+      servant-auth-client
+      servant-client
       servant-hmac-auth
       servant-prometheus
+      snap
+      spacecookie
+      streaming-commons
       sydtest-servant
       sydtest-wai
       sydtest-yesod
@@ -285,49 +276,10 @@ self: super:
       webex-teams-api
       webex-teams-pipes
       ws-chans
+      yesod-core
       zeromq4-haskell
       ;
 
-    dap = overrideCabal (drv: {
-      __darwinAllowLocalNetworking = true;
-    }) super.dap;
-
-    essence-of-live-coding-warp = overrideCabal (drv: {
-      __darwinAllowLocalNetworking = true;
-    }) super.essence-of-live-coding-warp;
-
-    http-streams = overrideCabal (drv: {
-      __darwinAllowLocalNetworking = true;
-    }) super.http-streams;
-
-    io-streams = overrideCabal (drv: {
-      __darwinAllowLocalNetworking = true;
-    }) super.io-streams;
-
-    io-streams-haproxy = overrideCabal (drv: {
-      __darwinAllowLocalNetworking = true;
-    }) super.io-streams-haproxy;
-
-    jsaddle-warp = overrideCabal (drv: {
-      __darwinAllowLocalNetworking = true;
-    }) super.jsaddle-warp;
-
-    openssl-streams = overrideCabal (drv: {
-      __darwinAllowLocalNetworking = true;
-    }) super.openssl-streams;
-
-    servant-auth-client = overrideCabal (drv: {
-      __darwinAllowLocalNetworking = true;
-    }) super.servant-auth-client;
-
-    servant-client = overrideCabal (drv: {
-      __darwinAllowLocalNetworking = true;
-    }) super.servant-client;
-
-    snap = overrideCabal (drv: {
-      __darwinAllowLocalNetworking = true;
-    }) super.snap;
-
     warp = overrideCabal (drv: {
       __darwinAllowLocalNetworking = true;
       # These fail in darwin sandbox with:
@@ -412,10 +364,6 @@ self: super:
     servant-auth-server = dontCheck super.servant-auth-server;
 
     sysinfo = dontCheck super.sysinfo;
-
-    network = overrideCabal (drv: {
-      __darwinAllowLocalNetworking = true;
-    }) super.network;
   }
   // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 {
     # aarch64-darwin

From 34e29fbe99a364d7ecac082e9903a37ae9ba5378 Mon Sep 17 00:00:00 2001
From: Leonard Sheng Sheng Lee <305414+sheeeng@users.noreply.github.com>
Date: Thu, 17 Sep 2026 09:32:55 +0200
Subject: [PATCH 06/91] px0: init at 0.1.4

Package `px0`, a fast, ultra-light, remote-first IDE for instant
code navigation and review in the browser. Built from source using
`buildGoModule`; pure Go with no CGO or external dependencies.

Signed-off-by: Leonard Sheng Sheng Lee <305414+sheeeng@users.noreply.github.com>
---
 pkgs/by-name/px/px0/package.nix | 45 +++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/px/px0/package.nix

diff --git a/pkgs/by-name/px/px0/package.nix b/pkgs/by-name/px/px0/package.nix
new file mode 100644
index 000000000000..48f8959990c2
--- /dev/null
+++ b/pkgs/by-name/px/px0/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "px0";
+  version = "0.1.4";
+
+  src = fetchFromGitHub {
+    owner = "px0-ai";
+    repo = "px0";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-1r000izgL1EFsBpIkyb8u6+RVhV58qHf+AshSYtINmY=";
+  };
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  vendorHash = "sha256-71+6I0u3en/Aw3PVMXx6dF+NQtCiE1T+kd7MENCKnlk=";
+
+  checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
+    "-skip"
+    "TestListenPortFallback|TestTelemetrySessionLifecycle"
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Fast, ultra-light, remote-first IDE for code navigation and review in your browser";
+    homepage = "https://github.com/px0-ai/px0";
+    changelog = "https://github.com/px0-ai/px0/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sheeeng ];
+    mainProgram = "px0";
+  };
+})

From 0693729d34ae3b479bc74faf122dddc28e17439d Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Thu, 17 Sep 2026 14:03:54 +0200
Subject: [PATCH 07/91] chunkfs: port to fuse 3

---
 pkgs/by-name/ch/chunkfs/fuse3.diff  | 157 ++++++++++++++++++++++++++++
 pkgs/by-name/ch/chunkfs/package.nix |  15 ++-
 2 files changed, 170 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/ch/chunkfs/fuse3.diff

diff --git a/pkgs/by-name/ch/chunkfs/fuse3.diff b/pkgs/by-name/ch/chunkfs/fuse3.diff
new file mode 100644
index 000000000000..fda8a524b7d6
--- /dev/null
+++ b/pkgs/by-name/ch/chunkfs/fuse3.diff
@@ -0,0 +1,157 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,8 +3,11 @@ PREFIX?=/usr/local
+ 
+ VERSION=0.8
+ 
+-CFLAGS=-std=c99 -DVERSION='"$(VERSION)"' -O2 -Wall
+-LDFLAGS=-s -lfuse
++FUSE_CFLAGS:=$(shell pkg-config --cflags fuse3)
++CFLAGS=-std=c99 -DVERSION='"$(VERSION)"' -O2 -Wall $(FUSE_CFLAGS)
++LDFLAGS=-s
++FUSE_LIBS:=$(shell pkg-config --libs fuse3)
++LDLIBS=$(FUSE_LIBS)
+ 
+ all: chunkfs unchunkfs chunkfs.1.gz
+ 
+diff --git a/chunkfs.c b/chunkfs.c
+index 825553d..09b5e19 100644
+--- a/chunkfs.c
++++ b/chunkfs.c
+@@ -19,7 +19,7 @@
+ 
+ #define _FILE_OFFSET_BITS 64
+ #define _XOPEN_SOURCE 500
+-#define FUSE_USE_VERSION 25
++#define FUSE_USE_VERSION 317
+ 
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -87,7 +87,7 @@ static int resolve_path(const char *path,struct chunk_stat *st){
+ 	return 0;
+ }
+ 
+-static int chunkfs_getattr(const char *path,struct stat *buf){
++static int chunkfs_getattr(const char *path,struct stat *buf, struct fuse_file_info *fileinfo){
+ 	int r;
+ 	struct chunk_stat st;
+ 
+@@ -109,7 +109,7 @@ static int chunkfs_getattr(const char *path,struct stat *buf){
+ 	return 0;
+ }
+ 
+-static int chunkfs_readdir(const char *path,void *buf,fuse_fill_dir_t filler,off_t offset,struct fuse_file_info *fi){
++static int chunkfs_readdir(const char *path,void *buf,fuse_fill_dir_t filler,off_t offset,struct fuse_file_info *fi, enum fuse_readdir_flags flags){
+ 	int r;
+ 	struct chunk_stat st;
+ 	uint64_t chunks_per_entry;
+@@ -117,12 +117,12 @@ static int chunkfs_readdir(const char *path,void *buf,fuse_fill_dir_t filler,off
+ 	if((r=resolve_path(path,&st))<0)return r;
+ 	if(!S_ISDIR(st.mode))return -ENOTDIR;
+ 	chunks_per_entry=1ULL<<((8-1-st.level)*8);
+-	filler(buf,".",NULL,0);
+-	filler(buf,"..",NULL,0);
++	filler(buf,".",NULL,0,FUSE_FILL_DIR_DEFAULTS);
++	filler(buf,"..",NULL,0,FUSE_FILL_DIR_DEFAULTS);
+ 	for(uint64_t x=0;x<256&&(uint64_t)st.chunk+x*chunks_per_entry<(uint64_t)image_chunks;x++){
+ 		char nbuf[3];
+ 		sprintf(nbuf,"%02" PRIx64,x);
+-		filler(buf,nbuf,NULL,0);
++		filler(buf,nbuf,NULL,0,FUSE_FILL_DIR_DEFAULTS);
+ 	}
+ 	return 0;
+ }
+@@ -203,13 +203,13 @@ int main(int argc,char **argv){
+ 			"    -V                     print version\n"
+ 			"\n",
+ 			*argv);
+-		fake_argv[1]="-ho";
+-		fuse_main(2,fake_argv,&chunkfs_ops);
++		fake_argv[1]="--help";
++		fuse_main(2,fake_argv,&chunkfs_ops,NULL);
+ 		ret=validation_error;
+ 	}else if(show_version){
+ 		fprintf(stderr,"ChunkFS v" VERSION "\n");
+ 		fake_argv[1]="-V";
+-		fuse_main(2,fake_argv,&chunkfs_ops);
++		fuse_main(2,fake_argv,&chunkfs_ops,NULL);
+ 	}else{
+ 		errno=0;
+ 		chunk_size=strtoll(argv[optind],&end,10);
+@@ -228,7 +228,7 @@ int main(int argc,char **argv){
+ 		if(image_size%chunk_size)image_chunks++;
+ 		argv[optind]=argv[optind+2];
+ 		argc-=2;
+-		ret=fuse_main(argc,argv,&chunkfs_ops);
++		ret=fuse_main(argc,argv,&chunkfs_ops,NULL);
+ 	}
+ 	return ret;
+ }
+diff --git a/unchunkfs.c b/unchunkfs.c
+index 6302019..b8293e2 100644
+--- a/unchunkfs.c
++++ b/unchunkfs.c
+@@ -19,7 +19,7 @@
+ 
+ #define _FILE_OFFSET_BITS 64
+ #define _XOPEN_SOURCE 500
+-#define FUSE_USE_VERSION 25
++#define FUSE_USE_VERSION 317
+ 
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -72,7 +72,7 @@ static void gen_chunk_name(char *buf,off_t num){
+ 	}
+ }
+ 
+-static int unchunkfs_getattr(const char *path,struct stat *buf){
++static int unchunkfs_getattr(const char *path,struct stat *buf, struct fuse_file_info *fileinfo){
+ 	int r;
+ 	mode_t mode;
+ 
+@@ -94,15 +94,15 @@ static int unchunkfs_getattr(const char *path,struct stat *buf){
+ 	return 0;
+ }
+ 
+-static int unchunkfs_readdir(const char *path,void *buf,fuse_fill_dir_t filler,off_t offset,struct fuse_file_info *fi){
++static int unchunkfs_readdir(const char *path,void *buf,fuse_fill_dir_t filler,off_t offset,struct fuse_file_info *fi, enum fuse_readdir_flags flags){
+ 	int r;
+ 	mode_t mode;
+ 
+ 	if((r=resolve_path(path,&mode))<0)return r;
+ 	if(!S_ISDIR(mode))return -ENOTDIR;
+-	filler(buf,".",NULL,0);
+-	filler(buf,"..",NULL,0);
+-	filler(buf,"image",NULL,0);
++	filler(buf,".",NULL,0,FUSE_FILL_DIR_DEFAULTS);
++	filler(buf,"..",NULL,0,FUSE_FILL_DIR_DEFAULTS);
++	filler(buf,"image",NULL,0,FUSE_FILL_DIR_DEFAULTS);
+ 	return 0;
+ }
+ 
+@@ -190,13 +190,13 @@ int main(int argc,char **argv){
+ 			"    -V                     print version\n"
+ 			"\n",
+ 			*argv);
+-		fake_argv[1]="-ho";
+-		fuse_main(2,fake_argv,&unchunkfs_ops);
++		fake_argv[1]="--help";
++		fuse_main(2,fake_argv,&unchunkfs_ops,NULL);
+ 		ret=validation_error;
+ 	}else if(show_version){
+ 		fprintf(stderr,"UnChunkFS v" VERSION "\n");
+ 		fake_argv[1]="-V";
+-		fuse_main(2,fake_argv,&unchunkfs_ops);
++		fuse_main(2,fake_argv,&unchunkfs_ops,NULL);
+ 	}else{
+ 		if((cwd_fd=open(".",O_RDONLY))<0)die(true,"open(.)");
+ 		if((chunkdir_fd=open(argv[optind],O_RDONLY))<0)die(true,"open(<chunk dir>)");
+@@ -226,7 +226,7 @@ int main(int argc,char **argv){
+ 		argv[optind]=argv[optind+1];
+ 		argc--;
+ 		if(fchdir(cwd_fd)<0)die(true,"fchdir(<start cwd>)");
+-		ret=fuse_main(argc,argv,&unchunkfs_ops);
++		ret=fuse_main(argc,argv,&unchunkfs_ops,NULL);
+ 	}
+ 	return ret;
+ }
diff --git a/pkgs/by-name/ch/chunkfs/package.nix b/pkgs/by-name/ch/chunkfs/package.nix
index 1709df4f5fb9..e361f91ab1f3 100644
--- a/pkgs/by-name/ch/chunkfs/package.nix
+++ b/pkgs/by-name/ch/chunkfs/package.nix
@@ -3,21 +3,30 @@
   stdenv,
   fetchurl,
   perl,
-  fuse,
+  fuse3,
+  pkg-config,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "chunkfs";
   version = "0.8";
 
+  patches = [
+    ./fuse3.diff
+  ];
+
   src = fetchurl {
     url = "https://chunkfs.florz.de/chunkfs_${finalAttrs.version}.tar.xz";
     hash = "sha256-HFv51ta2eNW9Qt9CUp2oTTlC8Lpwc1XKR/uYzMDfd88=";
   };
 
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
   buildInputs = [
     perl
-    fuse
+    fuse3
   ];
 
   makeFlags = [
@@ -25,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
     "PREFIX="
   ];
 
+  enableParallelBuilding = true;
+
   preInstall = ''
     mkdir -p $out/bin
     mkdir -p $out/share/man/man1

From 3e78b1bdde2520039911b21e2e135cc951733a6f Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 29 Jun 2026 03:38:14 +0200
Subject: [PATCH 08/91] euro-office-desktopeditors: init at 9.3.1-dev.1

---
 .../eu/euro-office-desktopeditors/package.nix | 234 ++++++++++++++++++
 1 file changed, 234 insertions(+)
 create mode 100644 pkgs/by-name/eu/euro-office-desktopeditors/package.nix

diff --git a/pkgs/by-name/eu/euro-office-desktopeditors/package.nix b/pkgs/by-name/eu/euro-office-desktopeditors/package.nix
new file mode 100644
index 000000000000..fd259e2dbc6a
--- /dev/null
+++ b/pkgs/by-name/eu/euro-office-desktopeditors/package.nix
@@ -0,0 +1,234 @@
+{
+  stdenv,
+  lib,
+  fetchurl,
+  buildFHSEnv,
+  unzip,
+  patchelfUnstable,
+  # Alphabetic ordering below
+  alsa-lib,
+  at-spi2-atk,
+  atk,
+  autoPatchelfHook,
+  cairo,
+  curl,
+  dbus,
+  dconf,
+  dpkg,
+  firebird,
+  fontconfig,
+  gcc-unwrapped,
+  gdk-pixbuf,
+  glib,
+  glibc,
+  gsettings-desktop-schemas,
+  gst_all_1,
+  gtk2,
+  gtk3,
+  libGL,
+  libdrm,
+  libgbm,
+  libmysqlclient,
+  libnotify,
+  libpulseaudio,
+  libudev0-shim,
+  libx11,
+  libxcb,
+  libxcb-cursor,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxscrnsaver,
+  libxtst,
+  makeWrapper,
+  noto-fonts-cjk-sans,
+  nspr,
+  nss,
+  pulseaudio,
+  qt6,
+  wrapGAppsHook3,
+  xkeyboard_config,
+}:
+let
+
+  # Note on fonts:
+  #
+  # EuroOffice does not distribute unfree fonts, but makes it easy to pick up
+  # any fonts you install. See:
+  #
+  # * https://helpcenter.onlyoffice.com/en/installation/docs-community-install-fonts-linux.aspx
+  # * https://www.onlyoffice.com/blog/2020/04/how-to-add-new-fonts-to-onlyoffice-desktop-editors/
+  #
+  # As recommended there, you should download
+  #
+  #     arial.ttf, calibri.ttf, cour.ttf, symbol.ttf, times.ttf, wingding.ttf
+  #
+  # into `~/.local/share/fonts/`, otherwise the default template fonts, and
+  # things like bullet points, will not look as expected.
+
+  # TODO: Find out which of these fonts we'd be allowed to distribute along
+  #       with this package, or how to make this easier for users otherwise.
+
+  runtimeLibs = lib.makeLibraryPath [
+    curl
+    glibc
+    gcc-unwrapped.lib
+    libudev0-shim
+    pulseaudio
+  ];
+
+  derivation = stdenv.mkDerivation (finalAttrs: {
+    pname = "euro-office-desktopeditors";
+    # No release yet, pinning to latest version where Linux artifacts
+    # where provided.
+    version = "9.3.1-dev.1";
+    # Manual uploaded Github CI artifact (actions run 28295624289,
+    # artifact 7926798036) of linux-packages-amd64 tarball.
+    src = fetchurl {
+      url = "https://archive.org/download/euro-office-desktopeditors-9.3.1-dev.1-linux-amd64/linux-packages-amd64.zip";
+      hash = "sha256-OV3abn9nYq/FeBkpft+27iGt34Rqi2VkJkAZwBHu1lM=";
+    };
+
+    unpackPhase = ''
+      mkdir -p source
+      cd source
+      unzip $src
+      dpkg-deb -x euro-office-desktopeditors_*.deb .
+    '';
+
+    nativeBuildInputs = [
+      autoPatchelfHook
+      dpkg
+      makeWrapper
+      patchelfUnstable
+      unzip
+      wrapGAppsHook3
+    ];
+
+    buildInputs = [
+      alsa-lib
+      at-spi2-atk
+      atk
+      cairo
+      dbus
+      dconf
+      firebird
+      fontconfig
+      gdk-pixbuf
+      glib
+      gsettings-desktop-schemas
+      gst_all_1.gst-plugins-base
+      gst_all_1.gstreamer
+      gtk2
+      gtk3
+      libdrm
+      libgbm
+      libmysqlclient
+      libnotify
+      libpulseaudio
+      libx11
+      libxcb
+      libxcb-cursor
+      libxcomposite
+      libxcursor
+      libxdamage
+      libxext
+      libxfixes
+      libxi
+      libxrandr
+      libxrender
+      libxscrnsaver
+      libxtst
+      nspr
+      nss
+      qt6.qtbase
+      qt6.qtdeclarative
+      qt6.qtquick3d
+      qt6.qtsvg
+      qt6.qtwayland
+    ];
+
+    dontWrapQtApps = true;
+
+    dontStrip = 1;
+
+    autoPatchelfIgnoreMissingDeps = [
+      # 'mysql80' reached end of life on 2026-04-30 and has been removed.
+      "libmysqlclient.so.21"
+      # These libraries are not available in nixpkgs. They are Oracle Instant Client
+      # (libclntsh.so.23.1) and UCanAccess/Mimer SQL (libmimerapi.so) drivers that
+      # are bundled with Qt's SQlite database plugins (libqsqlora, libqsqlmimer).
+      "libclntsh.so.23.1"
+      "libmimerapi.so"
+    ];
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/{bin,lib,share}
+
+      mv usr/bin/* $out/bin
+      mv usr/share/* $out/share/
+      mv opt/euro-office/desktopeditors $out/share
+
+      substituteInPlace $out/bin/euro-office-desktopeditors \
+        --replace-fail "/opt/euro-office/" "$out/share/"
+
+      ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors
+
+      runHook postInstall
+    '';
+
+    preFixup = ''
+      gappsWrapperArgs+=(
+        --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
+        --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
+        --set QTCOMPOSE "${libx11.out}/share/X11/locale" \
+        --set QT_QPA_PLATFORM "xcb"
+        # the bundled version of qt does not support wayland
+      )
+    '';
+  });
+
+in
+
+# In order to download plugins, Euro-Office uses /usr/bin/curl so we have to wrap it.
+# Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code.
+# Fonts are also discovered by looking in /usr/share/fonts, so adding fonts to targetPkgs will include them
+buildFHSEnv {
+  inherit (derivation) pname version;
+
+  targetPkgs = pkgs': [
+    curl
+    derivation
+    noto-fonts-cjk-sans
+    libGL
+  ];
+
+  runScript = "/bin/euro-office-desktopeditors";
+
+  extraInstallCommands = ''
+    mkdir -p $out/share
+    ln -s ${derivation}/share/icons $out/share
+    cp -r ${derivation}/share/applications $out/share
+    substituteInPlace $out/share/applications/euro-office-desktopeditors.desktop \
+        --replace-fail "/usr/bin/euro-office-desktopeditors" "$out/bin/euro-office-desktopeditors"
+  '';
+
+  meta = {
+    description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents";
+    homepage = "https://github.com/Euro-Office/DesktopEditors";
+    downloadPage = "https://github.com/Euro-Office/DesktopEditors/releases";
+    changelog = "https://github.com/Euro-Office/DesktopEditors/blob/v9.3.1/CHANGELOG.md";
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    license = lib.licenses.agpl3Plus;
+    maintainers = [ lib.maintainers.onny ];
+    mainProgram = "euro-office-desktopeditors";
+  };
+}

From b05968103a3ba86253c38056722fe779feba292f Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Mon, 21 Sep 2026 07:28:38 +0000
Subject: [PATCH 09/91] subnetcalc: 2.6.6 -> 2.7.5

---
 pkgs/by-name/su/subnetcalc/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/subnetcalc/package.nix b/pkgs/by-name/su/subnetcalc/package.nix
index e6bace3a9cbb..c835347c116e 100644
--- a/pkgs/by-name/su/subnetcalc/package.nix
+++ b/pkgs/by-name/su/subnetcalc/package.nix
@@ -5,17 +5,19 @@
   cmake,
   ninja,
   gettext,
+  libidn2,
+  libmaxminddb,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "subnetcalc";
-  version = "2.6.6";
+  version = "2.7.5";
 
   src = fetchFromGitHub {
     owner = "dreibh";
     repo = "subnetcalc";
     tag = "subnetcalc-${finalAttrs.version}";
-    hash = "sha256-8tC8hBeKy8nxi6nUhWNwnwDgS6NV/9g5L75dsM097IA=";
+    hash = "sha256-xMWEd8F6tQuKVL4aybdwsidBbmPItuNd6iCZUfzjVLA=";
   };
 
   nativeBuildInputs = [
@@ -24,9 +26,14 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
   ];
 
+  buildInputs = [
+    libidn2
+    libmaxminddb
+  ];
+
   meta = {
     description = "IPv4/IPv6 subnet address calculator";
-    homepage = "https://www.uni-due.de/~be0001/subnetcalc/";
+    homepage = "https://www.nntb.no/~dreibh/subnetcalc/";
     license = lib.licenses.gpl3Plus;
     longDescription = ''
       SubNetCalc is an IPv4/IPv6 subnet address calculator. For given IPv4 or

From e9258a46a0298cb413e7eaa1f994ac664e8b05a1 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 21 Sep 2026 03:19:52 -0700
Subject: [PATCH 10/91] =?UTF-8?q?zulip:=205.13.1=20=E2=86=92=205.13.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/by-name/zu/zulip/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix
index a71e30515fc9..8ac5545f098c 100644
--- a/pkgs/by-name/zu/zulip/package.nix
+++ b/pkgs/by-name/zu/zulip/package.nix
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zulip";
-  version = "5.13.1";
+  version = "5.13.2";
 
   src = fetchFromGitHub {
     owner = "zulip";
     repo = "zulip-desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bYN63EQo+c0SIz3BBIwkAS1QqS7+sg7JdpoOekVYq5Q=";
+    hash = "sha256-QFKyslnO+C64ursHyFWFbBzOqFHFXwiavDNfA13eJww=";
   };
 
   __structuredAttrs = true;

From 87dd924db8fec6f37a5f3800275a8cb5b683984c Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Tue, 22 Sep 2026 21:35:56 +0200
Subject: [PATCH 11/91] epson-escpr2: drop update script and clear user agent
 for fetchurl

Epson seems to have started blocking download tools like curl & wget,
see https://aur.archlinux.org/packages/epson-inkjet-printer-escpr2#comment-1067163
---
 pkgs/by-name/ep/epson-escpr2/package.nix |  5 ++---
 pkgs/by-name/ep/epson-escpr2/update.sh   | 21 ---------------------
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100755 pkgs/by-name/ep/epson-escpr2/update.sh

diff --git a/pkgs/by-name/ep/epson-escpr2/package.nix b/pkgs/by-name/ep/epson-escpr2/package.nix
index c6b8c5103101..65c10aef7fd6 100644
--- a/pkgs/by-name/ep/epson-escpr2/package.nix
+++ b/pkgs/by-name/ep/epson-escpr2/package.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation {
     # To find the most recent version go to
     # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php
     # and retrieve the download link for source package for arm CPU for the tar.gz (the x86 link targets to rpm source files)
-
+    # or check https://download-center.epson.com/api/v1/modules/?device_id=XP-970%20Series&os=DEBARM32&region=US&language=en
+    curlOpts = "--user-agent ''";
     url = "https://download-center.epson.com/f/module/1316b6b0-77cd-438c-95e1-c71e760a7579/epson-inkjet-printer-escpr2-1.2.37-1.tar.gz";
     hash = "sha256-jSh2HVb490CYJ/C+Eh1T5TmnBF7hmBmsGHuVbiWTHQ0=";
   };
@@ -38,8 +39,6 @@ stdenv.mkDerivation {
     "--with-cupsppddir=${placeholder "out"}/share/cups/model"
   ];
 
-  passthru.updateScript = ./update.sh;
-
   meta = {
     homepage = "http://download.ebz.epson.net/dsc/search/01/search/";
     description = "ESC/P-R 2 Driver (generic driver)";
diff --git a/pkgs/by-name/ep/epson-escpr2/update.sh b/pkgs/by-name/ep/epson-escpr2/update.sh
deleted file mode 100755
index b2082decd74a..000000000000
--- a/pkgs/by-name/ep/epson-escpr2/update.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash curl jq common-updater-scripts
-set -eou pipefail
-
-result=$(curl -sSL 'https://download-center.epson.com/api/v1/modules/?device_id=XP-970%20Series&os=DEBARM32&region=US&language=en' | jq -r '.items[] | select(.module_name == "Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux" and .cti_category == "Sources")')
-
-latestVersion=$(jq '.version' <<< "$result" | tr -d '"')
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; (lib.getVersion epson-escpr2)" | tr -d '"')
-
-echo "latest  version: $latestVersion"
-echo "current version: $currentVersion"
-
-if [[ "$latestVersion" == "$currentVersion" ]]; then
-    echo "package is up-to-date"
-    exit 0
-fi
-
-url=$(jq '.url' <<< "$result" | tr -d '"')
-
-hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(nix-prefetch-url $url))
-update-source-version epson-escpr2 $latestVersion $hash $url --ignore-same-version

From e705852165077f1606cb7c4e42c4840c33f15e97 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Tue, 22 Sep 2026 21:38:18 +0200
Subject: [PATCH 12/91] epson-escpr2: 1.2.37 -> 1.2.42

---
 pkgs/by-name/ep/epson-escpr2/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ep/epson-escpr2/package.nix b/pkgs/by-name/ep/epson-escpr2/package.nix
index 65c10aef7fd6..93645e37b8f6 100644
--- a/pkgs/by-name/ep/epson-escpr2/package.nix
+++ b/pkgs/by-name/ep/epson-escpr2/package.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation {
   pname = "epson-inkjet-printer-escpr2";
-  version = "1.2.37";
+  version = "1.2.42";
 
   src = fetchurl {
     # To find the most recent version go to
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
     # and retrieve the download link for source package for arm CPU for the tar.gz (the x86 link targets to rpm source files)
     # or check https://download-center.epson.com/api/v1/modules/?device_id=XP-970%20Series&os=DEBARM32&region=US&language=en
     curlOpts = "--user-agent ''";
-    url = "https://download-center.epson.com/f/module/1316b6b0-77cd-438c-95e1-c71e760a7579/epson-inkjet-printer-escpr2-1.2.37-1.tar.gz";
-    hash = "sha256-jSh2HVb490CYJ/C+Eh1T5TmnBF7hmBmsGHuVbiWTHQ0=";
+    url = "https://download-center.epson.com/f/module/4d70b84a-1686-4134-8ce0-4ac8a838f31c/epson-inkjet-printer-escpr2-1.2.42-1.tar.gz";
+    hash = "sha256-/gj4K6VPouXwS6p0Bc7dgF/j9Vl6YRVqH8pym1E/Tf4=";
   };
 
   buildInputs = [ cups ];

From e2497c3a5262687ff7aada0707bc754cca66396f Mon Sep 17 00:00:00 2001
From: Antonis Kotronakis <mail@akotro.dev>
Date: Wed, 23 Sep 2026 00:02:31 +0300
Subject: [PATCH 13/91] nixos/beszel-agent: enable zfs monitoring support

---
 nixos/modules/services/monitoring/beszel-agent.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/beszel-agent.nix b/nixos/modules/services/monitoring/beszel-agent.nix
index e1ac8ffe25f6..756d729f8cef 100644
--- a/nixos/modules/services/monitoring/beszel-agent.nix
+++ b/nixos/modules/services/monitoring/beszel-agent.nix
@@ -136,6 +136,7 @@ in
       path =
         cfg.extraPath
         ++ lib.optionals cfg.smartmon.enable [ cfg.smartmon.package ]
+        ++ lib.optionals config.boot.zfs.enabled [ config.boot.zfs.package ]
         ++ lib.optionals (builtins.elem "nvidia" config.services.xserver.videoDrivers) [
           (lib.getBin config.hardware.nvidia.package)
         ]
@@ -182,9 +183,9 @@ in
 
         LockPersonality = true;
         NoNewPrivileges = !cfg.smartmon.enable;
-        PrivateDevices = !cfg.smartmon.enable;
+        PrivateDevices = !cfg.smartmon.enable && !config.boot.zfs.enabled;
         PrivateTmp = true;
-        PrivateUsers = !cfg.smartmon.enable && !cfg.environment.SKIP_SYSTEMD;
+        PrivateUsers = !cfg.smartmon.enable && !config.boot.zfs.enabled && !cfg.environment.SKIP_SYSTEMD;
         ProtectClock = true;
         ProtectControlGroups = "strict";
         ProtectHome = "read-only";

From 601187e09c29e16d0de5c197e2ed24224d41f12c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Sep 2026 09:18:10 +0000
Subject: [PATCH 14/91] libvlc: 3.0.23-2 -> 3.0.24

---
 pkgs/by-name/vl/vlc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix
index 9924f98000ee..3148af6652b2 100644
--- a/pkgs/by-name/vl/vlc/package.nix
+++ b/pkgs/by-name/vl/vlc/package.nix
@@ -101,14 +101,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "${optionalString onlyLibVLC "lib"}vlc";
-  version = "3.0.23-2";
+  version = "3.0.24";
 
   src = fetchFromGitLab {
     domain = "code.videolan.org";
     owner = "videolan";
     repo = "vlc";
     rev = finalAttrs.version;
-    hash = "sha256-vg/kKNrIpGF7Olz8EiA1ZsW5SB4iHlvFbREDp4JokB0=";
+    hash = "sha256-WzgWspA1Jpc6FZ3kaEsxNEOI3Xj37Zp43NNbn6LamXg=";
   };
 
   depsBuildBuild = optionals waylandSupport [ pkg-config ];

From ca68cfa5d0713d4b6163a44e1ef8bc99e1911d9e Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Thu, 24 Sep 2026 06:10:45 -0400
Subject: [PATCH 15/91] postgresqlBuildExtension: enable __structuredAttrs

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix b/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix
index 1fc3574fc77e..bcb566f722fd 100644
--- a/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix
+++ b/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix
@@ -89,6 +89,7 @@ lib.extendMkDerivation {
         };
 
       strictDeps = true;
+      __structuredAttrs = true;
       buildInputs = [ postgresql ] ++ prevAttrs.buildInputs or [ ];
       nativeBuildInputs = [ postgresql.pg_config ] ++ prevAttrs.nativeBuildInputs or [ ];
 

From eeafdcf8ffbe75cc2e07a47974cef72913b86f90 Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Thu, 24 Sep 2026 06:10:46 -0400
Subject: [PATCH 16/91] buildPgrxExtension: enable __structuredAttrs

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix
index ecffd2a3f5f5..df4cc7fa1202 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix
@@ -124,6 +124,8 @@ lib.extendMkDerivation {
       cargoPgrxFlags' = lib.escapeShellArgs cargoPgrxFlags;
     in
     {
+      __structuredAttrs = true;
+
       buildInputs = (args.buildInputs or [ ]);
 
       nativeBuildInputs =

From 3cd64f8ce9de42d81ce74553a4db2f793511b157 Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Thu, 24 Sep 2026 06:10:46 -0400
Subject: [PATCH 17/91] postgresqlPackages.tsja: enable strictDeps and
 __structuredAttrs

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/servers/sql/postgresql/ext/tsja.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/servers/sql/postgresql/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/tsja.nix
index 1610f414f038..141d7652fa03 100644
--- a/pkgs/servers/sql/postgresql/ext/tsja.nix
+++ b/pkgs/servers/sql/postgresql/ext/tsja.nix
@@ -24,6 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace tsja.c --replace-fail /usr/local/lib/mecab ${mecab}/lib/mecab
   '';
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   buildInputs = [
     mecab
     postgresql

From 1e383f71a04d46cb2df16fed2c05b7f93fa85966 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 02:53:32 +0000
Subject: [PATCH 18/91] trezor-suite: 26.8.2 -> 26.9.2

---
 pkgs/by-name/tr/trezor-suite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix
index a62f0aa87c3c..9b3d72cedd45 100644
--- a/pkgs/by-name/tr/trezor-suite/package.nix
+++ b/pkgs/by-name/tr/trezor-suite/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "trezor-suite";
-  version = "26.8.2";
+  version = "26.9.2";
 
   suffix =
     {
@@ -24,8 +24,8 @@ let
     hash =
       {
         # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
-        aarch64-linux = "sha512-vbMku80aY5zTa6ObmkuZNkCeONZYsLxnjVxL7QBv14OcDE+vENQ3lyQzVe+spqufMRhCe3hy2ehpA8CewFQKBA==";
-        x86_64-linux = "sha512-bnosz6dtKFaUXaFHXtJSSChSHbW2bj9CK2Dn5X6btB/Xpcsm9Rbnm3If4qh9w1yQYwTlIDBPTRrh8Mh0BGgcag==";
+        aarch64-linux = "sha512-TYPJbatTO9FPsOCSDY+a74xCaiMHozsktSpfW8EaL0yd/74jy0+0VNM8gkHbGANiC7CASygsHfomEe5o5fvBXQ==";
+        x86_64-linux = "sha512-Hd7tkGqLeQJqjnrEVzeULpPxTRpnPS/IZLTU6tyq0PQClrsl/Z2ADuPydfH4g2QlCmMGZMF0TBRvSzRIIrwchw==";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From 226c7e8b52e05402646d8015a43c4c23417127be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Sep 2026 06:20:25 +0000
Subject: [PATCH 19/91] prl-tools: 27.0.1-58670 -> 27.0.2-58673

---
 pkgs/by-name/pr/prl-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/prl-tools/package.nix b/pkgs/by-name/pr/prl-tools/package.nix
index 5443ddbc49a1..56e245a568e6 100644
--- a/pkgs/by-name/pr/prl-tools/package.nix
+++ b/pkgs/by-name/pr/prl-tools/package.nix
@@ -44,13 +44,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "prl-tools";
-  version = "27.0.1-58670";
+  version = "27.0.2-58673";
 
   # We download the full distribution to extract prl-tools-lin.iso from
   # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
   src = fetchurl {
     url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
-    hash = "sha256-ZchIQQ/FyzLmcL2ust1YAqlSsRZWJmDO3t3Ywxo39P0=";
+    hash = "sha256-/buPuva2r9dxSpLdNI9Qg/YTk0Y82XRwFt2XhF24wh0=";
   };
 
   nativeBuildInputs = [

From 28d56e13dabd123172c69fc255bbda2008fa6e6a Mon Sep 17 00:00:00 2001
From: David Pesticcio <david.pesticcio+github.com@gmail.com>
Date: Fri, 25 Sep 2026 11:22:34 +0100
Subject: [PATCH 20/91] doublecmd: fix lua support

---
 pkgs/by-name/do/doublecmd/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix
index d0676d41c7c5..c63c7b213f3a 100644
--- a/pkgs/by-name/do/doublecmd/package.nix
+++ b/pkgs/by-name/do/doublecmd/package.nix
@@ -9,6 +9,7 @@
   lazarus,
   libx11,
   libsForQt5,
+  lua,
   writableTmpDirAsHomeHook,
 }:
 
@@ -61,6 +62,13 @@ stdenv.mkDerivation (finalAttrs: {
 
     install/linux/install.sh -I $out
 
+    cd $out/lib64/doublecmd
+
+    ln -vs ${lib.getLib lua}/lib/liblua.so.${lua.version}
+
+    ln -vs ./liblua.so.${lua.version} ./liblua.so
+    ln -vs ./liblua.so.${lua.version} ./liblua.so.${lib.versions.majorMinor lua.version}
+
     runHook postInstall
   '';
 

From 9d13d00cecac5aaf09a1922d64c78d51f2db090b Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 13:33:07 -0300
Subject: [PATCH 21/91] analog: fix homepage

---
 pkgs/by-name/an/analog/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/an/analog/package.nix b/pkgs/by-name/an/analog/package.nix
index 38da846cc176..1fe5fc0d2662 100644
--- a/pkgs/by-name/an/analog/package.nix
+++ b/pkgs/by-name/an/analog/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    homepage = "https://www.c-amie.co.uk/software/analog/";
+    homepage = "https://github.com/c-amie/analog-ce";
     license = lib.licenses.gpl2Only;
     description = "Powerful tool to generate web server statistics";
     platforms = lib.platforms.all;

From 7e1f7e6130c6ef5f183ca8f17b4b0ae16623f56a Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 13:32:42 -0300
Subject: [PATCH 22/91] adminirevo: fix homepage

---
 pkgs/by-name/ad/adminerevo/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ad/adminerevo/package.nix b/pkgs/by-name/ad/adminerevo/package.nix
index ea8d1a939637..5c7e99c4fa21 100644
--- a/pkgs/by-name/ad/adminerevo/package.nix
+++ b/pkgs/by-name/ad/adminerevo/package.nix
@@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Database management in a single PHP file";
-    homepage = "https://docs.adminerevo.org";
+    homepage = "https://github.com/adminerevo/adminerevo";
     license = with lib.licenses; [
       asl20
       gpl2Only

From 10cdd1f7fcc7f4cd4df62835d97bb9effb9084f3 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 13:29:47 -0300
Subject: [PATCH 23/91] argus-clients: fix homepage

---
 pkgs/by-name/ar/argus-clients/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ar/argus-clients/package.nix b/pkgs/by-name/ar/argus-clients/package.nix
index 85bdb5c20d43..e7f6c5dea193 100644
--- a/pkgs/by-name/ar/argus-clients/package.nix
+++ b/pkgs/by-name/ar/argus-clients/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
       know what is going on in your network, right now or historically,
       you will find Argus a useful tool.
     '';
-    homepage = "http://qosient.com/argus";
+    homepage = "https://openargus.org";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
   };

From 0dc19430932ca5230c25253965dc0d4ef856613b Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 13:29:33 -0300
Subject: [PATCH 24/91] argus: fix homepage

---
 pkgs/by-name/ar/argus/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ar/argus/package.nix b/pkgs/by-name/ar/argus/package.nix
index 9a008f0cc9a3..67bebb95a1ac 100644
--- a/pkgs/by-name/ar/argus/package.nix
+++ b/pkgs/by-name/ar/argus/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
       know what is going on in your network, right now or historically,
       you will find Argus a useful tool.
     '';
-    homepage = "http://qosient.com/argus";
+    homepage = "https://openargus.org";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
   };

From 9fbfc8e6180a01288a4557447f9d659c8cd9549e Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 13:00:23 -0300
Subject: [PATCH 25/91] audiality2: fix homepage

---
 pkgs/by-name/au/audiality2/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/au/audiality2/package.nix b/pkgs/by-name/au/audiality2/package.nix
index dd640126a078..a2b1f8586518 100644
--- a/pkgs/by-name/au/audiality2/package.nix
+++ b/pkgs/by-name/au/audiality2/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Realtime scripted modular audio engine for video games and musical applications";
     mainProgram = "a2play";
-    homepage = "http://audiality.org";
+    homepage = "https://olofson.github.io/audiality2/";
     license = lib.licenses.zlib;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ fgaz ];

From 31ca8427464db5db553134142224958ea13396c9 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:59:33 -0300
Subject: [PATCH 26/91] bossa: fix homepage

---
 pkgs/by-name/bo/bossa/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/bossa/package.nix b/pkgs/by-name/bo/bossa/package.nix
index 72b7f2a9a18b..edec7fea75ef 100644
--- a/pkgs/by-name/bo/bossa/package.nix
+++ b/pkgs/by-name/bo/bossa/package.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
       Atmel's SAM-BA software. BOSSA is an acronym for Basic Open
       Source SAM-BA Application to reflect that goal.
     '';
-    homepage = "http://www.shumatech.com/web/products/bossa";
+    homepage = "https://github.com/shumatech/BOSSA";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
   };

From 08ee34cfc53040cf42f11f29fd41a4a1f87beb92 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:58:40 -0300
Subject: [PATCH 27/91] brutalmaze: fix homepage

---
 pkgs/by-name/br/brutalmaze/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/br/brutalmaze/package.nix b/pkgs/by-name/br/brutalmaze/package.nix
index f4118c4dd8cb..bd83f5ce34be 100644
--- a/pkgs/by-name/br/brutalmaze/package.nix
+++ b/pkgs/by-name/br/brutalmaze/package.nix
@@ -36,7 +36,7 @@ python312Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Minimalist thrilling shoot 'em up game";
     mainProgram = "brutalmaze";
-    homepage = "https://brutalmaze.rtfd.io";
+    homepage = "https://brutalmaze.readthedocs.io";
     license = lib.licenses.agpl3Plus;
     maintainers = [ lib.maintainers.McSinyx ];
   };

From 5f2cf844f55e83c3d68ee362705f0f34bb5a224c Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:58:02 -0300
Subject: [PATCH 28/91] cabin: fix homepage

---
 pkgs/by-name/ca/cabin/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cabin/package.nix b/pkgs/by-name/ca/cabin/package.nix
index 53869193e01a..fa1c758ea3d3 100644
--- a/pkgs/by-name/ca/cabin/package.nix
+++ b/pkgs/by-name/ca/cabin/package.nix
@@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation rec {
       adjusted. The curved stem endings have a 10 degree angle. E and F have
       shorter center arms. M is splashed.
     '';
-    homepage = "http://www.impallari.com/cabin";
+    homepage = "https://github.com/impallari/Cabin";
     license = lib.licenses.ofl;
     maintainers = [ ];
     platforms = lib.platforms.all;

From 6de8488188cb1371fd96fc9a5ffce0f444e8a8e4 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:49:48 -0300
Subject: [PATCH 29/91] cubicsdr: fix homepage

---
 pkgs/by-name/cu/cubicsdr/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/cu/cubicsdr/package.nix b/pkgs/by-name/cu/cubicsdr/package.nix
index f7a4e54aab96..76bb89e13aab 100644
--- a/pkgs/by-name/cu/cubicsdr/package.nix
+++ b/pkgs/by-name/cu/cubicsdr/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    homepage = "https://cubicsdr.com";
+    homepage = "https://github.com/cjcliffe/CubicSDR";
     description = "Software Defined Radio application";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ lasandell ];

From 76f0259ba9296cd9a949c8cfd6a11eb3f8f1d109 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:46:02 -0300
Subject: [PATCH 30/91] dosis: fix homepage

---
 pkgs/by-name/do/dosis/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/do/dosis/package.nix b/pkgs/by-name/do/dosis/package.nix
index da8a0e4a2076..2a0635a3e939 100644
--- a/pkgs/by-name/do/dosis/package.nix
+++ b/pkgs/by-name/do/dosis/package.nix
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec {
       It comes in 7 incremental weights: ExtraLight, Light, Book, Medium,
       Semibold, Bold & ExtraBold
     '';
-    homepage = "http://www.impallari.com/dosis";
+    homepage = "https://github.com/impallari/Dosis";
     license = lib.licenses.ofl;
     maintainers = [ ];
     platforms = lib.platforms.all;

From f2ee23a017b601a8f806fa91f10d98e82578b7ab Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:41:01 -0300
Subject: [PATCH 31/91] klog: fix homepage

---
 pkgs/by-name/kl/klog/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/kl/klog/package.nix b/pkgs/by-name/kl/klog/package.nix
index f6d13a2b05ad..005b40793cd7 100644
--- a/pkgs/by-name/kl/klog/package.nix
+++ b/pkgs/by-name/kl/klog/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
       KLog provides QSO management, useful QSL management DX-Cluster client, DXCC management,
       ClubLog integration, WSJT-X, DX-Marathon support and much more.
     '';
-    homepage = "https://www.klog.xyz/";
+    homepage = "https://github.com/ea4k/klog";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ pulsation ];

From 525cc50c781b8d2045f88d90e066317fdbda178e Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:38:56 -0300
Subject: [PATCH 32/91] libre-caslon: fix homepages

---
 pkgs/by-name/li/libre-caslon/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libre-caslon/package.nix b/pkgs/by-name/li/libre-caslon/package.nix
index 18ad5a292589..fe147d234c0b 100644
--- a/pkgs/by-name/li/libre-caslon/package.nix
+++ b/pkgs/by-name/li/libre-caslon/package.nix
@@ -42,7 +42,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Caslon fonts based on hand-lettered American Caslons of 1960s";
-    homepage = "http://www.impallari.com/librecaslon";
+    homepage = [
+      "https://github.com/impallari/Libre-Caslon-Text"
+      "https://github.com/impallari/Libre-Caslon-Display/"
+    ];
     license = lib.licenses.ofl;
     maintainers = [ ];
     platforms = lib.platforms.all;

From d35c1243689074eb6a0ad085dd023ede436feac1 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:37:58 -0300
Subject: [PATCH 33/91] libre-baskerville: fix homepage

---
 pkgs/by-name/li/libre-baskerville/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libre-baskerville/package.nix b/pkgs/by-name/li/libre-baskerville/package.nix
index bc7cedf6ed14..d00a88a28cf8 100644
--- a/pkgs/by-name/li/libre-baskerville/package.nix
+++ b/pkgs/by-name/li/libre-baskerville/package.nix
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       counters and less contrast that allow it to work on small sizes in any
       screen.
     '';
-    homepage = "http://www.impallari.com/projects/overview/libre-baskerville";
+    homepage = "https://github.com/impallari/Libre-Baskerville";
     license = lib.licenses.ofl;
     maintainers = with lib.maintainers; [ pancaek ];
     platforms = lib.platforms.all;

From 26a4e338bdce972680c460b032a4cb0a8fc88982 Mon Sep 17 00:00:00 2001
From: Jan Solanti <jhs@psonet.com>
Date: Sat, 26 Sep 2026 03:16:45 +0300
Subject: [PATCH 34/91] wpa_supplicant: re-add erroneously dropped patch

Rebased version of the patch taken from https://gitlab.archlinux.org/archlinux/packaging/packages/wpa_supplicant/-/blob/main/0008-Revert-Mark-authorization-completed-on-driver-indica.patch
---
 pkgs/by-name/wp/wpa_supplicant/package.nix    |  1 +
 ...revert-change-breaking-auth-broadcom.patch | 47 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/by-name/wp/wpa_supplicant/revert-change-breaking-auth-broadcom.patch

diff --git a/pkgs/by-name/wp/wpa_supplicant/package.nix b/pkgs/by-name/wp/wpa_supplicant/package.nix
index 26a57bb38bbc..49f144995205 100644
--- a/pkgs/by-name/wp/wpa_supplicant/package.nix
+++ b/pkgs/by-name/wp/wpa_supplicant/package.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./multiple-configs.patch
+    ./revert-change-breaking-auth-broadcom.patch
   ]
   ++ lib.optional unprivileged ./unprivileged-daemon.patch;
 
diff --git a/pkgs/by-name/wp/wpa_supplicant/revert-change-breaking-auth-broadcom.patch b/pkgs/by-name/wp/wpa_supplicant/revert-change-breaking-auth-broadcom.patch
new file mode 100644
index 000000000000..587716df234e
--- /dev/null
+++ b/pkgs/by-name/wp/wpa_supplicant/revert-change-breaking-auth-broadcom.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Janne Grunau <janne-fdr@jannau.net>
+Date: Sun, 4 Aug 2024 13:24:42 +0200
+Subject: [PATCH] Revert "Mark authorization completed on driver indication
+ during 4-way HS offload"
+
+This reverts commit 41638606054a09867fe3f9a2b5523aa4678cbfa5.
+---
+ wpa_supplicant/events.c | 25 ++++++++-----------------
+ 1 file changed, 8 insertions(+), 17 deletions(-)
+
+diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
+index 4f85da193608..919a0732b813 100644
+--- a/wpa_supplicant/events.c
++++ b/wpa_supplicant/events.c
+@@ -4925,23 +4925,14 @@ static int wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
+ 		    wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) ||
+ 		   ((wpa_s->drv_flags2 & WPA_DRIVER_FLAGS2_OWE_OFFLOAD_STA) &&
+ 		    wpa_s->key_mgmt == WPA_KEY_MGMT_OWE)) {
+-		if (already_authorized) {
+-			/*
+-			 * We are done; the driver will take care of RSN 4-way
+-			 * handshake.
+-			 */
+-			wpa_supplicant_cancel_auth_timeout(wpa_s);
+-			wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
+-			eapol_sm_notify_portValid(wpa_s->eapol, true);
+-			eapol_sm_notify_eap_success(wpa_s->eapol, true);
+-		} else {
+-			/* Update port, WPA_COMPLETED state from the
+-			 * EVENT_PORT_AUTHORIZED handler when the driver is done
+-			 * with the 4-way handshake.
+-			 */
+-			wpa_msg(wpa_s, MSG_DEBUG,
+-				"ASSOC INFO: wait for driver port authorized indication");
+-		}
++		/*
++		 * We are done; the driver will take care of RSN 4-way
++		 * handshake.
++		 */
++		wpa_supplicant_cancel_auth_timeout(wpa_s);
++		wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
++		eapol_sm_notify_portValid(wpa_s->eapol, true);
++		eapol_sm_notify_eap_success(wpa_s->eapol, true);
+ 	} else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X) &&
+ 		   wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt)) {
+ 		/*

From f43d6963bb3c0e0dca23f6c7604cc01fa3db53a5 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:32:37 -0300
Subject: [PATCH 35/91] mps: fix homepage

---
 pkgs/by-name/mp/mps/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mp/mps/package.nix b/pkgs/by-name/mp/mps/package.nix
index 2d3f6a522ab5..2b6ac2e2ab4d 100644
--- a/pkgs/by-name/mp/mps/package.nix
+++ b/pkgs/by-name/mp/mps/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Flexible memory management and garbage collection library";
-    homepage = "https://www.ravenbrook.com/project/mps";
+    homepage = "https://github.com/Ravenbrook/mps";
     license = lib.licenses.sleepycat;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = [ lib.maintainers.thoughtpolice ];

From b8442e5a70d22840f2a0cf89307e9a4b2715d609 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:32:10 -0300
Subject: [PATCH 36/91] mrsh: fix homepage

---
 pkgs/by-name/mr/mrsh/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mr/mrsh/package.nix b/pkgs/by-name/mr/mrsh/package.nix
index a9a8a1ef3221..f5bc8518f5c8 100644
--- a/pkgs/by-name/mr/mrsh/package.nix
+++ b/pkgs/by-name/mr/mrsh/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Minimal POSIX shell";
     mainProgram = "mrsh";
-    homepage = "https://mrsh.sh";
+    homepage = "https://github.com/emersion/mrsh";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
     platforms = lib.platforms.unix;

From 175461cb6c1d2e3bff3b29f11536940538ea4e8a Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:28:04 -0300
Subject: [PATCH 37/91] ne: fix homepage

---
 pkgs/by-name/ne/ne/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ne/ne/package.nix b/pkgs/by-name/ne/ne/package.nix
index fe98c81a2018..1e66a2085226 100644
--- a/pkgs/by-name/ne/ne/package.nix
+++ b/pkgs/by-name/ne/ne/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Nice editor";
-    homepage = "https://ne.di.unimi.it/";
+    homepage = "https://github.com/vigna/ne";
     changelog = "https://github.com/vigna/ne/releases/tag/${finalAttrs.version}";
     downloadPage = "https://github.com/vigna/ne";
     longDescription = ''

From 946c51de527982491981e257d4dd666b33fb4406 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:25:32 -0300
Subject: [PATCH 38/91] meli: fix homepage

---
 pkgs/by-name/me/meli/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix
index f4332eba458c..633ffb9d93fb 100644
--- a/pkgs/by-name/me/meli/package.nix
+++ b/pkgs/by-name/me/meli/package.nix
@@ -81,7 +81,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Terminal e-mail client and e-mail client library";
     mainProgram = "meli";
-    homepage = "https://meli.delivery";
+    homepage = "https://meli-email.org/";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [
       _0x4A6F

From bc78ca7beb8ebadc944376733aa4c60a3b38fb3c Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:24:58 -0300
Subject: [PATCH 39/91] lxsession: fix homepage

---
 pkgs/by-name/lx/lxsession/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/lx/lxsession/package.nix b/pkgs/by-name/lx/lxsession/package.nix
index d23101981afe..d82ea1c50f8c 100644
--- a/pkgs/by-name/lx/lxsession/package.nix
+++ b/pkgs/by-name/lx/lxsession/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [ ./repect-xml-catalog-file-var.patch ];
 
   meta = {
-    homepage = "https://wiki.lxde.org/en/LXSession";
+    homepage = "https://github.com/lxde/lxsession";
     description = "Classic LXDE session manager";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;

From 4dfb0333450e654208081e577e4ecaa7f5121fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 13 Dec 2024 14:48:09 +0100
Subject: [PATCH 40/91] nixos/nix: move nix.nixPath into nix.settings.nix-path

This removes some confusion when setting nix.settings.nix-path to a custom value,
disabling channels and ending up with an empty NIX_PATH.
This is important since nix 2.24 fixed NIX_PATH not overwriting the
nix-path setting.
---
 nixos/modules/config/nix-channel.nix        |  9 ++++++---
 nixos/modules/misc/nixpkgs-flake.nix        |  2 +-
 nixos/tests/nix-required-mounts/default.nix | 10 ++++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix
index 4d6e19975508..583052aebdb7 100644
--- a/nixos/modules/config/nix-channel.nix
+++ b/nixos/modules/config/nix-channel.nix
@@ -42,7 +42,7 @@ in
         };
       };
 
-      nixPath = mkOption {
+      settings.nix-path = mkOption {
         type = types.listOf types.str;
         default =
           if cfg.channel.enable then
@@ -80,8 +80,11 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  imports = [
+    (lib.mkRenamedOptionModule [ "nix" "nixPath" ] [ "nix" "settings" "nix-path" ])
+  ];
 
+  config = mkIf cfg.enable {
     environment.extraInit = mkIf cfg.channel.enable ''
       if [ -e "$HOME/.nix-defexpr/channels" ]; then
         export NIX_PATH="$HOME/.nix-defexpr/channels''${NIX_PATH:+:$NIX_PATH}"
@@ -95,7 +98,7 @@ in
     # NIX_PATH has a non-empty default according to Nix docs, so we don't unset
     # it when empty.
     environment.sessionVariables = {
-      NIX_PATH = cfg.nixPath;
+      NIX_PATH = cfg.settings.nix-path;
     };
 
     systemd.tmpfiles.rules = lib.mkIf cfg.channel.enable [
diff --git a/nixos/modules/misc/nixpkgs-flake.nix b/nixos/modules/misc/nixpkgs-flake.nix
index 10549999fd7b..d192c3e1735d 100644
--- a/nixos/modules/misc/nixpkgs-flake.nix
+++ b/nixos/modules/misc/nixpkgs-flake.nix
@@ -102,7 +102,7 @@ in
         # because we would need some kind of evil shim taking the *calling* flake's self path,
         # perhaps, to ever make that work (in order to know where the Nix expr for the system came
         # from and how to call it).
-        nix.nixPath = lib.mkDefault (
+        nix.settings.nix-path = lib.mkDefault (
           [ "nixpkgs=flake:nixpkgs" ]
           ++ lib.optional config.nix.channel.enable "/nix/var/nix/profiles/per-user/root/channels"
         );
diff --git a/nixos/tests/nix-required-mounts/default.nix b/nixos/tests/nix-required-mounts/default.nix
index 267d077583b3..18f04a5f7d28 100644
--- a/nixos/tests/nix-required-mounts/default.nix
+++ b/nixos/tests/nix-required-mounts/default.nix
@@ -12,10 +12,12 @@ in
     {
       virtualisation.writableStore = true;
       system.extraDependencies = [ (pkgs.runCommand "deps" { } "mkdir $out").inputDerivation ];
-      nix.nixPath = [ "nixpkgs=${../../..}" ];
-      nix.settings.substituters = lib.mkForce [ ];
-      nix.settings.system-features = [ "supported-feature" ];
-      nix.settings.experimental-features = [ "nix-command" ];
+      nix.settings = {
+        experimental-features = [ "nix-command" ];
+        nix-path = [ "nixpkgs=${../../..}" ];
+        substituters = lib.mkForce [ ];
+        system-features = [ "supported-feature" ];
+      };
       nix.enable = true; # disabled by default. See all-tests.nix / tag(no-nix-by-default)
       programs.nix-required-mounts.enable = true;
       programs.nix-required-mounts.allowedPatterns.supported-feature = {

From 3b98ca6860738608cb1f6c26eb8387c382916b5d Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:23:49 -0300
Subject: [PATCH 41/91] luaPackages.ljsyscall: fix homepage

---
 pkgs/development/lua-modules/overrides.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index f4860b62760d..103a83d4f767 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -348,6 +348,7 @@ in
     '';
     meta = (old.meta or { }) // {
       broken = luaOlder "5.1" || luaAtLeast "5.3";
+      homepage = "https://github.com/justincormack/ljsyscall";
     };
 
     propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional (!isLuaJIT) final.luaffi;

From b842c76aa6b60f984f1bf95a436239c1ca5a917b Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:23:08 -0300
Subject: [PATCH 42/91] loxodo: fix homepage

---
 pkgs/by-name/lo/loxodo/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/lo/loxodo/package.nix b/pkgs/by-name/lo/loxodo/package.nix
index 3bfa9295b56b..6665e2bba1d7 100644
--- a/pkgs/by-name/lo/loxodo/package.nix
+++ b/pkgs/by-name/lo/loxodo/package.nix
@@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication {
   meta = {
     description = "Password Safe V3 compatible password vault";
     mainProgram = "loxodo";
-    homepage = "https://www.christoph-sommer.de/loxodo/";
+    homepage = "https://github.com/sommer/loxodo";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     maintainers = [ ];

From 8a4709eb1fce14638cfc63ad6e9805fcb1ffeca3 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:21:38 -0300
Subject: [PATCH 43/91] luaPackages.cosmo: fix homepage

---
 pkgs/development/lua-modules/overrides.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 103a83d4f767..24ab774853d4 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -98,6 +98,12 @@ in
 
   cjson = prev.lua-cjson;
 
+  cosmo = prev.cosmo.overrideAttrs (old: {
+    meta = (old.meta or { }) // {
+      homepage = "https://github.com/mascarenhas/cosmo";
+    };
+  });
+
   cqueues = prev.cqueues.overrideAttrs (old: {
     # Parse out a version number without the Lua version inserted
     version =

From 9f66be416a96af0a9ebb77ec42fc07d377189565 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:20:36 -0300
Subject: [PATCH 44/91] lklug-sinhala: fix homepage

---
 pkgs/by-name/lk/lklug-sinhala/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/lk/lklug-sinhala/package.nix b/pkgs/by-name/lk/lklug-sinhala/package.nix
index e290d0dca176..ee9e2cf9981a 100644
--- a/pkgs/by-name/lk/lklug-sinhala/package.nix
+++ b/pkgs/by-name/lk/lklug-sinhala/package.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Unicode Sinhala font by Lanka Linux User Group";
-    homepage = "http://www.lug.lk/fonts/lklug";
+    homepage = "https://sinhala.sourceforge.net/";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ serge ];
     platforms = lib.platforms.all;

From 849a1ca67b914efbfbae44217876c01712adf9bd Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:19:03 -0300
Subject: [PATCH 45/91] libsieve: fix homepage

---
 pkgs/by-name/li/libsieve/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libsieve/package.nix b/pkgs/by-name/li/libsieve/package.nix
index 5b21c3cba574..20f49ed919c8 100644
--- a/pkgs/by-name/li/libsieve/package.nix
+++ b/pkgs/by-name/li/libsieve/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Interpreter for RFC 3028 Sieve and various extensions";
-    homepage = "http://sodabrew.com/libsieve/";
+    homepage = "https://github.com/sodabrew/libsieve";
     license = lib.licenses.lgpl21;
     platforms = lib.platforms.unix;
   };

From 0ad1a1ff0d3f7ed3a6485ab5895e80505a6f2d66 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:17:14 -0300
Subject: [PATCH 46/91] liblogging: fix homepage

---
 pkgs/by-name/li/liblogging/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/liblogging/package.nix b/pkgs/by-name/li/liblogging/package.nix
index 7eaf16f30db3..fe43ffa83637 100644
--- a/pkgs/by-name/li/liblogging/package.nix
+++ b/pkgs/by-name/li/liblogging/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int -Wno-error=implicit-function-declaration";
 
   meta = {
-    homepage = "http://www.liblogging.org/";
+    homepage = "https://github.com/rsyslog/liblogging";
     description = "Lightweight signal-safe logging library";
     mainProgram = "stdlogctl";
     license = lib.licenses.bsd2;

From afd8e49614c6227336fa02cd9afd4813d11be6d0 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:16:33 -0300
Subject: [PATCH 47/91] pcmanfm: fix homepage

---
 pkgs/by-name/pc/pcmanfm/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/pc/pcmanfm/package.nix b/pkgs/by-name/pc/pcmanfm/package.nix
index 57f59547b037..4da19f012ac2 100644
--- a/pkgs/by-name/pc/pcmanfm/package.nix
+++ b/pkgs/by-name/pc/pcmanfm/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    homepage = "https://blog.lxde.org/category/pcmanfm/";
+    homepage = "https://github.com/lxde/pcmanfm";
     license = lib.licenses.gpl2Plus;
     description = "File manager with GTK interface";
     maintainers = [ ];

From 525c5ec9e85f0382e79b4820abf016b8490947d9 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:16:01 -0300
Subject: [PATCH 48/91] libfm: fix homepage

---
 pkgs/by-name/li/libfm/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libfm/package.nix b/pkgs/by-name/li/libfm/package.nix
index 6f4a69dcdc92..69d652684143 100644
--- a/pkgs/by-name/li/libfm/package.nix
+++ b/pkgs/by-name/li/libfm/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     broken = stdenv.hostPlatform.isDarwin;
-    homepage = "https://blog.lxde.org/category/pcmanfm/";
+    homepage = "https://github.com/lxde/libfm";
     license = lib.licenses.lgpl21Plus;
     description = "Glib-based library for file management";
     maintainers = [ ];

From 8b9bfa6ddbd314f5776dadd9f299791ce6729ccf Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:15:16 -0300
Subject: [PATCH 49/91] libcint: fix homepage

---
 pkgs/by-name/li/libcint/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libcint/package.nix b/pkgs/by-name/li/libcint/package.nix
index 6eb43b814c2f..1875bba32488 100644
--- a/pkgs/by-name/li/libcint/package.nix
+++ b/pkgs/by-name/li/libcint/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
       It provides C/Fortran API to evaluate one-electron / two-electron
       integrals for Cartesian / real-spheric / spinor Gaussian type functions.
     '';
-    homepage = "http://wiki.sunqm.net/libcint";
+    homepage = "https://github.com/sunqm/libcint";
     downloadPage = "https://github.com/sunqm/libcint";
     changelog = "https://github.com/sunqm/libcint/blob/master/ChangeLog";
     license = lib.licenses.bsd2;

From f97f8bc46fa97cc678153f96092e5311f19bcb57 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:10:52 -0300
Subject: [PATCH 50/91] ldmud: fix homepage

---
 pkgs/by-name/ld/ldmud/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ld/ldmud/package.nix b/pkgs/by-name/ld/ldmud/package.nix
index 554efc4eb9ee..30d6053f4ace 100644
--- a/pkgs/by-name/ld/ldmud/package.nix
+++ b/pkgs/by-name/ld/ldmud/package.nix
@@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Gamedriver for LPMuds including a LPC compiler, interpreter and runtime";
-    homepage = "https://ldmud.eu";
+    homepage = "https://github.com/ldmud/ldmud";
     changelog = "https://github.com/ldmud/ldmud/blob/${finalAttrs.version}/HISTORY";
     longDescription = ''
       LDMud started as a project to clean up and modernize Amylaar's LPMud

From 525c847f7f66d55e3c1fd231cd7a74f6bff1b086 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:10:22 -0300
Subject: [PATCH 51/91] lcab: fix homepage

---
 pkgs/by-name/lc/lcab/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/lc/lcab/package.nix b/pkgs/by-name/lc/lcab/package.nix
index ac481c70019c..461ebe4de3bc 100644
--- a/pkgs/by-name/lc/lcab/package.nix
+++ b/pkgs/by-name/lc/lcab/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Create cabinet (.cab) archives";
-    homepage = "http://ohnopub.net/~ohnobinki/lcab";
+    homepage = "https://salsa.debian.org/debian/lcab";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ emilytrau ];
     platforms = lib.platforms.unix;

From c34d7f8b6f57fb8fb02b5f1b46acdfdf07657444 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:09:47 -0300
Subject: [PATCH 52/91] xpra: fix homepage and remove downloadPage

---
 pkgs/by-name/xp/xpra/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix
index e767c33397dc..0abf548e580a 100644
--- a/pkgs/by-name/xp/xpra/package.nix
+++ b/pkgs/by-name/xp/xpra/package.nix
@@ -294,8 +294,7 @@ effectiveBuildPythonApplication rec {
   };
 
   meta = {
-    homepage = "https://xpra.org/";
-    downloadPage = "https://xpra.org/src/";
+    homepage = "https://github.com/Xpra-org/xpra";
     description = "Persistent remote applications for X";
     changelog = "https://github.com/Xpra-org/xpra/releases/tag/v${version}";
     platforms = lib.platforms.linux;

From 0ae3ef4d82c78fc087b71ef44bffa3fb7e5820fb Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:07:09 -0300
Subject: [PATCH 53/91] ladspaPlugins: fix homepage

---
 pkgs/by-name/la/ladspaPlugins/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/la/ladspaPlugins/package.nix b/pkgs/by-name/la/ladspaPlugins/package.nix
index 4f61faacdab6..4a0ad4efabde 100644
--- a/pkgs/by-name/la/ladspaPlugins/package.nix
+++ b/pkgs/by-name/la/ladspaPlugins/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    homepage = "http://plugin.org.uk/";
+    homepage = "https://github.com/swh/ladspa";
     description = "LADSPA format audio plugins";
     license = lib.licenses.gpl2Only;
     maintainers = [ lib.maintainers.magnetophon ];

From e8eed3a47fd1f7046404325219c33754c0cc90bd Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:04:41 -0300
Subject: [PATCH 54/91] kuzu: fix homepage

---
 pkgs/by-name/ku/kuzu/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ku/kuzu/package.nix b/pkgs/by-name/ku/kuzu/package.nix
index e63600462c99..151fe3dedee6 100644
--- a/pkgs/by-name/ku/kuzu/package.nix
+++ b/pkgs/by-name/ku/kuzu/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     changelog = "https://github.com/kuzudb/kuzu/releases/tag/v${finalAttrs.version}";
     description = "Embeddable property graph database management system";
-    homepage = "https://kuzudb.com/";
+    homepage = "https://github.com/kuzudb/kuzu";
     license = lib.licenses.mit;
     mainProgram = "kuzu";
     maintainers = with lib.maintainers; [ sdht0 ];

From 9bc04e053c8d85cb1a5c127d163f24f2fc483921 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:02:50 -0300
Subject: [PATCH 55/91] kiln: fix homepage

---
 pkgs/by-name/ki/kiln/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ki/kiln/package.nix b/pkgs/by-name/ki/kiln/package.nix
index 2a0550b87de7..3b004a9695d0 100644
--- a/pkgs/by-name/ki/kiln/package.nix
+++ b/pkgs/by-name/ki/kiln/package.nix
@@ -31,7 +31,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Simple static site generator for Gemini";
-    homepage = "https://kiln.adnano.co/";
+    homepage = "https://git.sr.ht/~adnano/kiln";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sikmir ];
     mainProgram = "kiln";

From ab9a3d08a70999c51bd3538f545c6aa82d4a31af Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 15:01:49 -0300
Subject: [PATCH 56/91] keycard-cli: fix homepage

---
 pkgs/by-name/ke/keycard-cli/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ke/keycard-cli/package.nix b/pkgs/by-name/ke/keycard-cli/package.nix
index d33861d1b020..e65728def411 100644
--- a/pkgs/by-name/ke/keycard-cli/package.nix
+++ b/pkgs/by-name/ke/keycard-cli/package.nix
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Command line tool and shell to manage keycards";
     mainProgram = "keycard-cli";
-    homepage = "https://keycard.status.im";
+    homepage = "https://keycard.tech/";
     license = lib.licenses.mpl20;
     maintainers = [ lib.maintainers.zimbatm ];
     broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/keycard-cli.x86_64-darwin

From 5008f843ed6531441a89bb8d179ad877abee0b14 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:37:07 -0300
Subject: [PATCH 57/91] luaPackages.vicious: fix homepage

---
 pkgs/development/lua-modules/overrides.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index f4860b62760d..6fe634fe9d9c 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -1310,6 +1310,7 @@ in
 
   vicious = prev.vicious.overrideAttrs (old: {
     meta = (old.meta or { }) // {
+      homepage = "https://vicious.readthedocs.io/";
       changelog = "https://github.com/vicious-widgets/vicious/blob/v${old.version}/CHANGELOG.rst";
       maintainers = with lib.maintainers; [
         makefu

From 018142060d130b19476ded1503ea38c60a295255 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:36:38 -0300
Subject: [PATCH 58/91] mozillavpn: fix homepage

---
 pkgs/by-name/mo/mozillavpn/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix
index 365d85d8fff1..182ddaeabe56 100644
--- a/pkgs/by-name/mo/mozillavpn/package.nix
+++ b/pkgs/by-name/mo/mozillavpn/package.nix
@@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Client for the Mozilla VPN service";
     mainProgram = "mozillavpn";
-    homepage = "https://vpn.mozilla.org/";
+    homepage = "https://www.mozilla.org/en-US/products/vpn/";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ andersk ];
     platforms = lib.platforms.linux;

From 406d53422e66e66d21f0ca203342fce24e32a439 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:34:32 -0300
Subject: [PATCH 59/91] proj-datumgrid: fix homepage

---
 pkgs/by-name/pr/proj-datumgrid/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/pr/proj-datumgrid/package.nix b/pkgs/by-name/pr/proj-datumgrid/package.nix
index 5e7cb6e3ce35..aa8a8dd48ea1 100644
--- a/pkgs/by-name/pr/proj-datumgrid/package.nix
+++ b/pkgs/by-name/pr/proj-datumgrid/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Repository for proj datum grids";
-    homepage = "https://proj4.org";
+    homepage = "https://proj.org";
     license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "nad2bin";

From 93274b9ddb10bda2185c926c186a13c7967750a0 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:34:10 -0300
Subject: [PATCH 60/91] proxytunnel: fix homepage

---
 pkgs/by-name/pr/proxytunnel/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/pr/proxytunnel/package.nix b/pkgs/by-name/pr/proxytunnel/package.nix
index 6a556f1ed14e..e392c8051ab9 100644
--- a/pkgs/by-name/pr/proxytunnel/package.nix
+++ b/pkgs/by-name/pr/proxytunnel/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     mainProgram = "proxytunnel";
-    homepage = "http://proxytunnel.sf.net/";
+    homepage = "https://proxytunnel.sourceforge.io";
     description = "Stealth tunneling through HTTP(S) proxies";
     platforms = lib.platforms.unix;
     license = lib.licenses.gpl2Only;

From 81f75338fcf149d01438fd6a401551f3aa1ac0db Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:29:06 -0300
Subject: [PATCH 61/91] sphinx-fortran: fix homepage

---
 pkgs/development/python-modules/sphinx-fortran/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/sphinx-fortran/default.nix b/pkgs/development/python-modules/sphinx-fortran/default.nix
index 76e1f9f24e06..4d835b25630d 100644
--- a/pkgs/development/python-modules/sphinx-fortran/default.nix
+++ b/pkgs/development/python-modules/sphinx-fortran/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage {
 
   meta = {
     description = "Fortran domain and autodoc extensions to Sphinx";
-    homepage = "http://sphinx-fortran.readthedocs.org/";
+    homepage = "http://sphinx-fortran.readthedocs.io/";
     license = lib.licenses.cecill21;
     maintainers = with lib.maintainers; [ loicreynier ];
   };

From c1939dc1c0df8df10520c294050021700ad08f91 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:28:23 -0300
Subject: [PATCH 62/91] tre: fix homepage

---
 pkgs/by-name/tr/tre/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/tr/tre/package.nix b/pkgs/by-name/tr/tre/package.nix
index 268f561fbaf5..7be8eda8a933 100644
--- a/pkgs/by-name/tr/tre/package.nix
+++ b/pkgs/by-name/tr/tre/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Lightweight and robust POSIX compliant regexp matching library";
-    homepage = "https://laurikari.net/tre/";
+    homepage = "https://github.com/laurikari/tre";
     changelog = "https://github.com/laurikari/tre/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd2;
     mainProgram = "agrep";

From de79fb1cd741d4bc8909413af64ca6cdeb0e75a3 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 20 Sep 2026 12:27:53 -0300
Subject: [PATCH 63/91] trimal: fix homepage

---
 pkgs/by-name/tr/trimal/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/tr/trimal/package.nix b/pkgs/by-name/tr/trimal/package.nix
index e66e3a25b2bb..481ac27d3006 100644
--- a/pkgs/by-name/tr/trimal/package.nix
+++ b/pkgs/by-name/tr/trimal/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Tool for the automated removal of spurious sequences or poorly aligned regions from a multiple sequence alignment";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    homepage = "http://trimal.cgenomics.org";
+    homepage = "https://trimal.readthedocs.io/en/latest/";
     maintainers = [ lib.maintainers.bzizou ];
   };
 })

From 6e7ba58dec8b79ff13786edd1430719928341495 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Sep 2026 23:46:37 +0000
Subject: [PATCH 64/91] shelter: 0-unstable-2026-09-06 -> 0-unstable-2026-09-16

---
 pkgs/by-name/sh/shelter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sh/shelter/package.nix b/pkgs/by-name/sh/shelter/package.nix
index 9133a9a0642e..7f2e41a12c89 100644
--- a/pkgs/by-name/sh/shelter/package.nix
+++ b/pkgs/by-name/sh/shelter/package.nix
@@ -10,12 +10,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "shelter";
-  version = "0-unstable-2026-09-06";
+  version = "0-unstable-2026-09-16";
   src = fetchFromGitHub {
     owner = "uwu";
     repo = "shelter";
-    rev = "ee10d4ecb2fd62fb86ebfdbd37a4e28df9e72f11";
-    hash = "sha256-Ew6RUhIS2gRuCNkbNCNtlmtYSGtjBR4h+UebuDVWhmk=";
+    rev = "0397ffe539fce088f8cab25cc086055d4a5feb71";
+    hash = "sha256-Qagye5ksJyvoOIpoozfWmHTO8Or2F7KWOyXQgbK2vVY=";
   };
 
   nativeBuildInputs = [

From af50d4dc1319445a81c4066e352b82a886257be5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Sep 2026 00:39:23 +0000
Subject: [PATCH 65/91] kubectl: 1.37.0 -> 1.37.1

---
 pkgs/by-name/ku/kubernetes/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ku/kubernetes/package.nix b/pkgs/by-name/ku/kubernetes/package.nix
index da7d2037e2ee..b1be6841796c 100644
--- a/pkgs/by-name/ku/kubernetes/package.nix
+++ b/pkgs/by-name/ku/kubernetes/package.nix
@@ -23,13 +23,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubernetes";
-  version = "1.37.0";
+  version = "1.37.1";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-irRDtPf+bk2uQ/QOcAXzYcrm/0pys/e4M5ITyL6omqs=";
+    hash = "sha256-9p7t8EN6Iv3Q2ClJgCgSUJP1Qdp7B47fOe0roP5jZbg=";
   };
 
   vendorHash = null;

From 0658011fdb08b363a18b3694aec927ced9c05523 Mon Sep 17 00:00:00 2001
From: Victor Fuentes <vlinkz@snowflakeos.org>
Date: Mon, 7 Sep 2026 12:24:56 -0700
Subject: [PATCH 66/91] gnome-shell: refresh icons after profile switches

GNOME checks for icon changes based on directory modification time.
Since Nix hardcodes modification time to 1, GNOME never detects when icons are changed,
leading to missing icons in the application menu on newly installed programs.

To fix we now also invalidate icon cache on device and inode changes.
---
 .../icon-theme-directory-identity.patch       | 44 +++++++++++++++++++
 pkgs/by-name/gn/gnome-shell/package.nix       |  3 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/gn/gnome-shell/icon-theme-directory-identity.patch

diff --git a/pkgs/by-name/gn/gnome-shell/icon-theme-directory-identity.patch b/pkgs/by-name/gn/gnome-shell/icon-theme-directory-identity.patch
new file mode 100644
index 000000000000..dd45044af18c
--- /dev/null
+++ b/pkgs/by-name/gn/gnome-shell/icon-theme-directory-identity.patch
@@ -0,0 +1,44 @@
+diff --git a/src/st/st-icon-theme.c b/src/st/st-icon-theme.c
+--- a/src/st/st-icon-theme.c
++++ b/src/st/st-icon-theme.c
+@@ -220,6 +220,8 @@ typedef struct
+ {
+   char *dir;
+   time_t mtime;
++  dev_t device;
++  ino_t inode;
+   StIconCache *cache;
+   gboolean exists;
+ } IconThemeDirMtime;
+@@ -792,6 +794,8 @@ insert_theme (StIconTheme *icon_theme,
+       dir_mtime->dir = path;
+       if (g_stat (path, &stat_buf) == 0 && S_ISDIR (stat_buf.st_mode)) {
+         dir_mtime->mtime = stat_buf.st_mtime;
++        dir_mtime->device = stat_buf.st_dev;
++        dir_mtime->inode = stat_buf.st_ino;
+         dir_mtime->exists = TRUE;
+       } else {
+         dir_mtime->mtime = 0;
+@@ -1029,6 +1033,8 @@ load_themes (StIconTheme *icon_theme)
+       if (g_stat (dir, &stat_buf) != 0 || !S_ISDIR (stat_buf.st_mode))
+         continue;
+       dir_mtime->mtime = stat_buf.st_mtime;
++      dir_mtime->device = stat_buf.st_dev;
++      dir_mtime->inode = stat_buf.st_ino;
+       dir_mtime->exists = TRUE;
+ 
+       dir_mtime->cache = st_icon_cache_new_for_path (dir);
+@@ -2120,10 +2126,12 @@ rescan_themes (StIconTheme *icon_theme)
+-      /* dir mtime didn't change */
++      /* dir identity and mtime didn't change. */
+       if (stat_res == 0 && dir_mtime->exists &&
+           S_ISDIR (stat_buf.st_mode) &&
++          dir_mtime->device == stat_buf.st_dev &&
++          dir_mtime->inode == stat_buf.st_ino &&
+           dir_mtime->mtime == stat_buf.st_mtime)
+         continue;
+       /* didn't exist before, and still doesn't */
+       if (!dir_mtime->exists &&
+           (stat_res != 0 || !S_ISDIR (stat_buf.st_mode)))
+         continue;
+ 
diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix
index d0b8d6bd6b67..5e43836fbfa1 100644
--- a/pkgs/by-name/gn/gnome-shell/package.nix
+++ b/pkgs/by-name/gn/gnome-shell/package.nix
@@ -100,6 +100,9 @@ stdenv.mkDerivation (finalAttrs: {
     # Make D-Bus services wrappable.
     ./wrap-services.patch
 
+    # Detect profile switches even when icon directory mtimes are unchanged.
+    ./icon-theme-directory-identity.patch
+
     # Fix greeter logo being too big.
     # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2591
     # Reverts https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1101

From 80711d2a3e35b234aae69cf659b4167ce563827f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Sep 2026 07:17:00 +0000
Subject: [PATCH 67/91] wavelog: 3.2.2 -> 3.2.3

---
 pkgs/by-name/wa/wavelog/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/wavelog/package.nix b/pkgs/by-name/wa/wavelog/package.nix
index 92fb72a95962..9e85ec111071 100644
--- a/pkgs/by-name/wa/wavelog/package.nix
+++ b/pkgs/by-name/wa/wavelog/package.nix
@@ -8,7 +8,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "wavelog";
-  version = "3.2.2";
+  version = "3.2.3";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "wavelog";
     repo = "wavelog";
     tag = finalAttrs.version;
-    hash = "sha256-jB096icPC4q24/yylkmwuOswMxqxJxsUUVCKb4Xq7dw=";
+    hash = "sha256-ccpUHvoXYBqLvWh6seq7d6uwrKBzIJlzPN055+CBRJY=";
   };
 
   installPhase = ''

From bbc7ddf06095efae3d9a18cdc10a6c4aafda7875 Mon Sep 17 00:00:00 2001
From: kaynetik <aleksandar@nesovic.dev>
Date: Sun, 27 Sep 2026 09:21:46 +0200
Subject: [PATCH 68/91] hunk: 0.21.1 -> 0.22.0

Upstream moved the app into `packages/hunk`. Build and install skills
from the new paths, and replace the `paths.ts` patch with a
`$out/skills` symlink that `hunk skill path` already resolves.

Signed-off-by: kaynetik <aleksandar@nesovic.dev>
---
 pkgs/by-name/hu/hunk/package.nix | 33 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/hu/hunk/package.nix b/pkgs/by-name/hu/hunk/package.nix
index 2562fa3b9cca..37b679ceed69 100644
--- a/pkgs/by-name/hu/hunk/package.nix
+++ b/pkgs/by-name/hu/hunk/package.nix
@@ -12,13 +12,13 @@
 
 let
   pname = "hunk";
-  version = "0.21.1";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "modem-dev";
     repo = "hunk";
     tag = "v${version}";
-    hash = "sha256-8faDOqDXSdp5j8WP07rTW0L44keCPpv9mWoXGKXgvpY=";
+    hash = "sha256-dc4/xLAyQe7mL/KMcpjsjgHzgf0tRomQAemVABwUWFY=";
   };
 
   node_modules = stdenv.mkDerivation {
@@ -58,7 +58,7 @@ let
 
     dontFixup = true;
 
-    outputHash = "sha256-r3LXoIx7fHWyTTs19N4CU9mIWYsQxP0QVpstlvAu3D0=";
+    outputHash = "sha256-hWfG2T3Tfa69nX50OFW5XNRQxMc5lideDEUPw6G26qA=";
     outputHashMode = "recursive";
   };
 in
@@ -75,16 +75,6 @@ stdenv.mkDerivation {
     writableTmpDirAsHomeHook
   ];
 
-  # Teach `hunk skill path` to find the FHS layout under share/skills/$pname
-  # (https://github.com/NixOS/nixpkgs/issues/547426) instead of $out/skills.
-  postPatch = ''
-    substituteInPlace src/core/run/paths.ts \
-      --replace-fail \
-        'join("node_modules", "hunkdiff", skillRelativePath),' \
-        'join("node_modules", "hunkdiff", skillRelativePath),
-    join("share", "skills", "hunk", name, "SKILL.md"),'
-  '';
-
   configurePhase = ''
     runHook preConfigure
 
@@ -98,13 +88,15 @@ stdenv.mkDerivation {
   buildPhase = ''
     runHook preBuild
 
+    # Entry points mirror upstream's scripts/build/build-bin.ts.
     mkdir -p .bun-tmp .bun-install
     BUN_TMPDIR=$PWD/.bun-tmp \
     BUN_INSTALL=$PWD/.bun-install \
       bun build --compile \
         --no-compile-autoload-bunfig \
         --no-compile-autoload-dotenv \
-        src/main.tsx \
+        packages/hunk/src/main.tsx \
+        packages/hunk/src/highlightWorkerEntry.ts \
         --outfile hunk
 
     runHook postBuild
@@ -115,8 +107,12 @@ stdenv.mkDerivation {
     runHook preInstall
 
     installBin hunk
-    installSkill skills/hunk-extensions hunk
-    installSkill skills/hunk-review hunk
+    for skill in packages/hunk/skills/*; do
+      installSkill "$skill"
+    done
+
+    # `hunk skill path` looks for skills/<name>/SKILL.md above the executable.
+    ln -s share/skills/${pname} $out/skills
 
     runHook postInstall
   '';
@@ -134,9 +130,8 @@ stdenv.mkDerivation {
   installCheckPhase = ''
     runHook preInstallCheck
 
-    $out/bin/hunk --version | grep -F ${version}
-    test -f "$($out/bin/hunk skill path)"
-    test -f "$($out/bin/hunk skill path hunk-extensions)"
+    cmp "$out/share/skills/${pname}/hunk-review/SKILL.md" "$($out/bin/hunk skill path)"
+    cmp "$out/share/skills/${pname}/hunk-extensions/SKILL.md" "$($out/bin/hunk skill path hunk-extensions)"
 
     runHook postInstallCheck
   '';

From 0213fb928229bf3dcd08de113e30b3a69a381d20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Sep 2026 08:04:47 +0000
Subject: [PATCH 69/91] defuddle: 0.19.3 -> 0.19.4

---
 pkgs/by-name/de/defuddle/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/de/defuddle/package.nix b/pkgs/by-name/de/defuddle/package.nix
index 451eb3a25391..9c73700cb56c 100644
--- a/pkgs/by-name/de/defuddle/package.nix
+++ b/pkgs/by-name/de/defuddle/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "defuddle";
-  version = "0.19.3";
+  version = "0.19.4";
 
   src = fetchFromGitHub {
     owner = "kepano";
     repo = "defuddle";
     tag = version;
-    hash = "sha256-fSJsNWShWjv1Riiq0DxkUnmUDlM2rQoqgdM9eD9aMts=";
+    hash = "sha256-H6/hZVe5nj6GNv00RMu1tKDRhCTvB7PX5gc70JWh9ik=";
   };
 
-  npmDepsHash = "sha256-BxGIVt2gkNQkWXQyLnPQQAtCNFJKlXmTctKVAxFzjfM=";
+  npmDepsHash = "sha256-B5uX7lIfII9nlCHn6d3zchsokpZFOuP1fuRRLJb7g1M=";
 
   passthru.updateScript = nix-update-script { };
 

From 2930dd461d84d10ad24cc22cff670080acfb55bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Sep 2026 08:08:38 +0000
Subject: [PATCH 70/91] yoda: 2.1.2 -> 2.1.4

---
 pkgs/by-name/yo/yoda/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yo/yoda/package.nix b/pkgs/by-name/yo/yoda/package.nix
index c341372ccd89..858a2b6c3241 100644
--- a/pkgs/by-name/yo/yoda/package.nix
+++ b/pkgs/by-name/yo/yoda/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "yoda";
-  version = "2.1.2";
+  version = "2.1.4";
 
   src = fetchFromGitLab {
     owner = "hepcedar";
     repo = "yoda";
     rev = "yoda-${finalAttrs.version}";
-    hash = "sha256-cgThoxqPX6dVyGNTLXatW3uQV+41o38fTfkvHXsDs9A=";
+    hash = "sha256-nj/hvwVqYRqRBiDs5dSXSX/HHEmIXPc8rl5MXXhWhyw=";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From 2e6c5ff68a6bcaf9e2aafc845a1195d947bffa5f Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sun, 27 Sep 2026 09:17:22 +0000
Subject: [PATCH 71/91] python313Packages.notobuilder: 0-unstable-2026-06-26 ->
 0-unstable-2026-09-24

---
 pkgs/development/python-modules/notobuilder/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/notobuilder/default.nix b/pkgs/development/python-modules/notobuilder/default.nix
index b100feb1f214..8c0eb436c1d0 100644
--- a/pkgs/development/python-modules/notobuilder/default.nix
+++ b/pkgs/development/python-modules/notobuilder/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage {
   pname = "notobuilder";
-  version = "0-unstable-2026-06-26";
+  version = "0-unstable-2026-09-24";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "notofonts";
     repo = "notobuilder";
-    rev = "5b55818eb3f535481135a5f57a337eec6d28cda0";
-    hash = "sha256-pdfWl8rp4tizgb7j0UR7hOW/Ae2dPhTSw1IHljM15LE=";
+    rev = "efda64ea4bdb249cfa69cad28d9cf2febfc7b0c8";
+    hash = "sha256-xAddENwuFPc3Yk0xqWZKbnUAdj3Ka7hoOl+YmYSh3XI=";
   };
 
   postPatch = ''

From 4f352c8ff4e244528a306b76c00c9f5467b4d8c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Sep 2026 09:41:34 +0000
Subject: [PATCH 72/91] cargo-tarpaulin: 0.37.2 -> 0.37.5

---
 pkgs/by-name/ca/cargo-tarpaulin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
index 858c5ddb275a..d0083ba7abd3 100644
--- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix
+++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-tarpaulin";
-  version = "0.37.2";
+  version = "0.37.5";
 
   src = fetchFromGitHub {
     owner = "xd009642";
     repo = "tarpaulin";
     tag = finalAttrs.version;
-    hash = "sha256-oD8k/M5PChKzG1ek1uH8UP7PoaL9LYot3HCO4Hmetsw=";
+    hash = "sha256-m3z4hBoktmFZTOhXmsQW9tsmbBGQwL1Pi9163tabjcY=";
   };
 
-  cargoHash = "sha256-lZ4wRI1PEcHDxGe8R1mnp/Gk0IDzqXLvosfzkZOIhug=";
+  cargoHash = "sha256-3dbDxnPTjSsU242gSiEUhhLCRuqsHLFN0ZVJ7oKROeo=";
 
   nativeBuildInputs = [
     pkg-config

From 58e086a953dbe24a483be00750a6e950eb5904fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Sep 2026 09:45:19 +0000
Subject: [PATCH 73/91] terraform-providers.aiven_aiven: 4.62.0 -> 4.63.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 6b83d356670c..f38054bab18c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -27,13 +27,13 @@
     "vendorHash": null
   },
   "aiven_aiven": {
-    "hash": "sha256-OOEtFEs8EBOlvAoAOVKS1yFCYBzJ/75G7arDkkjS5LA=",
+    "hash": "sha256-By/CEi2DEZSvrfyV9KTBp6VlaIK1m4xF71KEpJbtrG8=",
     "homepage": "https://registry.terraform.io/providers/aiven/aiven",
     "owner": "aiven",
     "repo": "terraform-provider-aiven",
-    "rev": "v4.62.0",
+    "rev": "v4.63.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-TXeJPVyb3+t1wJyHXNbmy6iPrPTG47bedHB0UyEUv98="
+    "vendorHash": "sha256-jrr657aGldXtq4XHfYYpgr1HQpe+cg1mWa7gwRj30io="
   },
   "akamai_akamai": {
     "hash": "sha256-ui8w8z9kROptw0tCvtT645bbNJV/BRd10aVomwhl+hI=",

From 9aa529f00827baec44f4339a9d66c784626bb281 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Sep 2026 09:48:30 +0000
Subject: [PATCH 74/91] terraform-providers.hashicorp_google-beta: 8.3.0 ->
 8.4.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 6b83d356670c..952f6046ca53 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -598,13 +598,13 @@
     "vendorHash": "sha256-9DiGgBQyN2lv7w4IkjMuWGNo9oTIvdK1qcdEpKpy5NE="
   },
   "hashicorp_google-beta": {
-    "hash": "sha256-EvcjgQupjAPKkbPObTTXNUsyyo7Udwc6rriD4/K7UhE=",
+    "hash": "sha256-JNPZ9nL5mkoqH0HNQr6mNWNadtnK1iZlMhy1UDds/v8=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "repo": "terraform-provider-google-beta",
-    "rev": "v8.3.0",
+    "rev": "v8.4.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-t3lzDRh0v6vMbw8qLXTOjKNUtaBlXOZkqNO+mJyP9NQ="
+    "vendorHash": "sha256-KI1hUXlJVoKGRyDODIfHJCBmN08Hml5JK+BSYiWGeXQ="
   },
   "hashicorp_helm": {
     "hash": "sha256-O3QcQf+TBmSB/mY5wybk/8BUG5RTjLhJYU+9jOOUqBI=",

From ca419d5410c62b56a701a260505ea40327860c82 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 27 Sep 2026 13:33:20 +0200
Subject: [PATCH 75/91] libeconf: fix darwin build

---
 pkgs/by-name/li/libeconf/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/li/libeconf/package.nix b/pkgs/by-name/li/libeconf/package.nix
index f6533a2ae9f0..be4d989e7498 100644
--- a/pkgs/by-name/li/libeconf/package.nix
+++ b/pkgs/by-name/li/libeconf/package.nix
@@ -18,6 +18,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-jIEsfX3Oz/koX0srLPGII99WaeFjKtXvB4kzMu7LbWs=";
   };
 
+  # unsupported flags that we can just remove
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace meson.build \
+      --replace-fail "'-ffat-lto-objects'," "" \
+      --replace-fail "version_flag = ['-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)]" "version_flag = []"
+  '';
+
   __structuredAttrs = true;
   strictDeps = true;
 

From b65acf7cfcc55b0460bdff96a22a2572e2943941 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 27 Sep 2026 13:36:20 +0200
Subject: [PATCH 76/91] libeconf: test pkg-config

---
 pkgs/by-name/li/libeconf/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libeconf/package.nix b/pkgs/by-name/li/libeconf/package.nix
index be4d989e7498..0b47a1df0dde 100644
--- a/pkgs/by-name/li/libeconf/package.nix
+++ b/pkgs/by-name/li/libeconf/package.nix
@@ -5,6 +5,7 @@
   meson,
   ninja,
   nix-update-script,
+  testers,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -33,7 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    updateScript = nix-update-script { };
+  };
 
   meta = {
     description = "Enhanced config file parser, which merges config files placed in several locations into one";
@@ -43,5 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ grimmauld ];
     mainProgram = "econftool";
     platforms = lib.platforms.all;
+    pkgConfigModules = [ "libeconf" ];
   };
 })

From b05edaf8d4d5c7f2f9b8e180e2019919eb2baff9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Sep 2026 11:41:38 +0000
Subject: [PATCH 77/91] rofi-games: 1.18.0 -> 1.19.0

---
 pkgs/by-name/ro/rofi-games/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/rofi-games/package.nix b/pkgs/by-name/ro/rofi-games/package.nix
index 51efa1e744b0..0727b6dd3d13 100644
--- a/pkgs/by-name/ro/rofi-games/package.nix
+++ b/pkgs/by-name/ro/rofi-games/package.nix
@@ -19,18 +19,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rofi-games";
-  version = "1.18.0";
+  version = "1.19.0";
 
   src = fetchFromGitHub {
     owner = "Rolv-Apneseth";
     repo = "rofi-games";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6/UeQ+j38NeQFkeP0Pb2UKUbwruPgUos3e9TUQwv9WI=";
+    hash = "sha256-+2I4WR5SOLYSWnPUrJFlRwhnebu4RNy3Dd4/gKW8xXU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-oWmfzlt/qqg1CYfk1pKWhaapiP3iqFU4Idn6pBivjko=";
+    hash = "sha256-dPm9+rxEtx32HVaXLrbxZiVyUrYwFPvuk/gRQR4Fo+s=";
   };
 
   patches = [

From f9f7fe4219335d49e0c71968cd369e56841ec838 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 27 Sep 2026 13:43:11 +0200
Subject: [PATCH 78/91] libeconf: add cpe

---
 pkgs/by-name/li/libeconf/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/li/libeconf/package.nix b/pkgs/by-name/li/libeconf/package.nix
index 0b47a1df0dde..f0df643b1abf 100644
--- a/pkgs/by-name/li/libeconf/package.nix
+++ b/pkgs/by-name/li/libeconf/package.nix
@@ -48,5 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "econftool";
     platforms = lib.platforms.all;
     pkgConfigModules = [ "libeconf" ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "opensuse" finalAttrs.version;
   };
 })

From f06fa3e828bc883b9fc7db80ade7077e8839fc87 Mon Sep 17 00:00:00 2001
From: whoomee <git@miglix.eu>
Date: Sun, 27 Sep 2026 13:40:33 +0200
Subject: [PATCH 79/91] python3Packages.pyfribidi: drop

---
 .../python-modules/pyfribidi/default.nix      | 31 -------------------
 .../pyfribidi/pyfribidi-clang.patch           | 17 ----------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 4 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyfribidi/default.nix
 delete mode 100644 pkgs/development/python-modules/pyfribidi/pyfribidi-clang.patch

diff --git a/pkgs/development/python-modules/pyfribidi/default.nix b/pkgs/development/python-modules/pyfribidi/default.nix
deleted file mode 100644
index 69e91b171cc2..000000000000
--- a/pkgs/development/python-modules/pyfribidi/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchPypi,
-  isPyPy,
-  six,
-}:
-
-buildPythonPackage rec {
-  version = "0.12.0";
-  format = "setuptools";
-  pname = "pyfribidi";
-  disabled = isPyPy;
-
-  src = fetchPypi {
-    inherit pname version;
-    extension = "zip";
-    sha256 = "64726a4a56783acdc79c6b9b3a15f16e6071077c897a0b999f3b43f744bc621c";
-  };
-
-  patches = lib.optional stdenv.cc.isClang ./pyfribidi-clang.patch;
-
-  propagatedBuildInputs = [ six ];
-
-  meta = {
-    description = "Simple wrapper around fribidi";
-    homepage = "https://github.com/pediapress/pyfribidi";
-    license = lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/development/python-modules/pyfribidi/pyfribidi-clang.patch b/pkgs/development/python-modules/pyfribidi/pyfribidi-clang.patch
deleted file mode 100644
index c570843f7e8b..000000000000
--- a/pkgs/development/python-modules/pyfribidi/pyfribidi-clang.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/pyfribidi.c b/pyfribidi.c
-index 9a0120d..238134a 100644
---- a/pyfribidi.c
-+++ b/pyfribidi.c
-@@ -148,10 +148,11 @@ init_pyfribidi (void)
- {
- #if PY_MAJOR_VERSION >= 3
-         PyObject *module = PyModule_Create (&pyfribidi_moduledef);
-+        if (module == NULL) return NULL;
- #else
-         PyObject *module = Py_InitModule ("_pyfribidi", PyfribidiMethods);
-+        if (module == NULL) return;
- #endif
--	if (module == NULL) return NULL;
- 
- 	PyModule_AddIntConstant (module, "RTL", (long) FRIBIDI_TYPE_RTL);
- 	PyModule_AddIntConstant (module, "LTR", (long) FRIBIDI_TYPE_LTR);
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index e139173982f4..3c5c2369bcd8 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -534,6 +534,7 @@ mapAliases {
   pyfantom = throw "pyfantom has been removed because it does not work with python3 and has not been updated for 12 years"; # added 2025-03-25
   pyflick = throw "pyflick was removed because Flick Electric no longer exists"; # added 2025-12-03
   pyflunearyou = throw "'pyflunearyou' has been renamed to/replaced by 'pyoutbreaksnearme'"; # Converted to throw 2025-10-29
+  pyfribidi = throw "'pyfribidi' has been removed because it is unmaintained upstream"; # added 2026-09-27
   pygame_sdl2 = throw "'pygame_sdl2' has been renamed to/replaced by 'pygame-sdl2'"; # Converted to throw 2025-10-29
   PyGithub = throw "'PyGithub' has been renamed to/replaced by 'pygithub'"; # Converted to throw 2025-10-29
   pygls_2 = pygls; # added 2026-01-05
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d8256b324438..9dc9d2c5a853 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15012,8 +15012,6 @@ self: super: with self; {
 
   pyfreshr = callPackage ../development/python-modules/pyfreshr { };
 
-  pyfribidi = callPackage ../development/python-modules/pyfribidi { };
-
   pyfritzhome = callPackage ../development/python-modules/pyfritzhome { };
 
   pyfronius = callPackage ../development/python-modules/pyfronius { };

From 5ef9cb9b4a116c3e9faf42a0a8111a27faef2cc8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Sep 2026 12:24:52 +0000
Subject: [PATCH 80/91] xremap: 0.15.13 -> 0.15.14

---
 pkgs/by-name/xr/xremap/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix
index ad65e67a37c6..04ba66e34142 100644
--- a/pkgs/by-name/xr/xremap/package.nix
+++ b/pkgs/by-name/xr/xremap/package.nix
@@ -58,13 +58,13 @@ assert (
 );
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xremap${variant.suffix or ""}";
-  version = "0.15.13";
+  version = "0.15.14";
 
   src = fetchFromGitHub {
     owner = "xremap";
     repo = "xremap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EOZjn1mObQV1C4VevrVdSPRdqw0q5vCLxDJOlIR19C4=";
+    hash = "sha256-KwKIHFBnlq2nIh4E1OeVdr4QSPwa+/zn8B44/84rJko=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildNoDefaultFeatures = true;
   buildFeatures = variant.features;
 
-  cargoHash = "sha256-fE4lwnC1AtdK2Ev+NT77Q4PqWU07sHccBbEpzd4YATA=";
+  cargoHash = "sha256-lkg1bnTEGUO7ce1Y6a1iK5khoswG3trlSthtp3otem4=";
 
   passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants;
 

From 61f0df8834f4b76ff6bd7c1b7365b0289a7823d7 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.erents@gmail.com>
Date: Sun, 27 Sep 2026 11:32:51 +0200
Subject: [PATCH 81/91] 
 zabbix{60,70,74}.plugins.{ember-plus,mongodb,mssql,nviaid-gpu,postgresql}:
 Init

---
 doc/release-notes/rl-2611.section.md          |  4 +++
 .../package.nix                               | 30 ----------------
 pkgs/servers/monitoring/zabbix/versions.nix   | 12 +++++++
 .../zabbix-agent2-plugins/ember-plus.nix      | 33 +++++++++++++++++
 .../zabbix/zabbix-agent2-plugins/mongodb.nix  | 33 +++++++++++++++++
 .../zabbix/zabbix-agent2-plugins/mssql.nix    | 33 +++++++++++++++++
 .../zabbix-agent2-plugins/postgresql.nix      | 36 +++++++++++++++++++
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               | 12 +++++++
 9 files changed, 164 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
 create mode 100644 pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/ember-plus.nix
 create mode 100644 pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/mongodb.nix
 create mode 100644 pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/mssql.nix
 create mode 100644 pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/postgresql.nix

diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index b73e3ca56f78..9746424137ae 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -36,6 +36,10 @@
 - `zabbix.<package>` now defaults to version 7.4. If you want to keep using Zabbix 6.0, use `pkgs.zabbix60.<package>`.
   Note that Zabbix 6.0 is in limited support, and will be deprecated on February 28, 2027. Consider upgrading.
 
+- `zabbix-agent2-plugin-postgresql` is now moved to `zabbix{60,70,74}.plugins.postgresql`.
+
+- Official Zabbix plugins (ember-plus, mongodb, and mssql) have been added under `zabbix{60,70,74}.plugins.<plugin>`.
+
 - `perlPackages.NetOAuth` has been updated from 0.28 to 0.33.
   Callers that verify messages must now set `allowed_signature_methods` per message or configure `@Net::OAuth::ALLOWED_SIGNATURE_METHODS`; `verify` otherwise throws an exception.
   See the [upstream changelog](https://metacpan.org/dist/Net-OAuth/changes) for details.
diff --git a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
deleted file mode 100644
index 938cbf8e9889..000000000000
--- a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchurl,
-}:
-
-buildGoModule (finalAttrs: {
-  pname = "zabbix-agent2-plugin-postgresql";
-  version = "7.4.14";
-
-  src = fetchurl {
-    url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${finalAttrs.version}.tar.gz";
-    hash = "sha256-H+WwJ9RrITeWKErMW+vcEG/Z2rAjbznVg/dK3ZM7j0I=";
-  };
-
-  vendorHash = null;
-
-  meta = {
-    description = "Required tool for Zabbix agent integrated PostgreSQL monitoring";
-    mainProgram = "postgresql";
-    homepage = "https://www.zabbix.com/integrations/postgresql";
-    license =
-      if (lib.versions.major finalAttrs.version >= "7") then
-        lib.licenses.agpl3Only
-      else
-        lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ gador ];
-    platforms = lib.platforms.linux;
-  };
-})
diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 7cc388aaaeb3..560193b68883 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -2,13 +2,25 @@ generic: {
   v74 = generic {
     version = "7.4.14";
     hash = "sha256-795fbxmJbwIAu1JF44ZgNWZyccex6EYm0mCV8kpvu0I=";
+    emberPlusHash = "sha256-riwnpB9ziZhIy9Lqt+JBEfdMR89ZRDmaGC1ibKu6fcU=";
+    mongodbHash = "sha256-zW4wmh422+BlMgtR8+zrrOgTMMtWJbXPRu9MgZwNUt8=";
+    mssqlHash = "sha256-wygP7Li39+MfX+b3h5YJmYhDQKd/ta/sMuLtZI6UgiE=";
+    postgresqlHash = "sha256-H+WwJ9RrITeWKErMW+vcEG/Z2rAjbznVg/dK3ZM7j0I=";
   };
   v70 = generic {
     version = "7.0.30";
     hash = "sha256-wMpAeRGa3uxBNeM1HRuEkVet4HbDUsAGco5zLxcHIyw=";
+    emberPlusHash = "sha256-BXFaELxPrUSIF8+/Jpv+WfGYpJA4VK8wdL4oDFPn+/A=";
+    mongodbHash = "sha256-DhDqLXjGAQXBn9U5fVhZgxsP0MHMKgz35YI8K74mWxo=";
+    mssqlHash = "sha256-Ow15PXUq+kKyeM7j/TNZe/LKKDcmdpB04XE3SkagdRI=";
+    postgresqlHash = "sha256-7BFLstJRAh+rdDW9G7kspMYqRubdfXS9AimMDuMB8UM=";
   };
   v60 = generic {
     version = "6.0.48";
     hash = "sha256-cIibBi7O1e5YKjznoyli/lq7gX/UhoPEc8K8a1kDZJw=";
+    emberPlusHash = "sha256-KtypkgjExw0aajGGr8gFi6VCpofaI/fd+BgBUqdvgBQ=";
+    mongodbHash = "sha256-5RC9rYj4/2MkGPpCmR/hVERp1NxDSTcyn0DZRarFAIM=";
+    mssqlHash = "sha256-UoIHydaa8CPRF2uXXLQAGnX+ImMyMqE3vdMB8e8Zn1c=";
+    postgresqlHash = "sha256-uBkcF5J9BgmqNPTiMPGf4EgUHbidqrLygud7dHFLSe0=";
   };
 }
diff --git a/pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/ember-plus.nix b/pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/ember-plus.nix
new file mode 100644
index 000000000000..9c312ba7e7b9
--- /dev/null
+++ b/pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/ember-plus.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildGoModule,
+  fetchurl,
+}:
+
+import ../versions.nix (
+  { version, emberPlusHash, ... }:
+  buildGoModule (finalAttrs: {
+    pname = "zabbix-agent2-plugin-ember-plus";
+    inherit version;
+
+    src = fetchurl {
+      url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/ember-plus/zabbix-agent2-plugin-ember-plus-${finalAttrs.version}.tar.gz";
+      hash = emberPlusHash;
+    };
+
+    vendorHash = null;
+
+    meta = {
+      description = "Zabbix agent2 plugin for monitoring Ember Plus";
+      mainProgram = "ember-plus";
+      homepage = "https://www.zabbix.com/documentation/current/en/manual/appendix/config/zabbix_agent2_plugins/ember_plus_plugin";
+      license =
+        if (lib.versions.major finalAttrs.version >= "7") then
+          lib.licenses.agpl3Only
+        else
+          lib.licenses.gpl2Plus;
+      maintainers = with lib.maintainers; [ thelolcoder2007 ];
+      platforms = lib.platforms.linux;
+    };
+  })
+)
diff --git a/pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/mongodb.nix b/pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/mongodb.nix
new file mode 100644
index 000000000000..059205cc9645
--- /dev/null
+++ b/pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/mongodb.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildGoModule,
+  fetchurl,
+}:
+
+import ../versions.nix (
+  { version, mongodbHash, ... }:
+  buildGoModule (finalAttrs: {
+    pname = "zabbix-agent2-plugin-mongodb";
+    inherit version;
+
+    src = fetchurl {
+      url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/mongodb/zabbix-agent2-plugin-mongodb-${finalAttrs.version}.tar.gz";
+      hash = mongodbHash;
+    };
+
+    vendorHash = null;
+
+    meta = {
+      description = "Zabbix agent2 plugin for monitoring Mongodb";
+      mainProgram = "mongodb";
+      homepage = "https://www.zabbix.com/documentation/current/en/manual/appendix/config/zabbix_agent2_plugins/mongodb_plugin";
+      license =
+        if (lib.versions.major finalAttrs.version >= "7") then
+          lib.licenses.agpl3Only
+        else
+          lib.licenses.gpl2Plus;
+      maintainers = with lib.maintainers; [ thelolcoder2007 ];
+      platforms = lib.platforms.linux;
+    };
+  })
+)
diff --git a/pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/mssql.nix b/pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/mssql.nix
new file mode 100644
index 000000000000..295ee9324432
--- /dev/null
+++ b/pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/mssql.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildGoModule,
+  fetchurl,
+}:
+
+import ../versions.nix (
+  { version, mssqlHash, ... }:
+  buildGoModule (finalAttrs: {
+    pname = "zabbix-agent2-plugin-mssql";
+    inherit version;
+
+    src = fetchurl {
+      url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/mssql/zabbix-agent2-plugin-mssql-${finalAttrs.version}.tar.gz";
+      hash = mssqlHash;
+    };
+
+    vendorHash = null;
+
+    meta = {
+      description = "Zabbix agent2 plugin for monitoring Microsoft SQL servers";
+      mainProgram = "mssql";
+      homepage = "https://www.zabbix.com/documentation/current/en/manual/appendix/config/zabbix_agent2_plugins/mssql_plugin";
+      license =
+        if (lib.versions.major finalAttrs.version >= "7") then
+          lib.licenses.agpl3Only
+        else
+          lib.licenses.gpl2Plus;
+      maintainers = with lib.maintainers; [ thelolcoder2007 ];
+      platforms = lib.platforms.linux;
+    };
+  })
+)
diff --git a/pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/postgresql.nix b/pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/postgresql.nix
new file mode 100644
index 000000000000..54d7b9a54a2f
--- /dev/null
+++ b/pkgs/servers/monitoring/zabbix/zabbix-agent2-plugins/postgresql.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildGoModule,
+  fetchurl,
+}:
+
+import ../versions.nix (
+  { version, postgresqlHash, ... }:
+  buildGoModule (finalAttrs: {
+    pname = "zabbix-agent2-plugin-postgresql";
+    inherit version;
+
+    src = fetchurl {
+      url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${finalAttrs.version}.tar.gz";
+      hash = postgresqlHash;
+    };
+
+    vendorHash = null;
+
+    meta = {
+      description = "Required tool for Zabbix agent integrated PostgreSQL monitoring";
+      mainProgram = "postgresql";
+      homepage = "https://www.zabbix.com/integrations/postgresql";
+      license =
+        if (lib.versions.major finalAttrs.version >= "7") then
+          lib.licenses.agpl3Only
+        else
+          lib.licenses.gpl2Plus;
+      maintainers = with lib.maintainers; [
+        gador
+        thelolcoder2007
+      ];
+      platforms = lib.platforms.linux;
+    };
+  })
+)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f5d1e3ca68b5..27ea3fac8c00 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -3137,6 +3137,7 @@ mapAliases {
   yubikey-manager-qt = throw "'yubikey-manager-qt' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07
   yubikey-personalization-gui = throw "'yubikey-personalization-gui' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07
   zabbix72 = throw "'zabbix72' was removed as it has reached its end of life"; # Added 2026-02-11
+  zabbix-agent2-plugin-postgresql = throw "'zabbix-agent2-plugin-postgresql' is moved to 'zabbix74.plugins.postgresql'"; # Added 2026-09-27
   zandronum-alpha = throw "'zandronum-alpha' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
   zandronum-alpha-server = throw "'zandronum-alpha-server' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
   zap-chip-gui = throw "the gui variant of zap-chip was removed as it was not really functional"; # Added 2026-05-30
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 963543744b99..c9e0bb0d7272 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7519,6 +7519,18 @@ with pkgs;
     web = (callPackages ../servers/monitoring/zabbix/web.nix { }).${version};
     agent2 = (callPackages ../servers/monitoring/zabbix/agent2.nix { }).${version};
 
+    plugins = {
+      ember-plus =
+        (callPackages ../servers/monitoring/zabbix/zabbix-agent2-plugins/ember-plus.nix { }).${version};
+      mongodb =
+        (callPackages ../servers/monitoring/zabbix/zabbix-agent2-plugins/mongodb.nix { }).${version};
+      mssql = (callPackages ../servers/monitoring/zabbix/zabbix-agent2-plugins/mssql.nix { }).${version};
+      nvidia-gpu =
+        (callPackages ../servers/monitoring/zabbix/zabbix-agent2-plugins/nvidia-gpu.nix { }).${version};
+      postgresql =
+        (callPackages ../servers/monitoring/zabbix/zabbix-agent2-plugins/postgresql.nix { }).${version};
+    };
+
     # backwards compatibility
     server = server-pgsql;
   };

From ce0b5f253322b8f30d482b2d21f442da0d75e2b0 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.erents@gmail.com>
Date: Sun, 27 Sep 2026 14:44:29 +0200
Subject: [PATCH 82/91] Maintainers: Add thelolcoder2007

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9e66e7a92067..70379b47fc54 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28991,6 +28991,13 @@
     github = "thelissimus";
     githubId = 70096720;
   };
+  thelolcoder2007 = {
+    name = "thelolcoder2007";
+    github = "thelolcoder2007";
+    githubId = 52106896;
+    matrix = "@erents:dapperepoging.nl";
+    keys = [ { fingerprint = "E374 815F C754 462B 1C34  3562 FDC3 99DE 8F7E 200B"; } ];
+  };
   themadbit = {
     name = "Mark Tanui";
     email = "marktanui75@gmail.com";

From 0de64f13543e2f42fcb2ce249262fd4dd5cef7e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Sep 2026 13:12:54 +0000
Subject: [PATCH 83/91] thunderbird-latest-unwrapped: 156.0 -> 156.0.1

---
 .../networking/mailreaders/thunderbird/packages.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index e5c36d34214c..4d64a4279baf 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -85,8 +85,8 @@ rec {
   thunderbird = thunderbird-latest;
 
   thunderbird-latest = common {
-    version = "156.0";
-    sha512 = "8fd524f9d622f007e9bd5e8bcc440f185427a928a04d3aae14fc476e011ff1c15b68607292624ea4c4e4d596722193dda88e233cdfb6bbf5d05bd180870532ba";
+    version = "156.0.1";
+    sha512 = "e9262a4666e0107c7bc45fc2ad4bac4d6e5db4bfd3325d1d1c418f00adee777db969f8c12d8f310f45fdfda61b26e31bd0eea8b7d64ed1ee0050b5ee9235cfb0";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-latest";

From cab4b5b057f1d892208199cfcf3e8eb58527985a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 27 Sep 2026 15:14:36 +0200
Subject: [PATCH 84/91] orioledb: 1.9-beta17 -> 1.10beta18

Release Notes:
https://github.com/orioledb/orioledb/releases/tag/beta18
---
 pkgs/by-name/or/orioledb/extension.nix | 8 ++++----
 pkgs/by-name/or/orioledb/package.nix   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/or/orioledb/extension.nix b/pkgs/by-name/or/orioledb/extension.nix
index f998b2ae0642..40a6f5e989f4 100644
--- a/pkgs/by-name/or/orioledb/extension.nix
+++ b/pkgs/by-name/or/orioledb/extension.nix
@@ -10,14 +10,14 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "orioledb";
-  # SQL extension version is 1.9, official version is beta17
-  version = "1.9-beta17";
+  # SQL extension version is 1.10, official version is beta18
+  version = "1.10-beta18";
 
   src = fetchFromGitHub {
     owner = "orioledb";
     repo = "orioledb";
-    tag = "beta17";
-    hash = "sha256-gDX28/CHlbLj+jC3Qx6z/Hg6M73K4mFPw3iysc1Xv6I=";
+    tag = "beta18";
+    hash = "sha256-kmNfneISVhlD9Pmnl69pkiAX77MzpzyJQB/5wQ1wiZc=";
   };
 
   buildInputs = postgresql.buildInputs ++ [
diff --git a/pkgs/by-name/or/orioledb/package.nix b/pkgs/by-name/or/orioledb/package.nix
index 724c33e27b90..d2e2fc1dea3a 100644
--- a/pkgs/by-name/or/orioledb/package.nix
+++ b/pkgs/by-name/or/orioledb/package.nix
@@ -8,13 +8,13 @@ let
   orioledb-postgres = postgresql_18.overrideAttrs (
     finalAttrs: oldAttrs: {
       pname = "orioledb-postgres";
-      version = "18.2";
+      version = "18.3";
 
       src = fetchFromGitHub {
         owner = "orioledb";
         repo = "postgres";
-        tag = "patches18_2";
-        hash = "sha256-n/Bl48D20evMo9c0PwdSCvdICDd3Z41OCJEuP3MJ8B4=";
+        tag = "patches18_3";
+        hash = "sha256-XzUVkPSVt6DTMrEWV80KLYoMuNdVVtZvg8Iqq1RSlAs=";
       };
 
       # Configure extracts the patch version from the git tag. This

From d152c92d27334d6a566edd9aaea9621a96367b1d Mon Sep 17 00:00:00 2001
From: Patrick <patrick@failmail.dev>
Date: Sun, 18 Jan 2026 11:45:54 +0100
Subject: [PATCH 85/91] nixosTests.homebox: Add test to ensure item creation
 and attachment upload work

Assisted-by: pi (GPT-5.6 Sol)
---
 nixos/tests/homebox.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/nixos/tests/homebox.nix b/nixos/tests/homebox.nix
index 5842668479e0..1d086305d8ab 100644
--- a/nixos/tests/homebox.nix
+++ b/nixos/tests/homebox.nix
@@ -14,6 +14,8 @@ in
           services.homebox = {
             enable = true;
             settings.HBOX_WEB_PORT = port;
+            settings.HBOX_OPTIONS_ALLOW_REGISTRATION = "true";
+            settings.HBOX_LOG_LEVEL = "trace";
           };
         };
 
@@ -50,6 +52,7 @@ in
     in
     self;
   testScript = ''
+    import json
     def test_homebox(node):
       node.wait_for_unit("homebox.service")
       node.wait_for_open_port(${port})
@@ -57,6 +60,29 @@ in
       node.succeed("curl --fail -X GET 'http://localhost:${port}/'")
       out = node.succeed("curl --fail 'http://localhost:${port}/api/v1/status'")
       assert '"health":true' in out
+      node.succeed("curl --request POST --fail 'http://localhost:${port}/api/v1/users/register' \
+        --data '{\"email\":\"a@b.c\",\"name\":\"test\",\"password\":\"password\"}' \
+      ")
+      login = node.succeed("curl --request POST --fail 'http://localhost:${port}/api/v1/users/login' \
+        --data-urlencode 'password=password' \
+        --data-urlencode 'username=a@b.c' \
+      ")
+      login_data = json.loads(login)
+      token = login_data["token"]
+      locations = node.succeed(f"curl --request GET --fail 'http://localhost:${port}/api/v1/entities?isLocation=true' \
+        --header 'Authorization: {token}' \
+      ")
+      location_id = json.loads(locations)["items"][0]["id"]
+      item = node.succeed(f"curl --request POST --fail 'http://localhost:${port}/api/v1/entities' \
+        --header 'Authorization: {token}' \
+        --data '{{\"name\":\"testitem\",\"parentId\":\"{location_id}\"}}' \
+      ")
+      item_id = json.loads(item)["id"]
+      node.succeed(f"curl --request POST --fail 'http://localhost:${port}/api/v1/entities/{item_id}/attachments' \
+        --header 'Authorization: {token}' \
+        --form 'file=test;type=text/plain;filename=test.txt' \
+        --form name=test.txt \
+      ")
 
     test_homebox(simple)
     simple.send_monitor_command("quit")

From dbb6b834643545859a5b7d292d5363d28714a928 Mon Sep 17 00:00:00 2001
From: Patrick <patrick@failmail.dev>
Date: Sun, 18 Jan 2026 15:10:47 +0100
Subject: [PATCH 86/91] nixos/homebox: use fileblob options instead of moving
 TMPDIR

---
 nixos/modules/services/web-apps/homebox.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/web-apps/homebox.nix b/nixos/modules/services/web-apps/homebox.nix
index 86d5a22a9326..54232535e8e4 100644
--- a/nixos/modules/services/web-apps/homebox.nix
+++ b/nixos/modules/services/web-apps/homebox.nix
@@ -43,7 +43,7 @@ in
       type = types.submodule { freeformType = types.attrsOf (types.nullOr types.str); };
       defaultText = lib.literalExpression ''
         {
-          HBOX_STORAGE_CONN_STRING = "file:///var/lib/homebox";
+          HBOX_STORAGE_CONN_STRING = "file:///var/lib/homebox?no_tmp_dir=1";
           HBOX_STORAGE_PREFIX_PATH = "data";
           HBOX_DATABASE_DRIVER = "sqlite3";
           HBOX_DATABASE_SQLITE_PATH = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1";
@@ -51,7 +51,6 @@ in
           HBOX_OPTIONS_GITHUB_RELEASE_CHECK = "false";
           HBOX_MODE = "production";
           HOME = "/var/lib/homebox";
-          TMPDIR = "/var/lib/homebox/tmp";
         }
       '';
       description = ''
@@ -125,7 +124,9 @@ in
 
     services.homebox.settings = lib.mkMerge [
       (lib.mapAttrs (_: mkDefault) {
-        HBOX_STORAGE_CONN_STRING = "file:///var/lib/homebox";
+        # We cannot use a tempdir as homebox wants to rename the file, which does not work across filesystem boundaries
+        # also see: https://github.com/google/go-cloud/issues/3294 and https://pkg.go.dev/gocloud.dev/blob/fileblob#URLOpener
+        HBOX_STORAGE_CONN_STRING = "file:///var/lib/homebox?no_tmp_dir=1";
         HBOX_STORAGE_PREFIX_PATH = "data";
         HBOX_DATABASE_DRIVER = "sqlite3";
         HBOX_DATABASE_SQLITE_PATH = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1";
@@ -134,10 +135,8 @@ in
         HBOX_MODE = "production";
         # Fix this startup issue:
         #   failed to create modcache index dir: mkdir /var/empty/.cache: read-only file system
+        # TODO: remove once https://github.com/golang/tools/commit/03cb4551c662c0e078502fe5f317ca4114b89cd8 is available
         HOME = "/var/lib/homebox";
-        # Fix uploading/saving attachments/images:
-        # [...] rename /tmp/ced4804c80b1ed1f6e88060f6d829db421e6dbf3a189715265900b5d6b0243ed.1889b3d16ab36e22.tmp /var/lib/homebox/data/5f42f81b-e9ad-4495-b6a6-9e9f704db30e/documents/ced4804c80b1ed1f6e88060f6d829db421e6dbf3a189715265900b5d6b0243ed: invalid cross-device link" [...]
-        TMPDIR = "/var/lib/homebox/tmp";
       })
 
       (mkIf cfg.database.createLocally {

From d6ee554cf65a49bb54ca2eb725ee216178a029f3 Mon Sep 17 00:00:00 2001
From: zimward <zimward@zimward.moe>
Date: Sun, 27 Sep 2026 15:32:36 +0200
Subject: [PATCH 87/91] unifiedpush-common-proxies: rename to common-proxies

---
 .../common-proxies}/package.nix                            | 7 +++++--
 pkgs/top-level/aliases.nix                                 | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)
 rename pkgs/by-name/{un/unifiedpush-common-proxies => co/common-proxies}/package.nix (79%)

diff --git a/pkgs/by-name/un/unifiedpush-common-proxies/package.nix b/pkgs/by-name/co/common-proxies/package.nix
similarity index 79%
rename from pkgs/by-name/un/unifiedpush-common-proxies/package.nix
rename to pkgs/by-name/co/common-proxies/package.nix
index 068ac02a1461..96cf82086094 100644
--- a/pkgs/by-name/un/unifiedpush-common-proxies/package.nix
+++ b/pkgs/by-name/co/common-proxies/package.nix
@@ -5,18 +5,21 @@
 }:
 
 buildGoModule (finalAttrs: {
-  pname = "unifiedpush-common-proxies";
+  pname = "common-proxies";
   version = "3.1.0";
 
   src = fetchFromCodeberg {
     owner = "UnifiedPush";
     repo = "common-proxies";
     rev = finalAttrs.version;
-    sha256 = "sha256-VRxwEsQt1LlcMIMEkGqkVtMrqJ7f4tYh3OExE9VITh4=";
+    hash = "sha256-VRxwEsQt1LlcMIMEkGqkVtMrqJ7f4tYh3OExE9VITh4=";
   };
 
   vendorHash = "sha256-rGsSuO7cnb9e4A1SnIwfgfz4vu18JzxKtLnDfCSQqck=";
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   meta = {
     description = "Set of rewrite proxies and gateways for UnifiedPush";
     homepage = "https://github.com/UnifiedPush/common-proxies";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f5d1e3ca68b5..037a15ae799c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2625,6 +2625,7 @@ mapAliases {
   uhttpmock_1_0 = warnAlias "'uhttpmock_1_0' has been renamed to 'uhttpmock'" uhttpmock; # Added 2026-05-30
   unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17
   unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27
+  unifiedpush-common-proxies = warnAlias "'unifiedpush-common-proxies' has been renamed to 'common-proxies'" common-proxies; # Added 2026-09-27
   unixODBC = warnAlias "'unixODBC' has been renamed to 'unixodbc'" unixodbc; # Added 2026-02-12
   unixODBCDrivers = warnAlias "'unixODBCDrivers' has been renamed to 'unixodbcDrivers'" unixodbcDrivers; # Added 2026-02-12
   unrar_6 = throw "'unrar_6' has been renamed to/replaced by 'unrar'"; # Added 2026-03-11

From cb09c5dff99cd24f59c2b82f90a1c92e98eb6389 Mon Sep 17 00:00:00 2001
From: zimward <zimward@zimward.moe>
Date: Sun, 27 Sep 2026 15:37:48 +0200
Subject: [PATCH 88/91] common-proxies: use correct homepage url

---
 pkgs/by-name/co/common-proxies/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/common-proxies/package.nix b/pkgs/by-name/co/common-proxies/package.nix
index 96cf82086094..dc5a24307898 100644
--- a/pkgs/by-name/co/common-proxies/package.nix
+++ b/pkgs/by-name/co/common-proxies/package.nix
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Set of rewrite proxies and gateways for UnifiedPush";
-    homepage = "https://github.com/UnifiedPush/common-proxies";
+    homepage = "https://codeberg.org/UnifiedPush/common-proxies";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.zimward ];
     mainProgram = "common-proxies";

From 1edf6e8f329ea4345f2e00337352eda92750c949 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 27 Sep 2026 07:09:47 +0200
Subject: [PATCH 89/91] treefmt.withConfig: replace `stdenv` with `stdenvNoCC`

---
 pkgs/by-name/tr/treefmt/check-wrapper.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/treefmt/check-wrapper.nix b/pkgs/by-name/tr/treefmt/check-wrapper.nix
index a7f16e0bdf90..151a99904714 100644
--- a/pkgs/by-name/tr/treefmt/check-wrapper.nix
+++ b/pkgs/by-name/tr/treefmt/check-wrapper.nix
@@ -2,7 +2,7 @@
   lib,
   gitMinimal,
   runCommandLocal,
-  stdenv,
+  stdenvNoCC,
   wrapper,
 }:
 /**
@@ -21,8 +21,8 @@ runCommandLocal "${lib.getName wrapper}-check"
     ];
     inherit project;
     env = {
-      LANG = if stdenv.buildPlatform.isDarwin then "en_US.UTF-8" else "C.UTF-8";
-      LC_ALL = if stdenv.buildPlatform.isDarwin then "en_US.UTF-8" else "C.UTF-8";
+      LANG = if stdenvNoCC.buildPlatform.isDarwin then "en_US.UTF-8" else "C.UTF-8";
+      LC_ALL = if stdenvNoCC.buildPlatform.isDarwin then "en_US.UTF-8" else "C.UTF-8";
     };
     meta.description = "Check that the project tree is formatted";
   }

From d81c381e3ecebc2ce3777208ab2fafc784662e71 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 27 Sep 2026 07:41:29 +0200
Subject: [PATCH 90/91] treefmt.withConfig: use `gitSetupHook`

---
 pkgs/by-name/tr/treefmt/check-wrapper.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/treefmt/check-wrapper.nix b/pkgs/by-name/tr/treefmt/check-wrapper.nix
index 151a99904714..4442f05c45e1 100644
--- a/pkgs/by-name/tr/treefmt/check-wrapper.nix
+++ b/pkgs/by-name/tr/treefmt/check-wrapper.nix
@@ -2,6 +2,7 @@
   lib,
   gitMinimal,
   runCommandLocal,
+  gitSetupHook,
   stdenvNoCC,
   wrapper,
 }:
@@ -17,6 +18,7 @@ runCommandLocal "${lib.getName wrapper}-check"
     strictDeps = true;
     nativeBuildInputs = [
       gitMinimal
+      gitSetupHook
       wrapper
     ];
     inherit project;
@@ -34,8 +36,6 @@ runCommandLocal "${lib.getName wrapper}-check"
 
     # Setup a git repo
     git init --initial-branch main
-    git config user.name nixbld
-    git config user.email nixbld@example.com
     git add .
     git commit -m init --quiet
 

From e522bc137714bba8031b93b4526cdb33aa1bcafb Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sun, 27 Sep 2026 16:41:06 +0200
Subject: [PATCH 91/91] themes: drop

---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f5d1e3ca68b5..aa4350242349 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2558,6 +2558,7 @@ mapAliases {
   theme-jade1 = throw "'theme-jade1' has been removed because it depended on 'gtk-engine-murrine', which was removed because it was unmaintained upstream and depended on GTK 2."; # Added 2026-07-22
   theme-obsidian2 = throw "'theme-obsidian2' has been removed because it depended on 'gtk-engine-murrine', which was removed because it was unmaintained upstream and depended on GTK 2."; # Added 2026-07-22
   theme-vertex = throw "'theme-vertex' has been removed because it depended on 'gtk-engine-murrine', which was removed because it was unmaintained upstream and depended on GTK 2."; # Added 2026-07-22
+  themes = throw "'themes' has ben removed because it was unused"; # Added 2026-09-27
   thinkingRock = throw "'thinkingRock' has been removed due to being unmaintained decades old software"; # Added 2026-02-12
   thrust = throw "'thrust' has been removed due to lack of maintenance"; # Added 2025-08-21
   thunderbird-128 = throw "Thunderbird 128 support ended in August 2025"; # Added 2025-09-30
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 714bce2d5b70..0615cbe70b2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8202,8 +8202,6 @@ with pkgs;
     source-han-serif-vf-ttf
     ;
 
-  themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) { };
-
   tex-gyre = recurseIntoAttrs (callPackages ../data/fonts/tex-gyre { });
 
   tex-gyre-math = recurseIntoAttrs (callPackages ../data/fonts/tex-gyre-math { });