From e18ffa7939876b36291586150f08a6876bb96ba0 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:24 +0100
Subject: [PATCH 01/33] teapot: move NIX_LDFLAGS into env for structuredAttrs

---
 pkgs/by-name/te/teapot/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teapot/package.nix b/pkgs/by-name/te/teapot/package.nix
index 89fdd6b4b214..31a2fefaec79 100644
--- a/pkgs/by-name/te/teapot/package.nix
+++ b/pkgs/by-name/te/teapot/package.nix
@@ -32,9 +32,11 @@ stdenv.mkDerivation (finalAttrs: {
     ncurses
   ];
 
-  # By no known reason libtirpc is not detected
-  env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
-  NIX_LDFLAGS = [ "-ltirpc" ];
+  env = {
+    # By no known reason libtirpc is not detected
+    NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
+    NIX_LDFLAGS = [ "-ltirpc" ];
+  };
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \

From 0b9949a22b8fe38fe053e219bfb84d6fcfd06625 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:27 +0100
Subject: [PATCH 02/33] tenacity: move NIX_LDFLAGS into env for structuredAttrs

---
 pkgs/by-name/te/tenacity/package.nix | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix
index 4f9fbbc5348a..41e8480d905b 100644
--- a/pkgs/by-name/te/tenacity/package.nix
+++ b/pkgs/by-name/te/tenacity/package.nix
@@ -108,18 +108,20 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
-  # Tenacity only looks for ffmpeg at runtime, so we need to link it in manually.
-  # On darwin, these are ignored by the ffmpeg search even when linked.
-  NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux (toString [
-    "-lavcodec"
-    "-lavdevice"
-    "-lavfilter"
-    "-lavformat"
-    "-lavutil"
-    "-lpostproc"
-    "-lswresample"
-    "-lswscale"
-  ]);
+  env = lib.optionalAttrs stdenv.hostPlatform.isLinux {
+    # Tenacity only looks for ffmpeg at runtime, so we need to link it in manually.
+    # On darwin, these are ignored by the ffmpeg search even when linked.
+    NIX_LDFLAGS = toString [
+      "-lavcodec"
+      "-lavdevice"
+      "-lavfilter"
+      "-lavformat"
+      "-lavutil"
+      "-lpostproc"
+      "-lswresample"
+      "-lswscale"
+    ];
+  };
 
   nativeBuildInputs = [
     cmake

From 99e1aed932969777b1efd94c3b1e16b7e288945b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Feb 2026 12:16:20 +0000
Subject: [PATCH 03/33] pkgsite: 0-unstable-2026-01-16 -> 0-unstable-2026-02-06

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

diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index 477ec4c21039..491be34eebc4 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0-unstable-2026-01-16";
+  version = "0-unstable-2026-02-06";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "550788255d99f0e9ee169f12bf65d16e1ede9f7b";
-    hash = "sha256-Gx4MKLQ7Ed8XIy9oULWD1mRVcD2f7i+fb2aDjFrG9RI=";
+    rev = "2a8da3345a36148f4dca0cfb2b99cbe84ba9a50b";
+    hash = "sha256-693eUnNtuagCwfXq+FYAVHHHgHDT0CDXu7kaYK2ru9Q=";
   };
 
   vendorHash = "sha256-udLOOjBMLZ38jrX/7r+hmiUr/k6gxU0Sypo6S0ezep0=";

From 702478b8df4cfee26e672d80b37fedf3a3efa6cc Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 5 Feb 2026 23:02:09 +0100
Subject: [PATCH 04/33] ue4demos: drop

---
 pkgs/games/ue4demos/default.nix | 212 --------------------------------
 pkgs/top-level/aliases.nix      |   1 +
 pkgs/top-level/all-packages.nix |   2 -
 3 files changed, 1 insertion(+), 214 deletions(-)
 delete mode 100644 pkgs/games/ue4demos/default.nix

diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix
deleted file mode 100644
index 852e9a847c68..000000000000
--- a/pkgs/games/ue4demos/default.nix
+++ /dev/null
@@ -1,212 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  unzip,
-  patchelf,
-  libxxf86vm,
-  libxext,
-  openal,
-}:
-
-let
-  urls = file: [
-    # Untrusted mirrors - do not update hashes
-    "https://ludios.org/mirror/ue4demos/${file}"
-    "https://web.archive.org/web/20140824192039/http://ue4linux.raxxy.com/${file}"
-  ];
-
-  buildDemo =
-    { name, src }:
-    stdenv.mkDerivation rec {
-      inherit name src;
-
-      nativeBuildInputs = [
-        unzip
-        patchelf
-      ];
-
-      rtdeps =
-        lib.makeLibraryPath [
-          libxxf86vm
-          libxext
-          openal
-        ]
-        + ":"
-        + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];
-
-      buildCommand = ''
-        mkdir -p "$out"
-        cd $out
-        unzip $src
-
-        interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)
-        binary=$(find . -executable -type f)
-        patchelf \
-          --set-interpreter $interpreter \
-          --set-rpath ${rtdeps} \
-          "$binary"
-
-        # Workaround on
-        # LogLinuxPlatformFile:Warning: open('/nix/store/hash-ue4demos-demo/demo/demo/Saved/Config/CleanSourceConfigs/Engine.ini', Flags=0x00080241) failed: errno=2 (No such file or directory)
-        # for Vehicle, Shooter and Strategy games.
-        ls | grep ' ' && $(
-          haxname=$(ls | grep ' ' | sed 's/ //g'); \
-          haxpath=$(ls | grep ' ')/$haxname/Saved; \
-          mkdir -p "$haxpath"/Config/CleanSourceConfigs; \
-          ln -s /dev/null "$haxpath"/Config/CleanSourceConfigs/Engine.ini; \
-          mkdir -p "$haxpath"/Logs; \
-          ln -s /dev/null "$haxpath"/Logs/$haxname.log)
-
-        # Executables are buried under a varied paths across demos.
-        mkdir bin
-        cd bin
-        ln -s "$out/$binary" $(basename "$out/$binary")
-      '';
-
-      meta = {
-        description = "Unreal Engine 4 Linux demos";
-        homepage = "https://wiki.unrealengine.com/Linux_Demos";
-        platforms = [ "x86_64-linux" ];
-        license = lib.licenses.unfree;
-      };
-    };
-
-in
-{
-  tappy_chicken = buildDemo {
-    name = "ue4demos-tappy_chicken";
-    src = fetchurl {
-      urls = urls "tappy_chicken.zip";
-      sha256 = "0lwhvk3lpb2r5ng2cnzk7fpjj5lwhy2sch1a8v154x1xfhfb3h4v";
-    };
-  };
-
-  swing_ninja = buildDemo {
-    name = "ue4demos-swing_ninja";
-    src = fetchurl {
-      urls = urls "swing_ninja.zip";
-      sha256 = "1bmgqqk3lda5h7nnqi59jgyrsn0clr3xs0k1jclnqf9fk0m8hjcv";
-    };
-  };
-
-  card_game = buildDemo {
-    name = "ue4demos-card_game";
-    src = fetchurl {
-      urls = urls "card_game.zip";
-      sha256 = "154baqias5q7kad0c89k35jbmnmlm865sll02mi7bk1yllcckz5z";
-    };
-  };
-
-  vehicle_game = buildDemo {
-    name = "ue4demos-vehicle_game";
-    src = fetchurl {
-      urls = urls "vehicle_game.zip";
-      sha256 = "03dlacf1iv7sgn7pl3sx9r6243wy8fsi2kd858syfm9slg0190bs";
-    };
-  };
-
-  shooter_game = buildDemo {
-    name = "ue4demos-shooter_game";
-    src = fetchurl {
-      urls = urls "shooter_game.zip";
-      sha256 = "1bk32k349iqbqk8x8jffnqq0pjiqmvrvv675xxmlvkkr8qrlhz98";
-    };
-  };
-
-  strategy_game = buildDemo {
-    name = "ue4demos-strategy_game";
-    src = fetchurl {
-      urls = urls "strategy_game.zip";
-      sha256 = "1p7i966v1ssm20y12g4wsccpgnky3szy19qyjlacynk7bgbk6lg7";
-    };
-  };
-
-  black_jack = buildDemo {
-    name = "ue4demos-black_jack";
-    src = fetchurl {
-      urls = urls "black_jack.zip";
-      sha256 = "0g52wkzn5isa3az32y25yx5b56wxks97pajqwkmm6gf4qpkfksxv";
-    };
-  };
-
-  landscape_mountains = buildDemo {
-    name = "ue4demos-landscape_mountains";
-    src = fetchurl {
-      urls = urls "landscape_mountains.zip";
-      sha256 = "14jzajhs3cpydvf3ag7lpj4hkpbjpwnn3xkdvdx92fi0pcl8cwym";
-    };
-  };
-
-  matinee_demo = buildDemo {
-    name = "ue4demos-matinee_demo";
-    src = fetchurl {
-      urls = urls "matinee_demo.zip";
-      sha256 = "0ib8k6fl15cxzdarar2sqq5v3g3c7p2jidkdjd00nym6cvkibb4d";
-    };
-  };
-
-  elemental_demo = buildDemo {
-    name = "ue4demos-elemental_demo";
-    src = fetchurl {
-      urls = urls "elemental_demo.zip";
-      sha256 = "1v4jdsy8jvv8wgc8dx17q17xigfrya5q0nfdzw4md7fzm3bg9z0v";
-    };
-  };
-
-  effects_cave_demo = buildDemo {
-    name = "ue4demos-effects_cave_demo";
-    src = fetchurl {
-      urls = urls "effects_cave_demo.zip";
-      sha256 = "0lvd3aaha2x9pnpkdmrzi6nf7hymr95834z3l8shygjf9kbbzsz4";
-    };
-  };
-
-  realistic_rendering = buildDemo {
-    name = "ue4demos-realistic_rendering";
-    src = fetchurl {
-      urls = urls "realistic_rendering_demo.zip";
-      sha256 = "0r16nznkv475hkw5rnngqsc69ch8vh86dppyyyr9nn43dkr2110a";
-    };
-  };
-
-  reflections_subway = buildDemo {
-    name = "ue4demos-reflections_subway";
-    src = fetchurl {
-      urls = urls "reflections_subway_demo.zip";
-      sha256 = "0dw5sm7405gxw9iqz0vpnhdprrb4wl5i14pvzl1381k973m8bd00";
-    };
-  };
-
-  scifi_hallway_demo = buildDemo {
-    name = "ue4demos-scifi_hallway_demo";
-    src = fetchurl {
-      urls = urls "sci-fi_hallway_demo.zip";
-      sha256 = "14qp9iwm47awn8d9j6ijh6cnds308x60xs4vi2fvz2666jlz1pq2";
-    };
-  };
-
-  mobile_temple_demo = buildDemo {
-    name = "ue4demos-mobile_temple_demo";
-    src = fetchurl {
-      urls = urls "mobile_temple_demo.zip";
-      sha256 = "12bz4h1b9lhmqglwsa6r8q48ijqbjdha9fql31540d01kigaka75";
-    };
-  };
-
-  stylized_demo = buildDemo {
-    name = "ue4demos-stylized_demo";
-    src = fetchurl {
-      urls = urls "stylized_demo.zip";
-      sha256 = "1676ridmj8rk4y4hbdscfnnka5l636av1xxl0qwvk236kq9j7v0l";
-    };
-  };
-
-  blueprint_examples_demo = buildDemo {
-    name = "ue4demos-blueprint_examples_demo";
-    src = fetchurl {
-      urls = urls "blueprint_examples_demo.zip";
-      sha256 = "076q33h2hy965fvr805hsprkpcmizf638lj2ik8k923v86b15nbv";
-    };
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e22b79149c0e..3b62e3e0fade 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1829,6 +1829,7 @@ mapAliases {
   uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11
   ubuntu_font_family = throw "'ubuntu_font_family' has been renamed to/replaced by 'ubuntu-classic'"; # Converted to throw 2025-10-27
   udisks2 = udisks; # Added 2025-10-30
+  ue4demos = throw "'ue4demos' has been removed because it is unmaintained"; # Added 2026-02-07
   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
   unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 968fec3c04b1..26e506045dbd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11935,8 +11935,6 @@ with pkgs;
 
   ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };
 
-  ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { });
-
   # To ensure vdrift's code is built on hydra
   vdrift-bin = vdrift.bin;
 

From 3e2552d8e4dcd5572136f383a4027e9f30c50722 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 8 Feb 2026 00:36:16 +0300
Subject: [PATCH 05/33] miniupnpd: enable IGDv2 support

Needed for IPv6 pinholing. The internet will tell you that this
breaks Microsoft clients, but miniupnpd is actually smart and will
automatically detect Microsoft User-Agents and pretend to be IGDv1.

Yay Windows.
---
 pkgs/tools/networking/miniupnpd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 913b123cc9bb..6f9b25a62681 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -81,6 +81,7 @@ stdenv.mkDerivation rec {
     "--firewall=${firewall}"
     # allow using various config options
     "--ipv6"
+    "--igd2"
     "--leasefile"
     "--regex"
     "--vendorcfg"

From 4bb4fd61eb6e372782ef1aafbf927c055ab2f2c5 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sun, 8 Feb 2026 11:32:27 +0100
Subject: [PATCH 06/33] lastools: rename from LAStools

rename to lowercase to fit package naming conventions
---
 pkgs/by-name/la/{LAStools => lastools}/drop-64-suffix.patch | 0
 pkgs/by-name/la/{LAStools => lastools}/package.nix          | 2 +-
 pkgs/development/python-modules/cgal/default.nix            | 4 ++--
 pkgs/top-level/aliases.nix                                  | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename pkgs/by-name/la/{LAStools => lastools}/drop-64-suffix.patch (100%)
 rename pkgs/by-name/la/{LAStools => lastools}/package.nix (97%)

diff --git a/pkgs/by-name/la/LAStools/drop-64-suffix.patch b/pkgs/by-name/la/lastools/drop-64-suffix.patch
similarity index 100%
rename from pkgs/by-name/la/LAStools/drop-64-suffix.patch
rename to pkgs/by-name/la/lastools/drop-64-suffix.patch
diff --git a/pkgs/by-name/la/LAStools/package.nix b/pkgs/by-name/la/lastools/package.nix
similarity index 97%
rename from pkgs/by-name/la/LAStools/package.nix
rename to pkgs/by-name/la/lastools/package.nix
index 35da3703adb5..e66f3144d4e2 100644
--- a/pkgs/by-name/la/LAStools/package.nix
+++ b/pkgs/by-name/la/lastools/package.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "LAStools";
+  pname = "lastools";
   version = "2.0.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/cgal/default.nix b/pkgs/development/python-modules/cgal/default.nix
index cc34575d0018..127651984f31 100644
--- a/pkgs/development/python-modules/cgal/default.nix
+++ b/pkgs/development/python-modules/cgal/default.nix
@@ -11,7 +11,7 @@
   cmake,
   gmp,
   onetbb,
-  LAStools,
+  lastools,
   eigen,
   mpfr,
   numpy,
@@ -60,7 +60,7 @@ buildPythonPackage rec {
     eigen
   ]
   ++ lib.optionals withLAS [
-    LAStools
+    lastools
   ];
 
   dependencies = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 45239bd1f633..b1e9f6aef2d8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -952,6 +952,7 @@ mapAliases {
   lanzaboote-tool = throw "lanzaboote-tool has been removed due to lack of integration maintenance with nixpkgs. Consider using the Nix expressions provided by https://github.com/nix-community/lanzaboote"; # Added 2025-07-23
   larynx = throw "'larynx' has been renamed to/replaced by 'piper-tts'"; # Converted to throw 2025-10-27
   lash = throw "'lash' has been removed, as it is unmaintained upstream"; # Added 2026-01-02
+  LAStools = lastools; # Added 2026-02-08
   LASzip2 = throw "'LASzip2' has been renamed to/replaced by 'laszip_2'"; # Converted to throw 2025-10-27
   LASzip = throw "'LASzip' has been renamed to/replaced by 'laszip'"; # Converted to throw 2025-10-27
   latinmodern-math = throw "'latinmodern-math' has been renamed to/replaced by 'lmmath'"; # Converted to throw 2025-10-27

From f7dced43deb65b35af64688d876fbdc77863d6ca Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sun, 8 Feb 2026 20:43:48 +0100
Subject: [PATCH 07/33] mini-httpd: rename from miniHttpd

fit attrname to pname
---
 pkgs/by-name/mi/{miniHttpd => mini-httpd}/package.nix | 0
 pkgs/top-level/aliases.nix                            | 1 +
 2 files changed, 1 insertion(+)
 rename pkgs/by-name/mi/{miniHttpd => mini-httpd}/package.nix (100%)

diff --git a/pkgs/by-name/mi/miniHttpd/package.nix b/pkgs/by-name/mi/mini-httpd/package.nix
similarity index 100%
rename from pkgs/by-name/mi/miniHttpd/package.nix
rename to pkgs/by-name/mi/mini-httpd/package.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 45239bd1f633..dd429058911a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1254,6 +1254,7 @@ mapAliases {
   minetest-touch = throw "'minetest-touch' has been renamed to/replaced by 'luanti-client'"; # Converted to throw 2025-10-27
   minetestclient = throw "'minetestclient' has been renamed to/replaced by 'luanti-client'"; # Converted to throw 2025-10-27
   minetestserver = throw "'minetestserver' has been renamed to/replaced by 'luanti-server'"; # Converted to throw 2025-10-27
+  miniHttpd = mini-httpd; # Added 2026-02-08
   minio_legacy_fs = throw "'minio_legacy_fs' has been removed, migrate your data and use 'minio'"; # Added 2026-02-02
   minizincide = warnAlias "'minizincide' has been renamed to 'minizinc-ide'" minizinc-ide; # Added 2026-01-03
   minizip2 = throw "'minizip2' has been renamed to/replaced by 'minizip-ng'"; # Converted to throw 2025-10-27

From dc500a71cbe60fcf1d0bb01369b79adc02a6bd4d Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:27 +0100
Subject: [PATCH 08/33] timemachine: move NIX_LDFLAGS into env for
 structuredAttrs

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

diff --git a/pkgs/by-name/ti/timemachine/package.nix b/pkgs/by-name/ti/timemachine/package.nix
index 53a088d01167..72f4afa55e41 100644
--- a/pkgs/by-name/ti/timemachine/package.nix
+++ b/pkgs/by-name/ti/timemachine/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   preConfigure = "./autogen.sh";
 
-  NIX_LDFLAGS = "-lm";
+  env.NIX_LDFLAGS = "-lm";
 
   meta = {
     description = "JACK audio recorder";

From 63f136951acfc063fff34fb6caff3bfae0cbea23 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:28 +0100
Subject: [PATCH 09/33] transgui: move NIX_LDFLAGS into env for structuredAttrs

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

diff --git a/pkgs/by-name/tr/transgui/package.nix b/pkgs/by-name/tr/transgui/package.nix
index d2dfc2078473..de87527c1129 100644
--- a/pkgs/by-name/tr/transgui/package.nix
+++ b/pkgs/by-name/tr/transgui/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     openssl
   ];
 
-  NIX_LDFLAGS = ''
+  env.NIX_LDFLAGS = ''
     -L${lib.getLib stdenv.cc.cc}/lib -lX11 -lglib-2.0 -lgtk-x11-2.0
     -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpango-1.0 -latk-1.0 -lcairo
     -lc -lcrypto
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     "INSTALL_PREFIX=$(out)"
   ];
 
-  LCL_PLATFORM = "gtk2";
+  env.LCL_PLATFORM = "gtk2";
 
   desktopItem = makeDesktopItem {
     name = pname;

From c406749443039a3c2eda073b2521a2ca0296c94d Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:28 +0100
Subject: [PATCH 10/33] trickle: move NIX_LDFLAGS into env for structuredAttrs

---
 pkgs/by-name/tr/trickle/package.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/tr/trickle/package.nix b/pkgs/by-name/tr/trickle/package.nix
index 822c250c1ad7..f1d606714a0f 100644
--- a/pkgs/by-name/tr/trickle/package.nix
+++ b/pkgs/by-name/tr/trickle/package.nix
@@ -44,14 +44,16 @@ stdenv.mkDerivation {
     sed -i 's|^_select(int|select(int|' trickle-overload.c
   '';
 
-  NIX_LDFLAGS = [
-    "-levent"
-    "-ltirpc"
-  ];
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-I${libtirpc.dev}/include/tirpc"
-    "-Wno-error=incompatible-pointer-types"
-  ];
+  env = {
+    NIX_LDFLAGS = toString [
+      "-levent"
+      "-ltirpc"
+    ];
+    NIX_CFLAGS_COMPILE = toString [
+      "-I${libtirpc.dev}/include/tirpc"
+      "-Wno-error=incompatible-pointer-types"
+    ];
+  };
 
   configureFlags = [ "--with-libevent" ];
 

From 42e732bd175191075073bd8a9fa8535914ef9d99 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:28 +0100
Subject: [PATCH 11/33] unicorn-angr: move NIX_LDFLAGS into env for
 structuredAttrs

---
 pkgs/by-name/un/unicorn-angr/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/un/unicorn-angr/package.nix b/pkgs/by-name/un/unicorn-angr/package.nix
index bb076522518d..061b9120ec04 100644
--- a/pkgs/by-name/un/unicorn-angr/package.nix
+++ b/pkgs/by-name/un/unicorn-angr/package.nix
@@ -23,8 +23,10 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  # Ensure the linker is using atomic when compiling for RISC-V, otherwise fails
-  NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";
+  env = lib.optionalAttrs stdenv.hostPlatform.isRiscV {
+    # Ensure the linker is using atomic when compiling for RISC-V, otherwise fails
+    NIX_LDFLAGS = "-latomic";
+  };
 
   cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
     # Some x86 tests are interrupted by signal 10

From 4060dceed6fb67b3ac8aafb06047959caa6dd55d Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:28 +0100
Subject: [PATCH 12/33] unicorn: move NIX_LDFLAGS into env for structuredAttrs

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

diff --git a/pkgs/by-name/un/unicorn/package.nix b/pkgs/by-name/un/unicorn/package.nix
index 54d524e33ff8..156ca182d110 100644
--- a/pkgs/by-name/un/unicorn/package.nix
+++ b/pkgs/by-name/un/unicorn/package.nix
@@ -26,8 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
     cctools
   ];
 
-  # Ensure the linker is using atomic when compiling for RISC-V, otherwise fails
-  NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";
+  env = lib.optionalAttrs stdenv.hostPlatform.isRiscV {
+    # Ensure the linker is using atomic when compiling for RISC-V, otherwise fails
+    NIX_LDFLAGS = "-latomic";
+  };
 
   cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
     # Some x86 tests are interrupted by signal 10

From 3bbc249d09a23dacf7688777c0e346eceab0a49f Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:29 +0100
Subject: [PATCH 13/33] unified-memory-framework: move NIX_LDFLAGS into env for
 structuredAttrs

---
 pkgs/by-name/un/unified-memory-framework/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/un/unified-memory-framework/package.nix b/pkgs/by-name/un/unified-memory-framework/package.nix
index eee9ed639a9f..a41bf4644056 100644
--- a/pkgs/by-name/un/unified-memory-framework/package.nix
+++ b/pkgs/by-name/un/unified-memory-framework/package.nix
@@ -125,11 +125,13 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = true;
   dontUseNinjaCheck = true;
 
-  NIX_LDFLAGS = lib.optionalString finalAttrs.doCheck "-rpath ${
-    lib.makeLibraryPath [
-      onetbb
-    ]
-  }";
+  env = lib.optionalAttrs finalAttrs.doCheck {
+    NIX_LDFLAGS = "-rpath ${
+      lib.makeLibraryPath [
+        onetbb
+      ]
+    }";
+  };
 
   disabledTests = [
     # These tests try to access sysfs, which is unavailable in the sandbox

From 6bd43945f7addd2ad511e28ab2990c62b2752d7d Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:29 +0100
Subject: [PATCH 14/33] unzip: move NIX_LDFLAGS into env for structuredAttrs

---
 pkgs/by-name/un/unzip/package.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/un/unzip/package.nix b/pkgs/by-name/un/unzip/package.nix
index efe3226d6cdd..985daead4d35 100644
--- a/pkgs/by-name/un/unzip/package.nix
+++ b/pkgs/by-name/un/unzip/package.nix
@@ -79,7 +79,16 @@ stdenv.mkDerivation rec {
 
   makefile = "unix/Makefile";
 
-  NIX_LDFLAGS = "-lbz2" + lib.optionalString enableNLS " -lnatspec";
+  env = {
+    NIX_LDFLAGS = toString (
+      [
+        "-lbz2"
+      ]
+      ++ lib.optionals enableNLS [
+        "-lnatspec"
+      ]
+    );
+  };
 
   buildFlags = [
     "generic"

From e4c1311691ba6eda0d365915cc66f407878c68a1 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:29 +0100
Subject: [PATCH 15/33] vsftpd: move NIX_LDFLAGS into env for structuredAttrs

---
 pkgs/by-name/vs/vsftpd/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/vs/vsftpd/package.nix b/pkgs/by-name/vs/vsftpd/package.nix
index 1e9b8c79d155..33bca86ea867 100644
--- a/pkgs/by-name/vs/vsftpd/package.nix
+++ b/pkgs/by-name/vs/vsftpd/package.nix
@@ -56,7 +56,14 @@ stdenv.mkDerivation (finalAttrs: {
     "CC=${stdenv.cc.targetPrefix}cc"
   ];
 
-  NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap -lseccomp";
+  env.NIX_LDFLAGS = toString [
+    "-lcrypt"
+    "-lssl"
+    "-lcrypto"
+    "-lpam"
+    "-lcap"
+    "-lseccomp"
+  ];
 
   enableParallelBuilding = true;
 

From bec1542e49e89bf01f0fb4cf643cb9a2b9ad8ad9 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:29 +0100
Subject: [PATCH 16/33] watchexec: move NIX_LDFLAGS into env for
 structuredAttrs

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

diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix
index e43e6c7ccf1c..d3553f90056f 100644
--- a/pkgs/by-name/wa/watchexec/package.nix
+++ b/pkgs/by-name/wa/watchexec/package.nix
@@ -22,7 +22,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AppKit";
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    NIX_LDFLAGS = toString [
+      "-framework"
+      "AppKit"
+    ];
+  };
 
   checkFlags = [
     "--skip=help"

From cc71ee181f007e677f672ece648c3b0b0eb39a66 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:30 +0100
Subject: [PATCH 17/33] x11spice: move NIX_LDFLAGS into env for structuredAttrs

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

diff --git a/pkgs/by-name/x1/x11spice/package.nix b/pkgs/by-name/x1/x11spice/package.nix
index 1e3d42e4dc31..df02a65b80a7 100644
--- a/pkgs/by-name/x1/x11spice/package.nix
+++ b/pkgs/by-name/x1/x11spice/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
     spice-protocol
   ];
 
-  NIX_LDFLAGS = "-lpthread";
+  env.NIX_LDFLAGS = "-lpthread";
 
   meta = {
     description = "Enable a running X11 desktop to be available via a Spice server";

From f4bfc71397e8d681498d848b6fc5c9eb38890f55 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:30 +0100
Subject: [PATCH 18/33] xdg-user-dirs: move NIX_LDFLAGS into env for
 structuredAttrs

---
 pkgs/by-name/xd/xdg-user-dirs/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/xd/xdg-user-dirs/package.nix b/pkgs/by-name/xd/xdg-user-dirs/package.nix
index c0423a044442..3b87f75c7f07 100644
--- a/pkgs/by-name/xd/xdg-user-dirs/package.nix
+++ b/pkgs/by-name/xd/xdg-user-dirs/package.nix
@@ -37,7 +37,9 @@ stdenv.mkDerivation (finalAttrs: {
     libintl
   ];
 
-  NIX_LDFLAGS = if stdenv.isDarwin then "-liconv" else null;
+  env = lib.optionalAttrs stdenv.isDarwin {
+    NIX_LDFLAGS = "-liconv";
+  };
 
   preFixup = ''
     # fallback values need to be last

From f8639d652ddeae19589e238995bd6ea7a187e74e Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:30 +0100
Subject: [PATCH 19/33] xfitter: move NIX_LDFLAGS into env for structuredAttrs

---
 pkgs/by-name/xf/xfitter/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/xf/xfitter/package.nix b/pkgs/by-name/xf/xfitter/package.nix
index c867258bbaee..57530ebc6768 100644
--- a/pkgs/by-name/xf/xfitter/package.nix
+++ b/pkgs/by-name/xf/xfitter/package.nix
@@ -66,10 +66,10 @@ stdenv.mkDerivation {
                      'cmake_minimum_required(VERSION 3.10)'
   '';
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString (
-    stdenv.hostPlatform.libc == "glibc"
-  ) "-I${libtirpc.dev}/include/tirpc";
-  NIX_LDFLAGS = lib.optional (stdenv.hostPlatform.libc == "glibc") "-ltirpc";
+  env = lib.optionalAttrs (stdenv.hostPlatform.libc == "glibc") {
+    NIX_CFLAGS_COMPILE = "-I${libtirpc.dev}/include/tirpc";
+    NIX_LDFLAGS = "-ltirpc";
+  };
 
   hardeningDisable = [ "format" ];
 

From 52ed34f1f1673c5215baee3ebbab55d1e65fc7b0 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:30 +0100
Subject: [PATCH 20/33] xidel: move NIX_LDFLAGS into env for structuredAttrs

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

diff --git a/pkgs/by-name/xi/xidel/package.nix b/pkgs/by-name/xi/xidel/package.nix
index b28e17732440..703b77bf50b1 100644
--- a/pkgs/by-name/xi/xidel/package.nix
+++ b/pkgs/by-name/xi/xidel/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ fpc ];
   buildInputs = [ openssl ];
 
-  NIX_LDFLAGS = [ "-lcrypto" ];
+  env.NIX_LDFLAGS = toString [ "-lcrypto" ];
 
   patchPhase = ''
     patchShebangs \

From e8eda602574083e1de8aecc8c95cd38754ae3868 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:30 +0100
Subject: [PATCH 21/33] xmlsec: move NIX_LDFLAGS into env for structuredAttrs

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

diff --git a/pkgs/by-name/xm/xmlsec/package.nix b/pkgs/by-name/xm/xmlsec/package.nix
index 0d0d713b443a..abf6cf39530e 100644
--- a/pkgs/by-name/xm/xmlsec/package.nix
+++ b/pkgs/by-name/xm/xmlsec/package.nix
@@ -79,7 +79,7 @@ lib.fix (
     configureFlags = [ "--enable-soap" ];
 
     # otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909
-    NIX_LDFLAGS = "-lgcrypt";
+    env.NIX_LDFLAGS = "-lgcrypt";
 
     postInstall = ''
       moveToOutput "bin/xmlsec1-config" "$dev"

From 3bfa7f21d3508dc005d60a8b11e234b547866f6b Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:31 +0100
Subject: [PATCH 22/33] zlcompressor: move NIX_LDFLAGS into env for
 structuredAttrs

---
 pkgs/by-name/zl/zlcompressor/package.nix | 37 ++++++++++++------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/zl/zlcompressor/package.nix b/pkgs/by-name/zl/zlcompressor/package.nix
index 2ed0c224ed06..1504f955d070 100644
--- a/pkgs/by-name/zl/zlcompressor/package.nix
+++ b/pkgs/by-name/zl/zlcompressor/package.nix
@@ -67,24 +67,25 @@ clangStdenv.mkDerivation (finalAttrs: {
   ];
 
   # JUCE dlopen's these at runtime, crashes without them
-  NIX_LDFLAGS = lib.optionalString clangStdenv.hostPlatform.isLinux (toString [
-    "-lX11"
-    "-lXext"
-    "-lXcursor"
-    "-lXinerama"
-    "-lXrandr"
-  ]);
-
-  env.NIX_CFLAGS_COMPILE = lib.optionalString clangStdenv.hostPlatform.isLinux (toString [
-    # juce, compiled in this build as part of a Git submodule, uses `-flto` as
-    # a Link Time Optimization flag, and instructs the plugin compiled here to
-    # use this flag to. This breaks the build for us. Using _fat_ LTO allows
-    # successful linking while still providing LTO benefits. If our build of
-    # `juce` was used as a dependency, we could have patched that `-flto` line
-    # in our juce's source, but that is not possible because it is used as a
-    # Git Submodule.
-    "-ffat-lto-objects"
-  ]);
+  env = lib.optionalAttrs clangStdenv.hostPlatform.isLinux {
+    NIX_LDFLAGS = toString [
+      "-lX11"
+      "-lXext"
+      "-lXcursor"
+      "-lXinerama"
+      "-lXrandr"
+    ];
+    NIX_CFLAGS_COMPILE = toString [
+      # juce, compiled in this build as part of a Git submodule, uses `-flto` as
+      # a Link Time Optimization flag, and instructs the plugin compiled here to
+      # use this flag to. This breaks the build for us. Using _fat_ LTO allows
+      # successful linking while still providing LTO benefits. If our build of
+      # `juce` was used as a dependency, we could have patched that `-flto` line
+      # in our juce's source, but that is not possible because it is used as a
+      # Git Submodule.
+      "-ffat-lto-objects"
+    ];
+  };
 
   cmakeFlags = [
     # see: https://github.com/ZL-Audio/ZlEqualizer#clone-and-build

From 23b1a1d6d756bf84cb7ca67f1180cfad365e9e23 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:31 +0100
Subject: [PATCH 23/33] zlequalizer: move NIX_LDFLAGS into env for
 structuredAttrs

---
 pkgs/by-name/zl/zlequalizer/package.nix | 38 +++++++++++++------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/zl/zlequalizer/package.nix b/pkgs/by-name/zl/zlequalizer/package.nix
index fd7ef5e529f1..3a3273a5f5b0 100644
--- a/pkgs/by-name/zl/zlequalizer/package.nix
+++ b/pkgs/by-name/zl/zlequalizer/package.nix
@@ -66,25 +66,27 @@ clangStdenv.mkDerivation (finalAttrs: {
     libxkbcommon
   ];
 
-  # JUCE dlopen's these at runtime, crashes without them
-  NIX_LDFLAGS = lib.optionalString clangStdenv.hostPlatform.isLinux (toString [
-    "-lX11"
-    "-lXext"
-    "-lXcursor"
-    "-lXinerama"
-    "-lXrandr"
-  ]);
+  env = lib.optionalAttrs clangStdenv.hostPlatform.isLinux {
+    # JUCE dlopen's these at runtime, crashes without them
+    NIX_LDFLAGS = toString [
+      "-lX11"
+      "-lXext"
+      "-lXcursor"
+      "-lXinerama"
+      "-lXrandr"
+    ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString clangStdenv.hostPlatform.isLinux (toString [
-    # juce, compiled in this build as part of a Git submodule, uses `-flto` as
-    # a Link Time Optimization flag, and instructs the plugin compiled here to
-    # use this flag to. This breaks the build for us. Using _fat_ LTO allows
-    # successful linking while still providing LTO benefits. If our build of
-    # `juce` was used as a dependency, we could have patched that `-flto` line
-    # in our juce's source, but that is not possible because it is used as a
-    # Git Submodule.
-    "-ffat-lto-objects"
-  ]);
+    NIX_CFLAGS_COMPILE = toString [
+      # juce, compiled in this build as part of a Git submodule, uses `-flto` as
+      # a Link Time Optimization flag, and instructs the plugin compiled here to
+      # use this flag to. This breaks the build for us. Using _fat_ LTO allows
+      # successful linking while still providing LTO benefits. If our build of
+      # `juce` was used as a dependency, we could have patched that `-flto` line
+      # in our juce's source, but that is not possible because it is used as a
+      # Git Submodule.
+      "-ffat-lto-objects"
+    ];
+  };
 
   cmakeFlags = [
     # see: https://github.com/ZL-Audio/ZLEqualizer#clone-and-build

From d072efb750ef93359d723a92cfd368bea6d41021 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:31 +0100
Subject: [PATCH 24/33] zlsplitter: move NIX_LDFLAGS into env for
 structuredAttrs

---
 pkgs/by-name/zl/zlsplitter/package.nix | 39 +++++++++++++-------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/zl/zlsplitter/package.nix b/pkgs/by-name/zl/zlsplitter/package.nix
index 64fa5d3e0aa0..de6dea6f1d4d 100644
--- a/pkgs/by-name/zl/zlsplitter/package.nix
+++ b/pkgs/by-name/zl/zlsplitter/package.nix
@@ -66,25 +66,26 @@ clangStdenv.mkDerivation (finalAttrs: {
     libxkbcommon
   ];
 
-  # JUCE dlopen's these at runtime, crashes without them
-  NIX_LDFLAGS = lib.optionalString clangStdenv.hostPlatform.isLinux (toString [
-    "-lX11"
-    "-lXext"
-    "-lXcursor"
-    "-lXinerama"
-    "-lXrandr"
-  ]);
-
-  env.NIX_CFLAGS_COMPILE = lib.optionalString clangStdenv.hostPlatform.isLinux (toString [
-    # juce, compiled in this build as part of a Git submodule, uses `-flto` as
-    # a Link Time Optimization flag, and instructs the plugin compiled here to
-    # use this flag to. This breaks the build for us. Using _fat_ LTO allows
-    # successful linking while still providing LTO benefits. If our build of
-    # `juce` was used as a dependency, we could have patched that `-flto` line
-    # in our juce's source, but that is not possible because it is used as a
-    # Git Submodule.
-    "-ffat-lto-objects"
-  ]);
+  env = lib.optionalAttrs clangStdenv.hostPlatform.isLinux {
+    # JUCE dlopen's these at runtime, crashes without them
+    NIX_LDFLAGS = toString [
+      "-lX11"
+      "-lXext"
+      "-lXcursor"
+      "-lXinerama"
+      "-lXrandr"
+    ];
+    NIX_CFLAGS_COMPILE = toString [
+      # juce, compiled in this build as part of a Git submodule, uses `-flto` as
+      # a Link Time Optimization flag, and instructs the plugin compiled here to
+      # use this flag to. This breaks the build for us. Using _fat_ LTO allows
+      # successful linking while still providing LTO benefits. If our build of
+      # `juce` was used as a dependency, we could have patched that `-flto` line
+      # in our juce's source, but that is not possible because it is used as a
+      # Git Submodule.
+      "-ffat-lto-objects"
+    ];
+  };
 
   cmakeFlags = [
     # see: https://github.com/ZL-Audio/ZlEqualizer#clone-and-build

From b82b664ff78f0c3240510fdbf9858037ec3e32ed Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:31 +0100
Subject: [PATCH 25/33] zrythm: move NIX_LDFLAGS into env for structuredAttrs

---
 pkgs/by-name/zr/zrythm/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/zr/zrythm/package.nix b/pkgs/by-name/zr/zrythm/package.nix
index df928b135fd3..815fd6f3c795 100644
--- a/pkgs/by-name/zr/zrythm/package.nix
+++ b/pkgs/by-name/zr/zrythm/package.nix
@@ -178,11 +178,14 @@ stdenv.mkDerivation (finalAttrs: {
     # "-Duser_manual=true" # needs sphinx-intl
   ];
 
-  NIX_LDFLAGS = ''
-    -lfftw3_threads -lfftw3f_threads
-  '';
+  env = {
+    NIX_LDFLAGS = toString [
+      "-lfftw3_threads"
+      "-lfftw3f_threads"
+    ];
 
-  GUILE_AUTO_COMPILE = 0;
+    GUILE_AUTO_COMPILE = 0;
+  };
 
   dontStrip = true;
 

From fa4d1c121f7f87a5eaba66332e34af5f3b236c6e Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 2 Feb 2026 00:15:53 +0100
Subject: [PATCH 26/33] tora: move NIX_LDFLAGS into env for structuredAttrs

---
 pkgs/development/tools/tora/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix
index ad8fef2839c1..ce8fc1d8ea23 100644
--- a/pkgs/development/tools/tora/default.nix
+++ b/pkgs/development/tools/tora/default.nix
@@ -70,7 +70,13 @@ stdenv.mkDerivation {
   ];
 
   # these libraries are only searched for at runtime so we need to force-link them
-  NIX_LDFLAGS = "-lgvc -lmysqlclient -lecpg -lssl -L${libmysqlclient}/lib/mariadb";
+  env.NIX_LDFLAGS = toString [
+    "-lgvc"
+    "-lmysqlclient"
+    "-lecpg"
+    "-lssl"
+    "-L${libmysqlclient}/lib/mariadb"
+  ];
 
   qtWrapperArgs = [
     "--prefix PATH : ${lib.getBin graphviz}/bin"

From 23f65fbb66f9cec693619a1245e8e74225ccf9db Mon Sep 17 00:00:00 2001
From: redianthus <l@ndrs.fr>
Date: Mon, 9 Feb 2026 02:21:18 +0100
Subject: [PATCH 27/33] ocamlPackages.symex: init at 0.1

---
 .../ocaml-modules/symex/default.nix           | 33 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/symex/default.nix

diff --git a/pkgs/development/ocaml-modules/symex/default.nix b/pkgs/development/ocaml-modules/symex/default.nix
new file mode 100644
index 000000000000..38f3405c521d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/symex/default.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildDunePackage,
+  fetchFromGitHub,
+  fmt,
+  prelude,
+  smtml,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "symex";
+  version = "0.1";
+
+  src = fetchFromGitHub {
+    owner = "ocamlpro";
+    repo = "symex";
+    tag = finalAttrs.version;
+    hash = "sha256-jKwFtxVcBD8Y1bfKRB8Z/MSeQLQWKvk00i8HqodkBbM=";
+  };
+
+  propagatedBuildInputs = [
+    fmt
+    prelude
+    smtml
+  ];
+
+  meta = {
+    description = "Primitives to write symbolic execution engines";
+    homepage = "https://github.com/ocamlpro/symex";
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ redianthus ];
+  };
+})
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 93228129e5f2..711c52f3d305 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -2041,6 +2041,8 @@ let
 
         swhid_core = callPackage ../development/ocaml-modules/swhid_core { };
 
+        symex = callPackage ../development/ocaml-modules/symex { };
+
         synchronizer = callPackage ../development/ocaml-modules/synchronizer { };
 
         syslog = callPackage ../development/ocaml-modules/syslog { };

From e04ff8033f9401d518f770650dc23d4eb8414ec9 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 9 Feb 2026 02:54:13 +0100
Subject: [PATCH 28/33] noto-fonts: avoid using an env variable

This avoids polluting the environment and makes
tracking cleanup for __structuredAttrs easier.
---
 pkgs/by-name/no/noto-fonts/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix
index 8dbfc26dab38..68a6b989913a 100644
--- a/pkgs/by-name/no/noto-fonts/package.nix
+++ b/pkgs/by-name/no/noto-fonts/package.nix
@@ -17,15 +17,17 @@
     weights, and freely available to all.
   '',
 }:
-
-stdenvNoCC.mkDerivation rec {
+let
+  _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants;
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "noto-fonts${suffix}";
   version = "2026.02.01";
 
   src = fetchFromGitHub {
     owner = "notofonts";
     repo = "notofonts.github.io";
-    rev = "noto-monthly-release-${version}";
+    tag = "noto-monthly-release-${finalAttrs.version}";
     hash = "sha256-vhu3jojG6QlgY5gP4bCbpJznsQ1gExAfcRT42FcZUp4=";
   };
 
@@ -34,8 +36,6 @@ stdenvNoCC.mkDerivation rec {
     "megamerge" # Experimental fonts created by merging regular notofonts
   ];
 
-  _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants;
-
   installPhase = ''
     # We check availability in order of variable -> otf -> ttf
     # unhinted -- the hinted versions use autohint
@@ -61,7 +61,7 @@ stdenvNoCC.mkDerivation rec {
       ''
     else
       ''
-        for variant in $_variants; do
+        for variant in ${lib.concatStringsSep " " _variants}; do
           if [[ -d fonts/"$variant"/unhinted/variable-ttf ]]; then
             install -m444 -Dt $out_font fonts/"$variant"/unhinted/variable-ttf/*.ttf
           elif [[ -d fonts/"$variant"/unhinted/otf ]]; then
@@ -91,4 +91,4 @@ stdenvNoCC.mkDerivation rec {
       jopejoe1
     ];
   };
-}
+})

From 0f4a0cf79d7d606338a2191edea937093527868e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Feb 2026 02:10:15 +0000
Subject: [PATCH 29/33] nix-direnv: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/by-name/ni/nix-direnv/package.nix b/pkgs/by-name/ni/nix-direnv/package.nix
index 9db6efeaffbe..856cc332ce78 100644
--- a/pkgs/by-name/ni/nix-direnv/package.nix
+++ b/pkgs/by-name/ni/nix-direnv/package.nix
@@ -11,13 +11,13 @@
 # https://github.com/abathur/resholve/issues/107
 resholve.mkDerivation rec {
   pname = "nix-direnv";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-direnv";
     rev = version;
-    hash = "sha256-HdnQRcysoKNPbVa/D3KDcLgqf5+u9JDPmcl29cGj4AI=";
+    hash = "sha256-AsWnRH7LAb78iFfE+ZdYyCR5AVuPloT8ZnghDXW6arY=";
   };
 
   installPhase = ''

From 4aabd284a09662f2da2a4614cf2548fd8999da8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Feb 2026 03:06:01 +0000
Subject: [PATCH 30/33] vscode-extensions.sourcegraph.amp: 0.0.1769991964 ->
 0.0.1770596843

---
 .../editors/vscode/extensions/sourcegraph.amp/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/sourcegraph.amp/default.nix b/pkgs/applications/editors/vscode/extensions/sourcegraph.amp/default.nix
index 9abd54a7691d..e3423c6ed5af 100644
--- a/pkgs/applications/editors/vscode/extensions/sourcegraph.amp/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/sourcegraph.amp/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "sourcegraph";
     name = "amp";
-    version = "0.0.1769991964";
-    hash = "sha256-RlACEEbRZjeM1JUgAxfMlwFIo8CmrJxr1DVq1XxRdoM=";
+    version = "0.0.1770596843";
+    hash = "sha256-FLajygfJM+EPOXSU7g5I7Yo1YU7zYvTuw2cfY3B17BE=";
   };
 
   meta = {

From 5ce235f9ef14f1d68a73cc7908fed057de18bf01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 8 Feb 2026 20:16:23 -0800
Subject: [PATCH 31/33] python3Packages.pyjvcprojector: 2.0.0 -> 2.0.1

Diff: https://github.com/SteveEasley/pyjvcprojector/compare/v2.0.0...v2.0.1

Changelog: https://github.com/SteveEasley/pyjvcprojector/releases/tag/v2.0.1
---
 pkgs/development/python-modules/pyjvcprojector/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyjvcprojector/default.nix b/pkgs/development/python-modules/pyjvcprojector/default.nix
index 3fdb3414f2c3..b7bd3c02c849 100644
--- a/pkgs/development/python-modules/pyjvcprojector/default.nix
+++ b/pkgs/development/python-modules/pyjvcprojector/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyjvcprojector";
-  version = "2.0.0";
+  version = "2.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SteveEasley";
     repo = "pyjvcprojector";
     tag = "v${version}";
-    hash = "sha256-c8xhpcr8HmTDTzoGn9vwsvNl2O+EamRbG9Nf6lgqw7c=";
+    hash = "sha256-GKtBAW7opa6EQ+O3XfAi7D0V2KLWf+c+ECpBLbgVA9w=";
   };
 
   build-system = [ setuptools ];

From 34c2dc8d79e84dcf052e62abcc37a41348658dad Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 9 Feb 2026 10:01:41 +0300
Subject: [PATCH 32/33] linux_6_19: init at 6.19

---
 pkgs/os-specific/linux/kernel/kernels-org.json |  5 +++++
 pkgs/top-level/aliases.nix                     |  2 ++
 pkgs/top-level/linux-kernels.nix               | 11 ++++++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index f086165ae3e8..fa6d9bde9a48 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -33,5 +33,10 @@
         "version": "6.18.9",
         "hash": "sha256:0y05jg6126h946pac5mkl5myh573qgml1p29hinm7jxlizzia083",
         "lts": false
+    },
+    "6.19": {
+        "version": "6.19",
+        "hash": "sha256:0mqka8ii7bvmx9hvfjdiyva9ib0j7m390gxhh8gki3qb4nl7jc1h",
+        "lts": false
     }
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 972392df607f..06de344bc1db 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1096,6 +1096,7 @@ mapAliases {
   linux_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream"; # Added 2025-10-22
   linux_6_17 = linuxKernel.kernels.linux_6_17;
   linux_6_18 = linuxKernel.kernels.linux_6_18;
+  linux_6_19 = linuxKernel.kernels.linux_6_19;
   linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
   linux_hardened = linuxPackages_hardened.kernel; # Added 2025-08-10
   linux_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
@@ -1126,6 +1127,7 @@ mapAliases {
   linuxPackages_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream"; # Added 2025-10-22
   linuxPackages_6_17 = linuxKernel.packages.linux_6_17;
   linuxPackages_6_18 = linuxKernel.packages.linux_6_18;
+  linuxPackages_6_19 = linuxKernel.packages.linux_6_19;
   linuxPackages_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
   linuxPackages_hardened = linuxKernel.packages.linux_hardened; # Added 2025-08-10
   linuxPackages_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index d0273b4efa10..25903de56d17 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -204,6 +204,14 @@ in
           ];
         };
 
+        linux_6_19 = callPackage ../os-specific/linux/kernel/mainline.nix {
+          branch = "6.19";
+          kernelPatches = [
+            kernelPatches.bridge_stp_helper
+            kernelPatches.request_key_helper
+          ];
+        };
+
         linux_testing =
           let
             testing = callPackage ../os-specific/linux/kernel/mainline.nix {
@@ -730,6 +738,7 @@ in
     linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
     linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
     linux_6_18 = recurseIntoAttrs (packagesFor kernels.linux_6_18);
+    linux_6_19 = recurseIntoAttrs (packagesFor kernels.linux_6_19);
   }
   // lib.optionalAttrs config.allowAliases {
     linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21
@@ -805,7 +814,7 @@ in
   packageAliases = {
     linux_default = packages.linux_6_12;
     # Update this when adding the newest kernel major version!
-    linux_latest = packages.linux_6_18;
+    linux_latest = packages.linux_6_19;
     linux_rt_default = packages.linux_rt_5_15;
     linux_rt_latest = packages.linux_rt_6_6;
   }

From d64fcec4de522525949023e31a9510f09716bc3b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 9 Feb 2026 11:00:19 +0300
Subject: [PATCH 33/33] linuxPackages_6_19.bcachefs: allow building on kernel
 6.19

It works.
---
 pkgs/by-name/bc/bcachefs-tools/kernel-module.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix
index b9b4667a4d99..6889353cec9c 100644
--- a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix
+++ b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation {
       platforms
       ;
 
-    broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "6.19");
+    broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "6.20");
   };
 }