From e73fe64d31e8eea2d2b2349da711f248280c08f0 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Mon, 30 Jun 2025 19:21:04 -0400
Subject: [PATCH 01/54] cerberus: init at 0-unstable-2025-06-29

---
 pkgs/by-name/ce/cerberus/package.nix | 92 ++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 pkgs/by-name/ce/cerberus/package.nix

diff --git a/pkgs/by-name/ce/cerberus/package.nix b/pkgs/by-name/ce/cerberus/package.nix
new file mode 100644
index 000000000000..58e4b988930b
--- /dev/null
+++ b/pkgs/by-name/ce/cerberus/package.nix
@@ -0,0 +1,92 @@
+{
+  lib,
+  fetchFromGitHub,
+  writableTmpDirAsHomeHook,
+  unstableGitUpdater,
+  ocamlPackages,
+  opam,
+}:
+ocamlPackages.buildDunePackage {
+  pname = "cerberus";
+  version = "0-unstable-2025-06-29";
+
+  src = fetchFromGitHub {
+    owner = "rems-project";
+    repo = "cerberus";
+    rev = "61700b301f0f1fbc1940db51c50240c397759057";
+    hash = "sha256-QpgHOQqiJMlMf2RH5/TI3AirdqYPS7HwE9YIlxgorqg=";
+  };
+
+  minimalOCamlVersion = "4.12";
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    opam
+    writableTmpDirAsHomeHook
+    ocamlPackages.lem
+    ocamlPackages.menhir
+  ];
+
+  buildInputs = with ocamlPackages; [
+    sha
+    pprint
+    cmdliner
+    yojson
+    lem
+    result
+    ppx_deriving
+    zarith
+    sexplib
+    menhirLib
+    janeStreet.ppx_sexp_conv
+  ];
+
+  env.OPAM_SWITCH_PREFIX = placeholder "out";
+  buildPhase = ''
+    runHook preBuild
+
+    make Q= cerberus
+
+    runHook postBuild
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    PATH="$out/bin":$PATH
+
+    patchShebangs --build tests
+
+    tests/run-ci.sh
+
+    runHook postInstallCheck
+  '';
+
+  passthru.updateScript = unstableGitUpdater { branch = "master"; };
+
+  meta = {
+    homepage = "https://www.cl.cam.ac.uk/~pes20/cerberus/";
+    license = with lib.licenses; [
+      # Most of Cerberus
+      bsd2
+      # https://github.com/rems-project/cerberus/blob/master/THIRD_PARTY_FILES.md
+      # Files from Linux kernel
+      gpl2Only
+      # Files from cppmem
+      bsd3
+      # Files from musl
+      mit
+      # Files from BSD
+      bsdOriginal
+      # Slightly modified vendored SibylFS
+      isc
+    ];
+    mainProgram = "cerberus";
+    maintainers = with lib.maintainers; [
+      RossSmyth
+    ];
+    platforms = lib.platforms.unix;
+  };
+}

From 0a66cf90963263c148f91eea8a419630c83c72ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 20:52:26 +0000
Subject: [PATCH 02/54] linuxkit: 1.7.0 -> 1.7.1

---
 pkgs/development/tools/misc/linuxkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix
index c53d04399eed..1d92d26c7073 100644
--- a/pkgs/development/tools/misc/linuxkit/default.nix
+++ b/pkgs/development/tools/misc/linuxkit/default.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "linuxkit";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "linuxkit";
     repo = "linuxkit";
     rev = "v${version}";
-    sha256 = "sha256-G9Ao87sRbMcxB7VDvMaOPYCQg4l7EMEM2Mm9wl/N/5s=";
+    sha256 = "sha256-YOREG9BDJpXa4JhQj2vSxuI+FnVoL9CEcefBIHz+0QY=";
   };
 
   vendorHash = null;

From 9187d82daf89d4c1712a22b87d689afcadd43869 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Jul 2025 20:45:59 +0000
Subject: [PATCH 03/54] git-town: 21.2.0 -> 21.3.0

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

diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix
index 671fc3a2b7c3..a3c44b5fc61d 100644
--- a/pkgs/by-name/gi/git-town/package.nix
+++ b/pkgs/by-name/gi/git-town/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule rec {
   pname = "git-town";
-  version = "21.2.0";
+  version = "21.3.0";
 
   src = fetchFromGitHub {
     owner = "git-town";
     repo = "git-town";
     tag = "v${version}";
-    hash = "sha256-/d3HXTkbb2z7+e141pquhDVvl+veFD6Z7m64026Xak4=";
+    hash = "sha256-G1xeMOKZ1EKCZXqC2fJEUa5PeWUGknv0zew7rjAXqkM=";
   };
 
   vendorHash = null;

From a867e7f50d9f373997217a1b5caf64e5442bdd37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 17 Jul 2025 16:31:14 +0000
Subject: [PATCH 04/54] python3Packages.pygame-sdl2: 8.3.7.25031702 ->
 8.4.0.25071206

---
 pkgs/development/python-modules/pygame-sdl2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pygame-sdl2/default.nix b/pkgs/development/python-modules/pygame-sdl2/default.nix
index 5f06206bed72..273a79e04a9a 100644
--- a/pkgs/development/python-modules/pygame-sdl2/default.nix
+++ b/pkgs/development/python-modules/pygame-sdl2/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pygame-sdl2";
-  version = "8.3.7.25031702";
+  version = "8.4.0.25071206";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "renpy";
     repo = "pygame_sdl2";
     tag = "renpy-${version}";
-    hash = "sha256-7MoQpCkBd20qck7eycs/MX0sjj4XRIrZmYPkKhuct6w=";
+    hash = "sha256-I4zk19aNfVZstkVDLkwI/TBXliGAqVmOjeQLbRFri8Y=";
   };
 
   build-system = [

From 248ba42e80d73169fb5029bbea5bebf98b19926a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 21 Jul 2025 11:26:23 +0000
Subject: [PATCH 05/54] oci2git: 0.2.0 -> 0.2.1

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

diff --git a/pkgs/by-name/oc/oci2git/package.nix b/pkgs/by-name/oc/oci2git/package.nix
index 42d8d6cf5f8c..52b07491f800 100644
--- a/pkgs/by-name/oc/oci2git/package.nix
+++ b/pkgs/by-name/oc/oci2git/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oci2git";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "Virviil";
     repo = "oci2git";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+y2sWYoEuGGOYBk3E1b+2G9eF0mGSABHi92cCm+v590=";
+    hash = "sha256-83Rcw4K3+bqcvqoXTQ2ay/7eAO6GT76RV3qFzfX6O60=";
   };
 
-  cargoHash = "sha256-khl56908go19CV2XlwzH5xE4BNzQW8U7D6ce9OZgovA=";
+  cargoHash = "sha256-7OallIrRg278Bo9iV7FStXbZ1W29RuAK6AnB3PQNWrY=";
 
   nativeBuildInputs = [
     pkg-config

From 1033ce03b4c2ca08fa0ea66c255d8ef7d6737e24 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Tue, 3 Jun 2025 20:31:52 +0000
Subject: [PATCH 06/54] lowdown: 1.3.2 -> 2.0.2

https://github.com/kristapsdz/lowdown/releases/tag/VERSION_1_4_0
https://github.com/kristapsdz/lowdown/releases/tag/VERSION_2_0_0
https://github.com/kristapsdz/lowdown/releases/tag/VERSION_2_0_2
---
 pkgs/by-name/lo/lowdown/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lo/lowdown/package.nix b/pkgs/by-name/lo/lowdown/package.nix
index 8c393af15ac2..0ed05f596982 100644
--- a/pkgs/by-name/lo/lowdown/package.nix
+++ b/pkgs/by-name/lo/lowdown/package.nix
@@ -5,6 +5,7 @@
   fixDarwinDylibNames,
   which,
   dieHook,
+  bmake,
   enableShared ? !stdenv.hostPlatform.isStatic,
   enableStatic ? stdenv.hostPlatform.isStatic,
   enableDarwinSandbox ? true,
@@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
   pname = "lowdown${
     lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed"
   }";
-  version = "1.3.2";
+  version = "2.0.2";
 
   outputs = [
     "out"
@@ -27,12 +28,13 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
-    hash = "sha512-IQmgPm2zE+B82Zdg+ldjtU/XI+qab9YRAzwzRMYv32KKjql0YLDEgc/m6DbgyCiNBkulD0dVExCtrTM+nBFHzw==";
+    hash = "sha512-cfzhuF4EnGmLJf5EGSIbWqJItY3npbRSALm+GarZ7SMU7Hr1xw0gtBFMpOdi5PBar4TgtvbnG4oRPh+COINGlA==";
   };
 
   nativeBuildInputs = [
     which
     dieHook
+    bmake # Uses FreeBSD's dialect
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
 
@@ -74,7 +76,7 @@ stdenv.mkDerivation rec {
 
   postInstall =
     let
-      soVersion = "1";
+      soVersion = "2";
     in
 
     # Check that soVersion is up to date even if we are not on darwin

From db90b27976387040e64eec33146f661f5416fb10 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Tue, 3 Jun 2025 20:32:30 +0000
Subject: [PATCH 07/54] nixVersions.nix_2_24: fix build against lowdown 2.0.2

---
 pkgs/tools/package-management/nix/common-autoconf.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/package-management/nix/common-autoconf.nix b/pkgs/tools/package-management/nix/common-autoconf.nix
index 6f9b4fef5747..894380f71cf0 100644
--- a/pkgs/tools/package-management/nix/common-autoconf.nix
+++ b/pkgs/tools/package-management/nix/common-autoconf.nix
@@ -254,6 +254,14 @@ let
       "--enable-lto"
     ];
 
+    env.CXXFLAGS = toString (
+      lib.optionals (lib.versionAtLeast lowdown.version "1.4.0") [
+        # Autotools based build system wasn't updated with the backport of
+        # https://github.com/NixOS/nix/pull/12115, so set the define explicitly.
+        "-DHAVE_LOWDOWN_1_4"
+      ]
+    );
+
     makeFlags = [
       # gcc runs multi-threaded LTO using make and does not yet detect the new fifo:/path style
       # of make jobserver. until gcc adds support for this we have to instruct make to use this

From 413d3444bfa5aa0d8ed373541ab854b8beb8e2fd Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Wed, 23 Jul 2025 23:34:30 +0200
Subject: [PATCH 08/54] lixPackageSets.*.lix: apply patches for lowdown >= 1.4
 compat

---
 pkgs/tools/package-management/lix/default.nix | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 52e9ceb4d457..e3a9d8581673 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -9,6 +9,7 @@
   fetchgit,
   fetchFromGitHub,
   fetchFromGitea,
+  fetchpatch2,
   rustPlatform,
   editline,
   ncurses,
@@ -168,6 +169,15 @@ lib.makeExtensible (self: {
         hash = "sha256-b5d+HnPcyHz0ZJW1+LZl4qm4LGTB/TiaDFQVlVL2xpE=";
       };
 
+      patches = [
+        # Support for lowdown >= 1.4, https://gerrit.lix.systems/c/lix/+/3731
+        (fetchpatch2 {
+          name = "lix-2.91-lowdown-1.4.0.patch";
+          url = "https://git.lix.systems/lix-project/lix/commit/ecff59d77371b21fef229c33ebb629bc49a8fad5.patch";
+          sha256 = "sha256-2M5oId5kObwzpw67rddAPI2RbWPEVlGBrMUXZWqqmEo=";
+        })
+      ];
+
       docCargoDeps = rustPlatform.fetchCargoVendor {
         name = "lix-doc-${version}";
         inherit src;
@@ -200,6 +210,15 @@ lib.makeExtensible (self: {
         hash = "sha256-iP2iUDxA99RcgQyZROs7bQw8pqxa1vFudRqjAIHg9Iw=";
       };
 
+      patches = [
+        # Support for lowdown >= 1.4, https://gerrit.lix.systems/c/lix/+/3731
+        (fetchpatch2 {
+          name = "lix-lowdown-1.4.0.patch";
+          url = "https://git.lix.systems/lix-project/lix/commit/858de5f47a1bfd33835ec97794ece339a88490f1.patch";
+          hash = "sha256-FfLO2dFSWV1qwcupIg8dYEhCHir2XX6/Hs89eLwd+SY=";
+        })
+      ];
+
       cargoDeps = rustPlatform.fetchCargoVendor {
         name = "lix-${version}";
         inherit src;
@@ -231,6 +250,15 @@ lib.makeExtensible (self: {
         hash = "sha256-J4ycLoXHPsoBoQtEXFCelL4xlq5pT8U9tNWNKm43+YI=";
       };
 
+      patches = [
+        # Support for lowdown >= 1.4, https://gerrit.lix.systems/c/lix/+/3731
+        (fetchpatch2 {
+          name = "lix-lowdown-1.4.0.patch";
+          url = "https://git.lix.systems/lix-project/lix/commit/858de5f47a1bfd33835ec97794ece339a88490f1.patch";
+          hash = "sha256-FfLO2dFSWV1qwcupIg8dYEhCHir2XX6/Hs89eLwd+SY=";
+        })
+      ];
+
       cargoDeps = rustPlatform.fetchCargoVendor {
         name = "lix-${version}";
         inherit src;

From a85fdbf4c5a351fd6eb73f3c3443fdd198b7e70a Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 24 Jul 2025 15:13:15 -0500
Subject: [PATCH 09/54] luaPackages: update on 2025-07-24

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../editors/vim/plugins/overrides.nix         |   2 +
 .../lua-modules/generated-packages.nix        | 110 +++++++++---------
 pkgs/development/lua-modules/overrides.nix    |  18 ++-
 3 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index a1240b616c12..97f3be4f1b48 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1284,6 +1284,8 @@ in
     nvimSkipModules = [
       "fzf-lua.shell_helper"
       "fzf-lua.spawn"
+      "fzf-lua.rpc"
+      "fzf-lua.types"
     ];
   };
 
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index d8c24d404943..1dfa3a9607a1 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -814,15 +814,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "fzf-lua";
-      version = "0.0.1948-1";
+      version = "0.0.2041-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/fzf-lua-0.0.1948-1.rockspec";
-          sha256 = "1409hywqgs9y6vkrbwd1d5k1fw4a2qrls64npf7ky0wyag0srggb";
+          url = "mirror://luarocks/fzf-lua-0.0.2041-1.rockspec";
+          sha256 = "1n6q17q3if71z3cws6b6am5zlggf7hq887s17421i5lznn9psp0j";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/ibhagwan/fzf-lua/archive/3d4342120cf12f36b60a8161a8835b111ec5ec9a.zip";
-        sha256 = "189dp1yqidah2w9ilhghbx59h470f72iy5kkb1fz09527jn9yd5i";
+        url = "https://github.com/ibhagwan/fzf-lua/archive/cdfac04b264cd924173e7f63a00b4883e2b98564.zip";
+        sha256 = "1z3zj1vlrgd04dhjv172m342z4b37ji5b4hzp44js07bsf8d398y";
       };
 
       disabled = luaOlder "5.1";
@@ -903,15 +903,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "grug-far.nvim";
-      version = "1.6.42-1";
+      version = "1.6.43-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/grug-far.nvim-1.6.42-1.rockspec";
-          sha256 = "0mypn7i1cbjz97mki1adsmdrjgzqd3v4rh49bjrfmkzv2n32sp1z";
+          url = "mirror://luarocks/grug-far.nvim-1.6.43-1.rockspec";
+          sha256 = "0q0g85pxdx81k99dd5j7w807v25b3lixff83shgd08dgvbsndh9q";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/MagicDuck/grug-far.nvim/archive/b3f9412b1ed76f14cfc68e1ee899873544330c80.zip";
-        sha256 = "1iifqvv6r6gmz0z1jdm290cm12zrv44cy4w758giyw0j4zlcbbhc";
+        url = "https://github.com/MagicDuck/grug-far.nvim/archive/45981a9af7f4e666a3cdaedb1d21d2ab926727a2.zip";
+        sha256 = "1ghszc3v70bdwkiklkis9vwp3qkxapgiz16xpnrjlgns7k5lrzf7";
       };
 
       disabled = luaOlder "5.1";
@@ -934,15 +934,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "haskell-tools.nvim";
-      version = "6.1.0-1";
+      version = "6.1.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/haskell-tools.nvim-6.1.0-1.rockspec";
-          sha256 = "1190vp2vld871w9sqjx7iz4yhf666kgx20ranqpywicj7qsn74l4";
+          url = "mirror://luarocks/haskell-tools.nvim-6.1.1-1.rockspec";
+          sha256 = "1w0wvrpf5gh0r1bzss5bqdghv2wynps2cxgvbkp27kzj5kqrfhdx";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v6.1.0.zip";
-        sha256 = "1cq04jx7ds908gcca8np732figc0qljpcrnfcsmkgfjnmp1p3mqs";
+        url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v6.1.1.zip";
+        sha256 = "0pmmyfwj8as5l0l6hvr5n7n4nnsnpa6p1jj7w5j8jlk4h6c006kn";
       };
 
       disabled = luaOlder "5.1";
@@ -2950,17 +2950,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "luarocks";
-      version = "3.12.0";
+      version = "3.12.2-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/luarocks-3.12.0-1.rockspec";
-          sha256 = "sha256-FaGp4yJkddh5EicGA5uKsD2UDR/XwOsKmxBPil67zs0=";
+          url = "mirror://luarocks/luarocks-3.12.2-1.rockspec";
+          sha256 = "1ak4w8hxl54yk2lj95l22xjrgw3cpla08s28aa160jrbk6vs5n44";
         }).outPath;
       src = fetchFromGitHub {
         owner = "luarocks";
         repo = "luarocks";
-        rev = "v3.12.0";
-        hash = "sha256-PGK4gjEhCJt2+0viNU0/qJBBOxPIy2swXplQOolmP2E=";
+        rev = "v3.12.2";
+        hash = "sha256-hQysstYGUcZnnEXL+9ECS0sBViYggeDIMgo6LpUexBA=";
       };
 
       meta = {
@@ -3246,17 +3246,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "luasystem";
-      version = "0.6.2-1";
+      version = "0.6.3-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/luasystem-0.6.2-1.rockspec";
-          sha256 = "0s6vd8a35x156ccp9b95rzqgklmgvz3a2bcfp4g09vlyh2kqy1am";
+          url = "mirror://luarocks/luasystem-0.6.3-1.rockspec";
+          sha256 = "0zqmrrnvpvy0bmvdc26lgcabx525xq0xy1ysh91d74hdvnznn2jc";
         }).outPath;
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "luasystem";
-        rev = "v0.6.2";
-        hash = "sha256-EcKs8W8UAbyA5WCt75tGO2osNgFbL8SNUl78vKSy82o=";
+        rev = "v0.6.3";
+        hash = "sha256-8d2835/EcyDJX9yTn6MTfaZryjY1wkSP+IIIKGPDXMk=";
       };
 
       disabled = luaOlder "5.1";
@@ -3371,15 +3371,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "luautf8";
-      version = "0.1.6-1";
+      version = "0.1.7-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/luautf8-0.1.6-1.rockspec";
-          sha256 = "0piqf7nxhkgawib8ymvqaw2jn0ksnw1ahcxxiry121r4cxq5i65h";
+          url = "mirror://luarocks/luautf8-0.1.7-1.rockspec";
+          sha256 = "0a06r8g2vnh2vzwghjiz7bwkl0x75q52skvylgz9c37i62swbwgl";
         }).outPath;
       src = fetchurl {
-        url = "https://github.com/starwing/luautf8/archive/refs/tags/0.1.6.tar.gz";
-        sha256 = "0mlnfsskbsjd6d643yb9i03r5135w5x8hrlaa00bv6mhmys76s5p";
+        url = "https://github.com/starwing/luautf8/archive/refs/tags/0.1.7.tar.gz";
+        sha256 = "1fqrka532hx97kj5iqnx4h5x5i2a319iv2b6zmifflmh6lya6mgw";
       };
 
       disabled = luaOlder "5.1";
@@ -3565,15 +3565,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "lz.n";
-      version = "2.11.2-1";
+      version = "2.11.3-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/lz.n-2.11.2-1.rockspec";
-          sha256 = "0m0019k9asx8z82drj54cgzal0hzmdwzrm6vbknsgwhwlq5wwk6v";
+          url = "mirror://luarocks/lz.n-2.11.3-1.rockspec";
+          sha256 = "0fg256gwa7444fh7wivasi77x7qgxx4r3hjqw90qa1kav10np88n";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/nvim-neorocks/lz.n/archive/v2.11.2.zip";
-        sha256 = "0b4q1q083fiwfjmk44a15qd9rrb6hd92bim0q7xjdgm2j6ja8j73";
+        url = "https://github.com/nvim-neorocks/lz.n/archive/v2.11.3.zip";
+        sha256 = "0vnr1iiq4z3q7s3qylfmvcclmspydg8ll4p75jilcx9d114v7wwc";
       };
 
       disabled = luaOlder "5.1";
@@ -3981,15 +3981,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "neotest";
-      version = "5.8.0-1";
+      version = "5.9.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/neotest-5.8.0-1.rockspec";
-          sha256 = "05gm5hpy5pralchkr0d3zfc5l7zs9qv6xflk9482rysfnkm7d3dh";
+          url = "mirror://luarocks/neotest-5.9.1-1.rockspec";
+          sha256 = "1q2589rjwbhhbxdf30n6kq1dmvlj27bn57rbv63s4x47qdzdnzfb";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/nvim-neotest/neotest/archive/d66cf4e05a116957f0d3a7755a24291c7d1e1f72.zip";
-        sha256 = "09bxarrrfnqvyv22ls6lm0y03ngcp6r372b8hy4rld902psdb11q";
+        url = "https://github.com/nvim-neotest/neotest/archive/3c81345c28cd639fcc02843ed3653be462f47024.zip";
+        sha256 = "1rqfxhy0c721hzz9azp1w403b8bccq6q24miynb42z4hc14qh8nm";
       };
 
       disabled = luaOlder "5.1";
@@ -4651,15 +4651,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "rustaceanvim";
-      version = "6.3.2-1";
+      version = "6.5.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/rustaceanvim-6.3.2-1.rockspec";
-          sha256 = "0mvwhv3x3c5wmkxcqpm3slipfi8ns1p6wzfn0jhdwbgj5zmxa3br";
+          url = "mirror://luarocks/rustaceanvim-6.5.1-1.rockspec";
+          sha256 = "0rgj1k67aclpvxf7s5izlb2gki473kkkwws2rql6rz999gdcrny3";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.3.2.zip";
-        sha256 = "1hs31xdawvs8ln4b7idmad2689rwlls480w0hvv8xkrl638wjbd5";
+        url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.5.1.zip";
+        sha256 = "1q3p71jsc4ka4jp43pigcgknzpz2cgvcpvjczghz4xf5zcizfkgc";
       };
 
       disabled = luaOlder "5.1";
@@ -5033,17 +5033,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "tiktoken_core";
-      version = "0.2.3-1";
+      version = "0.2.4-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/tiktoken_core-0.2.3-1.rockspec";
-          sha256 = "0xwsjirxr5y6famhhwc170py6lsxhfsy1r3sviwfwz22cj51frx7";
+          url = "mirror://luarocks/tiktoken_core-0.2.4-1.rockspec";
+          sha256 = "028zmsgad88hnq7h2r8r2c364dsayh0ga1wpbv9dfqx2l3k0wqvd";
         }).outPath;
       src = fetchFromGitHub {
         owner = "gptlang";
         repo = "lua-tiktoken";
-        rev = "v0.2.3";
-        hash = "sha256-Se/V2+X1Fddie3W1OYrEJt9Jn8ZqmiYbByu8H1OvECA=";
+        rev = "v0.2.4";
+        hash = "sha256-B2oGoMOab80SJbYqs8gVCQxiLZ+5GIZ9fMgMN/sl1CA=";
       };
 
       disabled = luaOlder "5.1";
@@ -5069,17 +5069,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "tl";
-      version = "0.24.6-1";
+      version = "0.24.7-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/tl-0.24.6-1.rockspec";
-          sha256 = "1g5k9hgc6hc85l4q1s1cvnlrnc1awl28cxbrl8ld07drvaksjnqd";
+          url = "mirror://luarocks/tl-0.24.7-1.rockspec";
+          sha256 = "0c2xfrw2wasiy3g8b6fpqvlnzb0bp5l9s3pvi9ky1w4b6nbc81s7";
         }).outPath;
       src = fetchFromGitHub {
         owner = "teal-language";
         repo = "tl";
-        rev = "v0.24.6";
-        hash = "sha256-ct2EjEqmEBImKXuKCWiTve++s1rARHIIuuf95Zg+9G0=";
+        rev = "v0.24.7";
+        hash = "sha256-5saLQczm/3jRXmhHUyasGKMH95ft96+CMHkVeI7ip3A=";
       };
 
       propagatedBuildInputs = [
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index baae48d64427..ee9ff8cf33f0 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -59,6 +59,7 @@
   zziplib,
   writableTmpDirAsHomeHook,
   gitMinimal,
+  getopt,
 }:
 
 final: prev:
@@ -157,6 +158,7 @@ in
     checkInputs = [
       fd
       fzf
+      getopt
       ripgrep
     ];
     nativeCheckInputs = [
@@ -174,18 +176,14 @@ in
 
       # TODO: remove with new nvim-web-devicons release
       # Disabled devicons test because we have old version as dep and fzf-lua checks for a new icon
-      substituteInPlace tests/file/ui_spec.lua \
+      substituteInPlace tests/files_spec.lua \
         --replace-fail \
-          "T[\"files()\"][\"icons\"] = new_set({ parametrize = { { \"devicons\" }, { \"mini\" } } })" \
-          "T[\"files()\"][\"icons\"] = new_set({ parametrize = { { \"mini\" } } })"
+          "T[\"files\"][\"icons\"] = new_set({ parametrize = { { \"devicons\" }, { \"mini\" } } })" \
+          "T[\"files\"][\"icons\"] = new_set({ parametrize = { { \"mini\" } } })"
 
       # TODO: Figure out why 2 files extra
-      substituteInPlace tests/screenshots/tests-file-ui_spec.lua---files\(\)---executable---1-+-args-{-\'fd\'-} \
-        --replace-fail "112" "114"
-
-      # TODO: Figure out why 2 files extra
-      substituteInPlace tests/screenshots/tests-file-ui_spec.lua---files\(\)---preview-should-work-after-chdir-#1864 \
-        --replace-fail "111" "113"
+      substituteInPlace tests/screenshots/tests-files_spec.lua---files---executable---1-+-args-{-\'fd\'-} \
+        --replace-fail "96" "98"
 
       make test
 
@@ -1060,7 +1058,7 @@ in
   tiktoken_core = prev.tiktoken_core.overrideAttrs (oa: {
     cargoDeps = rustPlatform.fetchCargoVendor {
       src = oa.src;
-      hash = "sha256-sO2q4cmkJc6T4iyJUWpBfr2ISycS1cXAIO0ibMfzyIE=";
+      hash = "sha256-egmb4BTbORpTpVO50IcqbZU1Y0hioXLMkxxUAo05TIA=";
     };
     nativeBuildInputs = oa.nativeBuildInputs ++ [
       cargo

From a85eaf31c29bffc3d482014f94fd038409a793e8 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sat, 26 Jul 2025 23:13:19 +0200
Subject: [PATCH 10/54] build-support/php: let `vendorHash` be overridden
 correctly

---
 pkgs/build-support/php/builders/v2/build-composer-project.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/php/builders/v2/build-composer-project.nix b/pkgs/build-support/php/builders/v2/build-composer-project.nix
index dfa855691f91..4eae35d8081f 100644
--- a/pkgs/build-support/php/builders/v2/build-composer-project.nix
+++ b/pkgs/build-support/php/builders/v2/build-composer-project.nix
@@ -86,12 +86,12 @@ let
           inherit (finalAttrs)
             pname
             src
+            vendorHash
             version
             ;
           inherit
             php
             composer
-            vendorHash
             composerLock
             composerNoDev
             composerNoPlugins

From 2973d1d5675b1fcd3bcefa9660d5b86856580c77 Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Sat, 26 Jul 2025 14:40:42 +0200
Subject: [PATCH 11/54] webfontkitgenerator: 1.2.0 -> 1.3.0

---
 pkgs/by-name/we/webfontkitgenerator/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/we/webfontkitgenerator/package.nix b/pkgs/by-name/we/webfontkitgenerator/package.nix
index 2fc73d65dac5..bb636522ba54 100644
--- a/pkgs/by-name/we/webfontkitgenerator/package.nix
+++ b/pkgs/by-name/we/webfontkitgenerator/package.nix
@@ -22,13 +22,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "webfont-kit-generator";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "rafaelmardojai";
     repo = "webfont-kit-generator";
-    rev = finalAttrs.version;
-    hash = "sha256-ZfyF1Didce88/HaLeMNTw0nGzj3EZnC7V9OzsN21L40=";
+    tag = finalAttrs.version;
+    hash = "sha256-5TFsUSY6pJc/OwOklw5YocrleL9nzxKMVS1Bt6LPI/Q=";
   };
 
   nativeBuildInputs = [
@@ -69,9 +69,11 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = with lib; {
-    description = "Webfont Kit Generator is a simple utility that allows you to generate woff, woff2 and the necessary CSS boilerplate from non-web font formats (otf & ttf)";
+    description = "Create @font-face kits easily";
+    longDescription = "Webfont Bundler is a simple utility that allows you to generate woff, woff2 and the necessary CSS boilerplate from non-web font formats (otf and ttf).";
+    changelog = "https://github.com/rafaelmardojai/webfont-kit-generator/releases/tag/${finalAttrs.version}";
     mainProgram = "webfontkitgenerator";
-    homepage = "https://apps.gnome.org/app/com.rafaelmardojai.WebfontKitGenerator";
+    homepage = "https://apps.gnome.org/WebfontKitGenerator/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ benediktbroich ];
     teams = [ teams.gnome-circle ];

From 6734b696a580142679b7ff958453bba4ab887837 Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Sun, 27 Jul 2025 13:30:09 +0200
Subject: [PATCH 12/54] webfontkitgenerator: rename to webfont-bundler

---
 doc/release-notes/rl-2511.section.md                          | 4 ++++
 .../we/{webfontkitgenerator => webfont-bundler}/package.nix   | 2 +-
 pkgs/top-level/aliases.nix                                    | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)
 rename pkgs/by-name/we/{webfontkitgenerator => webfont-bundler}/package.nix (98%)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index c7cfe224b1a5..e44914555dbe 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -37,6 +37,10 @@
 
 - `tooling-language-server` has been renamed to `deputy` (both the package and binary), following the rename of the upstream project.
 
+- `webfontkitgenerator` has been renamed to `webfont-bundler`, following the rename of the upstream project.
+  The binary name remains `webfontkitgenerator`.
+  The `webfontkitgenerator` package is an alias to `webfont-bundler`.
+
 - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input.
 
 - `vmware-horizon-client` was renamed to `omnissa-horizon-client`, following [VMware's sale of their end-user business to Omnissa](https://www.omnissa.com/insights/introducing-omnissa-the-former-vmware-end-user-computing-business/). The binary has been renamed from `vmware-view` to `horizon-client`.
diff --git a/pkgs/by-name/we/webfontkitgenerator/package.nix b/pkgs/by-name/we/webfont-bundler/package.nix
similarity index 98%
rename from pkgs/by-name/we/webfontkitgenerator/package.nix
rename to pkgs/by-name/we/webfont-bundler/package.nix
index bb636522ba54..6b8018c6d2a2 100644
--- a/pkgs/by-name/we/webfontkitgenerator/package.nix
+++ b/pkgs/by-name/we/webfont-bundler/package.nix
@@ -21,7 +21,7 @@
   wrapGAppsHook4,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  pname = "webfont-kit-generator";
+  pname = "webfont-bundler";
   version = "1.3.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 18301d2969b1..09c52b521864 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2139,6 +2139,7 @@ mapAliases {
   ''; # Add 2023-07-29
   waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24
   wcurl = throw "'wcurl' has been removed due to being bundled with 'curl'"; # Added 2025-07-04
+  webfontkitgenerator = webfont-bundler; # Added 2025-07-27
   webkitgtk = throw "'webkitgtk' attribute has been removed from nixpkgs, use attribute with ABI version set explicitly"; # Added 2025-06-11
   webmetro = throw "'webmetro' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   wg-bond = throw "'wg-bond' has been removed due to lack of upstream maintenance"; # Added 2025-01-25

From 7711d6d5a0b732448b5431565f52c0a80bdac0c9 Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Mon, 28 Jul 2025 03:08:53 +0800
Subject: [PATCH 13/54] tinystatus: use finalAttrs

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

diff --git a/pkgs/by-name/ti/tinystatus/package.nix b/pkgs/by-name/ti/tinystatus/package.nix
index 3b1b1e8be8b2..55c6bca87408 100644
--- a/pkgs/by-name/ti/tinystatus/package.nix
+++ b/pkgs/by-name/ti/tinystatus/package.nix
@@ -14,7 +14,7 @@
   gnused,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tinystatus";
   version = "0-unstable-2021-07-09";
 
@@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation rec {
     runHook preInstall
     install -Dm555 tinystatus $out/bin/tinystatus
     wrapProgram $out/bin/tinystatus \
-      --set PATH "${lib.makeBinPath runtimeInputs}"
+      --set PATH "${lib.makeBinPath finalAttrs.runtimeInputs}"
     runHook postInstall
   '';
 
@@ -69,4 +69,4 @@ stdenvNoCC.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = with maintainers; [ matthewcroughan ];
   };
-}
+})

From 329dc91add31ae30b4754248d752a44430e1b494 Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Mon, 28 Jul 2025 03:08:59 +0800
Subject: [PATCH 14/54] tinystatus: remove with lib

---
 pkgs/by-name/ti/tinystatus/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ti/tinystatus/package.nix b/pkgs/by-name/ti/tinystatus/package.nix
index 55c6bca87408..0099f2ff0d24 100644
--- a/pkgs/by-name/ti/tinystatus/package.nix
+++ b/pkgs/by-name/ti/tinystatus/package.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "bderenzo";
     repo = "tinystatus";
     rev = "fc128adf240261ac99ea3e3be8d65a92eda52a73";
-    sha256 = "sha256-FvQwibm6F10l9/U3RnNTGu+C2JjHOwbv62VxXAfI7/s=";
+    hash = "sha256-FvQwibm6F10l9/U3RnNTGu+C2JjHOwbv62VxXAfI7/s=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -61,12 +61,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Static HTML status page generator written in pure shell";
     mainProgram = "tinystatus";
     homepage = "https://github.com/bderenzo/tinystatus";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ matthewcroughan ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ matthewcroughan ];
   };
 })

From d82eb97c111b8b2debc319a4cd94c49d69a06814 Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Mon, 28 Jul 2025 03:09:01 +0800
Subject: [PATCH 15/54] tinystatus: add preInstallCheck and postInstallCheck
 and remove runtimeInputs

---
 pkgs/by-name/ti/tinystatus/package.nix | 34 ++++++++++++++------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ti/tinystatus/package.nix b/pkgs/by-name/ti/tinystatus/package.nix
index 0099f2ff0d24..6e8dffc07173 100644
--- a/pkgs/by-name/ti/tinystatus/package.nix
+++ b/pkgs/by-name/ti/tinystatus/package.nix
@@ -27,30 +27,32 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  runtimeInputs = [
-    curl
-    netcat
-    unixtools.ping
-    coreutils
-    mktemp
-    findutils
-    gnugrep
-    gawk
-    gnused
-  ];
-
   installPhase = ''
     runHook preInstall
-    install -Dm555 tinystatus $out/bin/tinystatus
+
+    install -Dm755 tinystatus $out/bin/tinystatus
     wrapProgram $out/bin/tinystatus \
-      --set PATH "${lib.makeBinPath finalAttrs.runtimeInputs}"
+      --set PATH "${
+        lib.makeBinPath [
+          curl
+          netcat
+          unixtools.ping
+          coreutils
+          mktemp
+          findutils
+          gnugrep
+          gawk
+          gnused
+        ]
+      }"
+
     runHook postInstall
   '';
 
   doInstallCheck = true;
 
   installCheckPhase = ''
-    runHook preCheck
+    runHook preInstallCheck
 
     cat <<EOF >test.csv
     ping, 0, testing, this.should.fail.example.com
@@ -58,7 +60,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     $out/bin/tinystatus test.csv | grep Disrupted
 
-    runHook postCheck
+    runHook postInstallCheck
   '';
 
   meta = {

From c46d1ce27e3341fad31c4b9f03b999618ad82300 Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Mon, 28 Jul 2025 03:09:05 +0800
Subject: [PATCH 16/54] tinystatus: sort

---
 pkgs/by-name/ti/tinystatus/package.nix | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ti/tinystatus/package.nix b/pkgs/by-name/ti/tinystatus/package.nix
index 6e8dffc07173..2f04c27e8582 100644
--- a/pkgs/by-name/ti/tinystatus/package.nix
+++ b/pkgs/by-name/ti/tinystatus/package.nix
@@ -1,17 +1,17 @@
 {
   lib,
   stdenvNoCC,
-  makeWrapper,
-  netcat,
-  curl,
-  unixtools,
-  coreutils,
-  mktemp,
-  findutils,
-  gnugrep,
   fetchFromGitHub,
+  makeWrapper,
+  coreutils,
+  curl,
+  findutils,
   gawk,
+  gnugrep,
   gnused,
+  mktemp,
+  netcat,
+  unixtools,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -34,15 +34,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     wrapProgram $out/bin/tinystatus \
       --set PATH "${
         lib.makeBinPath [
+          coreutils
           curl
+          findutils
+          gawk
+          gnugrep
+          gnused
+          mktemp
           netcat
           unixtools.ping
-          coreutils
-          mktemp
-          findutils
-          gnugrep
-          gawk
-          gnused
         ]
       }"
 

From 6db0899396b692bfa9b38f012f85d159f91d0b3e Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Mon, 28 Jul 2025 03:09:11 +0800
Subject: [PATCH 17/54] tinystatus: 0-unstable-2021-07-09 ->
 0-unstable-2025-03-27

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

diff --git a/pkgs/by-name/ti/tinystatus/package.nix b/pkgs/by-name/ti/tinystatus/package.nix
index 2f04c27e8582..0f9144d80af0 100644
--- a/pkgs/by-name/ti/tinystatus/package.nix
+++ b/pkgs/by-name/ti/tinystatus/package.nix
@@ -16,13 +16,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tinystatus";
-  version = "0-unstable-2021-07-09";
+  version = "0-unstable-2025-03-27";
 
   src = fetchFromGitHub {
     owner = "bderenzo";
     repo = "tinystatus";
-    rev = "fc128adf240261ac99ea3e3be8d65a92eda52a73";
-    hash = "sha256-FvQwibm6F10l9/U3RnNTGu+C2JjHOwbv62VxXAfI7/s=";
+    rev = "169ee0bb2efe4531080936d1e2a46e451feebe3e";
+    hash = "sha256-nPrABKKIDP1n1rhcojFJJ15kqa5b4s7F/wMAgD/eVBw=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 6bf69d779a1d3b589a2ddb8ee785387336f666e6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 27 Jul 2025 23:40:11 +0200
Subject: [PATCH 18/54] python3Packages.coffea: 2025.7.2 -> 2025.7.3

Diff: https://github.com/CoffeaTeam/coffea/compare/refs/tags/v2025.7.2...refs/tags/v2025.7.3

Changelog: https://github.com/CoffeaTeam/coffea/releases/tag/v2025.7.3
---
 pkgs/development/python-modules/coffea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix
index e775c6d2b30a..eddb30de6b93 100644
--- a/pkgs/development/python-modules/coffea/default.nix
+++ b/pkgs/development/python-modules/coffea/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "coffea";
-  version = "2025.7.2";
+  version = "2025.7.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CoffeaTeam";
     repo = "coffea";
     tag = "v${version}";
-    hash = "sha256-MSCJRjw4bbQQAA39fOQAJ9qfRXO/hUrLeXZMRVGd2Zc=";
+    hash = "sha256-lCrmWcVzu8Ls0a+r2D1DMZ/Ysq3H9bPj13XOmAS1M5I=";
   };
 
   build-system = [

From 04d17561186dc7a7e8a8fa4fd87e3e5b6220a68f Mon Sep 17 00:00:00 2001
From: Dan McArdle <d@nmcardle.com>
Date: Sun, 27 Jul 2025 17:31:09 -0400
Subject: [PATCH 19/54] nixos/vaultwarden: Start after network-online.target

On my system, Vaultwarden fails on boot with an AddrNotAvailable error,
presumably because `services.vaultwarden.config.ROCKET_ADDRESS` is not
available yet.

Here's an example of the startup error in journalctl:

```
Jul 26 21:56:48 banana vaultwarden[2514]: Error: Rocket.
Jul 26 21:56:48 banana vaultwarden[2514]: [CAUSE] Bind(
Jul 26 21:56:48 banana vaultwarden[2514]:     Os {
Jul 26 21:56:48 banana vaultwarden[2514]:         code: 99,
Jul 26 21:56:48 banana vaultwarden[2514]:         kind: AddrNotAvailable,
Jul 26 21:56:48 banana vaultwarden[2514]:         message: "Cannot assign requested address",
Jul 26 21:56:48 banana vaultwarden[2514]:     },
Jul 26 21:56:48 banana vaultwarden[2514]: )
```

According to systemd docs [1], `network.target` has little meaning
during startup, but `network-online.target` actually waits until an IP
address is available. The docs recommend putting `network-online.target`
in both `After=` and `Wants=`.

[1]: https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/
---
 nixos/modules/services/security/vaultwarden/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix
index 1f386951286b..b564cd283d4e 100644
--- a/nixos/modules/services/security/vaultwarden/default.nix
+++ b/nixos/modules/services/security/vaultwarden/default.nix
@@ -224,7 +224,8 @@ in
     users.groups.vaultwarden = { };
 
     systemd.services.vaultwarden = {
-      after = [ "network.target" ];
+      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
       path = with pkgs; [ openssl ];
       serviceConfig = {
         User = user;

From ff0ec221fb65e433e50c8539ba1a92d289a2263d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 28 Jul 2025 00:02:29 +0200
Subject: [PATCH 20/54] python3Packages.pyopencl: 2025.2.5 -> 2025.2.6

Diff: https://github.com/inducer/pyopencl/compare/refs/tags/v2025.2.5...refs/tags/v2025.2.6

Changelog: https://github.com/inducer/pyopencl/releases/tag/v2025.2.6
---
 pkgs/development/python-modules/pyopencl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index 8a9bdc7a8993..a2d58cb0b51e 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "pyopencl";
-  version = "2025.2.5";
+  version = "2025.2.6";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     repo = "pyopencl";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-VmnCMaq6op/7M+n1U9mPgRpCyZtkgmzMXQuWW6Clbd4=";
+    hash = "sha256-ofAyBaD/iMm2+2PFGVTEzg/kaPmcwlvLPAihRE+JlJg=";
   };
 
   build-system = [

From 5205d193ab9bf78503f3fff296cbdb5ed3517131 Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Mon, 28 Jul 2025 06:49:21 +0800
Subject: [PATCH 21/54] tinystatus: use makeBinaryWrapper

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

diff --git a/pkgs/by-name/ti/tinystatus/package.nix b/pkgs/by-name/ti/tinystatus/package.nix
index 0f9144d80af0..59569bbd3faa 100644
--- a/pkgs/by-name/ti/tinystatus/package.nix
+++ b/pkgs/by-name/ti/tinystatus/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
-  makeWrapper,
+  makeBinaryWrapper,
   coreutils,
   curl,
   findutils,
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     hash = "sha256-nPrABKKIDP1n1rhcojFJJ15kqa5b4s7F/wMAgD/eVBw=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeBinaryWrapper ];
 
   installPhase = ''
     runHook preInstall

From 64b49d2c7de6bfbb79b4146c67287d2ddc062d7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 23:57:18 +0000
Subject: [PATCH 22/54] python3Packages.gftools: 0.9.86 -> 0.9.87

---
 pkgs/development/python-modules/gftools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gftools/default.nix b/pkgs/development/python-modules/gftools/default.nix
index 61278db9d9f5..b0dc5184e1ed 100644
--- a/pkgs/development/python-modules/gftools/default.nix
+++ b/pkgs/development/python-modules/gftools/default.nix
@@ -62,14 +62,14 @@ let
 in
 buildPythonPackage rec {
   pname = "gftools";
-  version = "0.9.86";
+  version = "0.9.87";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "gftools";
     tag = "v${version}";
-    hash = "sha256-4N27R+rbPSnxg701OGtrD7/iwTaUBdhp528+9n4ZIt8=";
+    hash = "sha256-xHgF4+wyoM3IAehdtIaDNpx7HpfwKDt0CVYGUvMKvDY=";
   };
 
   postPatch = ''

From 90948497a0d7bf9e0e69610643818d527f727989 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 02:29:49 +0000
Subject: [PATCH 23/54] python3Packages.django-markup: 1.9.1 -> 1.10

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

diff --git a/pkgs/development/python-modules/django-markup/default.nix b/pkgs/development/python-modules/django-markup/default.nix
index af4ba2fec816..237ac8546a21 100644
--- a/pkgs/development/python-modules/django-markup/default.nix
+++ b/pkgs/development/python-modules/django-markup/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "django-markup";
-  version = "1.9.1";
+  version = "1.10";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "bartTC";
     repo = "django-markup";
     tag = "v${version}";
-    hash = "sha256-dj5Z36W4Stly203SKWpR/DF+Wf7+ejbZnDCmHNRb3c0=";
+    hash = "sha256-LcEbN5/LbY3xWellBVK2Kfvt/XLzRJjGWcEk8h722Og=";
   };
 
   build-system = [ poetry-core ];
@@ -76,7 +76,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Generic Django application to convert text with specific markup to html";
     homepage = "https://github.com/bartTC/django-markup";
-    changelog = "https://github.com/bartTC/django-markup/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/bartTC/django-markup/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ hexa ];
   };

From 017bd740cf21a14609af8886b67fef2b4a6236e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Jul 2025 01:52:32 +0000
Subject: [PATCH 24/54] impala: 0.2.4 -> 0.3.0

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

diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix
index 232ab75fbe0c..c8af217646fd 100644
--- a/pkgs/by-name/im/impala/package.nix
+++ b/pkgs/by-name/im/impala/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "impala";
-  version = "0.2.4";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "pythops";
     repo = "impala";
     rev = "v${version}";
-    hash = "sha256-NPNzvqnuYXrHCOLN0kZwtzPiKVdl6UFnb/S/XtG+sEY=";
+    hash = "sha256-E3Vb2ZgpU0Qj5IoyB1zCyhUD1Cz07TVV0B2M6IFZ6KQ=";
   };
 
-  cargoHash = "sha256-TILQKCBq6oji9u78sfEzoqYhKmtah5Q5x0JOVMNqzTk=";
+  cargoHash = "sha256-vRhv3hu6GsyOJZdP+zMFHnlNa3ETksSp6p18nVUUMQc=";
 
   meta = {
     description = "TUI for managing wifi";

From 84d5aca150266a1eec618026b355d339e090f00f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 07:18:31 +0000
Subject: [PATCH 25/54] vimPlugins.avante-nvim: 0.0.25-unstable-2025-07-11 ->
 0.0.27-unstable-2025-07-28

---
 .../vim/plugins/non-generated/avante-nvim/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
index d26061cf8290..2d087f10ba6c 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -12,12 +12,12 @@
   pkgs,
 }:
 let
-  version = "0.0.25-unstable-2025-07-11";
+  version = "0.0.27-unstable-2025-07-28";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    rev = "c4ce24e3c047c3283652aeb9a16114603d6f705c";
-    hash = "sha256-ILOISh3+bfN1dEz1BN4+iZ2WJzmt0++QVZUjp24ZjNI=";
+    rev = "5e4eb8652b4776f139282a343f04a3a8c7f23cb0";
+    hash = "sha256-rmpBI2j7zwU5tIUjK7fMhfle5LVksk/kuCnwN9WQkic=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";

From 9133914fef50216f51c588616226b0ee448f0762 Mon Sep 17 00:00:00 2001
From: Saterfield990 <traysaterfield@outlook.com>
Date: Mon, 14 Jul 2025 14:30:23 +0300
Subject: [PATCH 26/54] redlib: 0.36.0 -> 0.36.0-unstable-2025-07-21; use rev
 instead of tag for unstable updates

---
 pkgs/by-name/re/redlib/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix
index 4a7f5b95ad57..c37318757147 100644
--- a/pkgs/by-name/re/redlib/package.nix
+++ b/pkgs/by-name/re/redlib/package.nix
@@ -6,18 +6,19 @@
   fetchFromGitHub,
   nix-update-script,
 }:
-rustPlatform.buildRustPackage rec {
+
+rustPlatform.buildRustPackage {
   pname = "redlib";
-  version = "0.36.0";
+  version = "0.36.0-unstable-2025-07-21";
 
   src = fetchFromGitHub {
     owner = "redlib-org";
     repo = "redlib";
-    tag = "v${version}";
-    hash = "sha256-a+FFQqKXYws8b/iGr49eZMVmKBqacQGvW8P51ybtBSc=";
+    rev = "3e67694e2b9a4012b259264af5f2b81807dbadf0";
+    hash = "sha256-vFK9DiVANbTKi19DCWdRG8gKKwcyoAcLa1teXCZ9nfE=";
   };
 
-  cargoHash = "sha256-1zPLnkNZvuZS5z9AEJvhyIv+8/y+YhqFcj5Mu7RSqnE=";
+  cargoHash = "sha256-FDeENHY6bwwCq6leSoIuCqPI6PCHpEod7KN2grS2gFw=";
 
   postInstall = ''
     install -D contrib/redlib.service $out/lib/systemd/system/redlib.service
@@ -67,7 +68,6 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = {
-    changelog = "https://github.com/redlib-org/redlib/releases/tag/v${version}";
     description = "Private front-end for Reddit (Continued fork of Libreddit)";
     homepage = "https://github.com/redlib-org/redlib";
     license = lib.licenses.agpl3Only;

From a1a470f5906600df601037241a356f833e7c5257 Mon Sep 17 00:00:00 2001
From: David Wronek <david@mainlining.org>
Date: Sat, 14 Jun 2025 18:15:21 +0200
Subject: [PATCH 27/54] maintainers: add ungeskriptet

Signed-off-by: David Wronek <david@mainlining.org>
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7267e32a5fe8..b41f0ee6bdf9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -26238,6 +26238,12 @@
     githubId = 29992205;
     keys = [ { fingerprint = "6684 4E7D D213 C75D 8828  6215 C714 A58B 6C1E 0F52"; } ];
   };
+  ungeskriptet = {
+    name = "David Wronek";
+    email = "nix@david-w.eu";
+    github = "ungeskriptet";
+    githubId = 40729975;
+  };
   unhammer = {
     email = "unhammer@fsfe.org";
     github = "unhammer";

From e1d7968b15a0d6f0b23fce9f2936734dcd945685 Mon Sep 17 00:00:00 2001
From: David Wronek <david@mainlining.org>
Date: Sat, 14 Jun 2025 18:29:11 +0200
Subject: [PATCH 28/54] samfirm-js: init at 0.3.0-unstable-2023-12-27

Signed-off-by: David Wronek <david@mainlining.org>
---
 pkgs/by-name/sa/samfirm-js/package.nix | 34 ++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 pkgs/by-name/sa/samfirm-js/package.nix

diff --git a/pkgs/by-name/sa/samfirm-js/package.nix b/pkgs/by-name/sa/samfirm-js/package.nix
new file mode 100644
index 000000000000..f1f460a04145
--- /dev/null
+++ b/pkgs/by-name/sa/samfirm-js/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage rec {
+  pname = "samfirm-js";
+  version = "0.3.0-unstable-2023-12-27";
+
+  src = fetchFromGitHub {
+    owner = "DavidArsene";
+    repo = "samfirm.js";
+    rev = "5e2537c2452c3033259a1e4399d9bb755e99f1da";
+    hash = "sha256-81nWdIXJMXy5P37K9A3hAdLrYAEtqPJy7baM1Z22tzs=";
+  };
+
+  npmDepsHash = "sha256-os75tFpyxzxGpt5Era+K+zgMJyfwD4u0AtTRLC/fPUQ=";
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm555 dist/index.js $out/bin/samfirm-js
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Program for downloading Samsung firmware";
+    homepage = "https://github.com/DavidArsene/samfirm.js";
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ungeskriptet ];
+    mainProgram = "samfirm-js";
+  };
+}

From 3e0d2d58de6fe3cd88fb777fe1690619cd11fb97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 08:17:32 +0000
Subject: [PATCH 29/54] python3Packages.knx-frontend: 2025.6.13.181749 ->
 2025.7.23.50952

---
 pkgs/development/python-modules/knx-frontend/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix
index 6a5f8c4c10f1..ed227884358e 100644
--- a/pkgs/development/python-modules/knx-frontend/default.nix
+++ b/pkgs/development/python-modules/knx-frontend/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "knx-frontend";
-  version = "2025.6.13.181749";
+  version = "2025.7.23.50952";
   pyproject = true;
 
   # TODO: source build, uses yarn.lock
   src = fetchPypi {
     pname = "knx_frontend";
     inherit version;
-    hash = "sha256-ERSVE88D9Hw1Ixh3f2cfP4fq54clam1KKvG2Hj/Hizk=";
+    hash = "sha256-LcYUXJ5K9jl3h7Jbdi/zVVZEMKcQiMz7O+IpBvgvqV0=";
   };
 
   build-system = [ setuptools ];

From c6e3db54b7cef4219431eafce7f9a600ae9925c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 08:17:47 +0000
Subject: [PATCH 30/54] python3Packages.tenant-schemas-celery: 4.0.1 -> 4.0.2

---
 .../python-modules/tenant-schemas-celery/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tenant-schemas-celery/default.nix b/pkgs/development/python-modules/tenant-schemas-celery/default.nix
index bda2bdaffd52..4ea2426fea05 100644
--- a/pkgs/development/python-modules/tenant-schemas-celery/default.nix
+++ b/pkgs/development/python-modules/tenant-schemas-celery/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "tenant-schemas-celery";
-  version = "4.0.1";
+  version = "4.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "maciej-gol";
     repo = "tenant-schemas-celery";
     tag = version;
-    hash = "sha256-rGLrP8rE9SACMDVpNeBU85U/Sb2lNhsgEgHJhAsdKNM=";
+    hash = "sha256-HJBSUS75Zk/b1i4QTaAOFO34Pstg5tEpeNBiTADpN+I=";
   };
 
   build-system = [ setuptools ];

From aa408b15e26b14086453d52a97d0e69b97e98646 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Mon, 28 Jul 2025 10:59:00 +0200
Subject: [PATCH 31/54] floorp: 11.28.0 -> 11.29.0

Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.28.0...v11.29.0
Release notes: https://blog.floorp.app/en/release/11.29.0.html

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 pkgs/applications/networking/browsers/floorp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix
index a27fde9b1d01..c4392c792b82 100644
--- a/pkgs/applications/networking/browsers/floorp/default.nix
+++ b/pkgs/applications/networking/browsers/floorp/default.nix
@@ -9,7 +9,7 @@
 (
   (buildMozillaMach rec {
     pname = "floorp";
-    packageVersion = "11.28.0";
+    packageVersion = "11.29.0";
     applicationName = "Floorp";
     binaryName = "floorp";
     branding = "browser/branding/official";
@@ -17,14 +17,14 @@
     allowAddonSideload = true;
 
     # Must match the contents of `browser/config/version.txt` in the source tree
-    version = "128.12.0";
+    version = "128.13.0";
 
     src = fetchFromGitHub {
       owner = "Floorp-Projects";
       repo = "Floorp";
       fetchSubmodules = true;
       rev = "v${packageVersion}";
-      hash = "sha256-2BSl7RHhqFAYSpshBYxuVWwLlVXdOT3xgH4tva5ShY4=";
+      hash = "sha256-uTTI9n99P4hHDf849lR7oiNGLbCa03ivjE1xF0gyT4Y=";
     };
 
     extraConfigureFlags = [

From 41918461d6ed3d921697e87af111c1239d20a7d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 09:35:01 +0000
Subject: [PATCH 32/54] sgt-puzzles: 20250714.880288c -> 20250722.dbe6378

---
 pkgs/games/sgt-puzzles/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index d9d433a31016..a73fbf15372e 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "sgt-puzzles";
-  version = "20250714.880288c";
+  version = "20250722.dbe6378";
 
   src = fetchurl {
     url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
-    hash = "sha256-Ml25epg2ir0NqgPCQWpJnfqZU3w0p4pZCHC2esul1Cw=";
+    hash = "sha256-ayNBRAAIForVZgHQJ1fr3m1aZ3bG9YNQxHTeO0YcwTA=";
   };
 
   sgt-puzzles-menu = fetchurl {

From b9d04091222217474d3ee6c58696be638ca0bffc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 10:35:31 +0000
Subject: [PATCH 33/54] spotify-player: 0.20.6 -> 0.20.7

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

diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
index b3f6949b1ec9..0f8b7ffd3cf2 100644
--- a/pkgs/by-name/sp/spotify-player/package.nix
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -49,16 +49,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [
 
 rustPlatform.buildRustPackage rec {
   pname = "spotify-player";
-  version = "0.20.6";
+  version = "0.20.7";
 
   src = fetchFromGitHub {
     owner = "aome510";
     repo = "spotify-player";
     tag = "v${version}";
-    hash = "sha256-PYf8Ms0hmG4EWDjb+er6YvY/UFiQbIF6dtCL87O4rOs=";
+    hash = "sha256-g+SU6qDnafLiNOzZ75HUPgifuC8A+rb+KoqJoMHBJ04=";
   };
 
-  cargoHash = "sha256-ec4rIYZsIvYIezDm956aYSM75e/GEoNilVjm40691Ys=";
+  cargoHash = "sha256-rwWSKJMI/4fY60m+vGqTqrTijJN6d0PfQH417Ku9+0E=";
 
   nativeBuildInputs = [
     pkg-config

From e449c6cd90b605264499aa2c20d78b3478d1f33b Mon Sep 17 00:00:00 2001
From: Dom Rodriguez <shymega@shymega.org.uk>
Date: Mon, 14 Apr 2025 16:57:33 +0100
Subject: [PATCH 34/54] python3Packages.buildstream-plugins: init at 2.4.0

---
 pkgs/by-name/bu/buildstream/package.nix       |  8 +++-
 .../buildstream-plugins/default.nix           | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/buildstream-plugins/default.nix

diff --git a/pkgs/by-name/bu/buildstream/package.nix b/pkgs/by-name/bu/buildstream/package.nix
index c78558047149..2ea655ec4a66 100644
--- a/pkgs/by-name/bu/buildstream/package.nix
+++ b/pkgs/by-name/bu/buildstream/package.nix
@@ -13,6 +13,9 @@
   addBinToPathHook,
   gitMinimal,
   versionCheckHook,
+
+  # Optional features
+  enableBuildstreamPlugins ? true,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -53,7 +56,10 @@ python3Packages.buildPythonApplication rec {
     ruamel-yaml-clib
     tomlkit
     ujson
-  ]);
+  ])
+  ++ lib.optionals enableBuildstreamPlugins [
+    python3Packages.buildstream-plugins
+  ];
 
   buildInputs = [
     fuse3
diff --git a/pkgs/development/python-modules/buildstream-plugins/default.nix b/pkgs/development/python-modules/buildstream-plugins/default.nix
new file mode 100644
index 000000000000..a96957161333
--- /dev/null
+++ b/pkgs/development/python-modules/buildstream-plugins/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  cython,
+}:
+
+buildPythonPackage rec {
+  pname = "buildstream-plugins";
+  version = "2.4.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "apache";
+    repo = "buildstream-plugins";
+    tag = version;
+    hash = "sha256-VAHDMy4DvNneWP1jhrIZzogZ5Gz5PS/GcFpOg2cGYvs=";
+  };
+
+  build-system = [
+    cython
+    setuptools
+  ];
+
+  # Do not run pyTest, causes infinite recursion as `buildstream-plugins`
+  # depends on `Buildstream`, and vice-versa for tests.
+  # May be fixable by skipping certain tests? TODO.
+
+  pythonImportsCheck = [ "buildstream_plugins" ];
+
+  meta = {
+    description = "BuildStream plugins";
+    homepage = "https://github.com/apache/buildstream-plugins";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ shymega ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6c334e2c6269..afe436e1afa9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2170,6 +2170,8 @@ self: super: with self; {
 
   buildcatrust = callPackage ../development/python-modules/buildcatrust { };
 
+  buildstream-plugins = callPackage ../development/python-modules/buildstream-plugins { };
+
   bump-my-version = callPackage ../development/python-modules/bump-my-version { };
 
   bump2version = callPackage ../development/python-modules/bump2version { };

From 9527b262b09b56dc82484dfdf0226ae57ad26a21 Mon Sep 17 00:00:00 2001
From: Jennifer Graul <jgraul@relaix.net>
Date: Mon, 17 Feb 2025 14:14:19 +0100
Subject: [PATCH 35/54] peering-manager: 1.8.3 -> 1.9.6

---
 .../fix-pyixapi-0.2.3-compatibility.patch     | 30 -------------------
 pkgs/by-name/pe/peering-manager/package.nix   | 16 ++++------
 2 files changed, 6 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/by-name/pe/peering-manager/fix-pyixapi-0.2.3-compatibility.patch

diff --git a/pkgs/by-name/pe/peering-manager/fix-pyixapi-0.2.3-compatibility.patch b/pkgs/by-name/pe/peering-manager/fix-pyixapi-0.2.3-compatibility.patch
deleted file mode 100644
index c7df2eb46759..000000000000
--- a/pkgs/by-name/pe/peering-manager/fix-pyixapi-0.2.3-compatibility.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ee558ff66e467412942559a8a92252e3fc009920 Mon Sep 17 00:00:00 2001
-From: Guillaume Mazoyer <guillaume@mazoyer.eu>
-Date: Wed, 21 Feb 2024 23:32:32 +0100
-Subject: [PATCH] Use pyixapi 0.2.3
-
----
-diff --git a/extras/models/ixapi.py b/extras/models/ixapi.py
-index 65572c971e065e3deed69465a71a54b4e1372851..637a004043e0a044c65a5e37fbb2b3bf82965436 100644
---- a/extras/models/ixapi.py
-+++ b/extras/models/ixapi.py
-@@ -7,7 +7,6 @@
- from django.db import models
- from django.db.models import Q
- from django.urls import reverse
--from django.utils.timezone import make_aware
- 
- from peering_manager.models import ChangeLoggedModel
- 
-@@ -117,9 +116,9 @@ def dial(self):
-         if auth:
-             # Save tokens if they've changed
-             self.access_token = api.access_token.encoded
--            self.access_token_expiration = make_aware(api.access_token.expires_at)
-+            self.access_token_expiration = api.access_token.expires_at
-             self.refresh_token = api.refresh_token.encoded
--            self.refresh_token_expiration = make_aware(api.refresh_token.expires_at)
-+            self.refresh_token_expiration = api.refresh_token.expires_at
-             self.save()
- 
-         return api
diff --git a/pkgs/by-name/pe/peering-manager/package.nix b/pkgs/by-name/pe/peering-manager/package.nix
index dc3d23069ccf..b6324e14f8d0 100644
--- a/pkgs/by-name/pe/peering-manager/package.nix
+++ b/pkgs/by-name/pe/peering-manager/package.nix
@@ -9,38 +9,33 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "peering-manager";
-  version = "1.8.3";
+  version = "1.9.6";
 
   src = fetchFromGitHub {
     owner = "peering-manager";
     repo = "peering-manager";
     tag = "v${version}";
-    sha256 = "sha256-UV1zSX9C9y5faOBUQ7bfj2DT6ffhMW28MIT7SaYjMgw=";
+    sha256 = "sha256-XPnov+pvO0H1ucMuSXs2tpYRE87jpfDiBDUFjnEhydA=";
   };
 
   format = "other";
 
-  patches = [
-    # Fix compatibility with pyixapi 0.2.3
-    # https://github.com/peering-manager/peering-manager/commit/ee558ff66e467412942559a8a92252e3fc009920
-    ./fix-pyixapi-0.2.3-compatibility.patch
-  ];
-
   propagatedBuildInputs =
     with python3.pkgs;
     [
       django
-      djangorestframework
-      django-redis
       django-debug-toolbar
       django-filter
       django-postgresql-netfields
       django-prometheus
+      django-redis
       django-rq
       django-tables2
       django-taggit
+      djangorestframework
       drf-spectacular
       drf-spectacular-sidecar
+      dulwich
       jinja2
       markdown
       napalm
@@ -50,6 +45,7 @@ python3.pkgs.buildPythonApplication rec {
       pynetbox
       pyyaml
       requests
+      social-auth-app-django
       tzdata
     ]
     ++ plugins python3.pkgs;

From 6f35ae801e6fd0d06fb279739de40dcb1f0a3270 Mon Sep 17 00:00:00 2001
From: Jennifer Graul <jgraul@relaix.net>
Date: Mon, 17 Feb 2025 14:32:39 +0100
Subject: [PATCH 36/54] nixos/peering-manager: remove enableOidc option since
 it is now builtin

---
 .../services/web-apps/peering-manager.nix     | 49 ++++++-------------
 1 file changed, 16 insertions(+), 33 deletions(-)

diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix
index 148d285c8587..48f7adca0f5c 100644
--- a/nixos/modules/services/web-apps/peering-manager.nix
+++ b/nixos/modules/services/web-apps/peering-manager.nix
@@ -27,9 +27,6 @@ let
       ''
       + lib.optionalString cfg.enableLdap ''
         ln -s ${cfg.ldapConfigPath} $out/opt/peering-manager/peering_manager/ldap_config.py
-      ''
-      + lib.optionalString cfg.enableOidc ''
-        ln -s ${cfg.oidcConfigPath} $out/opt/peering-manager/peering_manager/oidc_config.py
       '';
     })).override
       {
@@ -155,26 +152,23 @@ in
         See the [documentation](https://peering-manager.readthedocs.io/en/stable/setup/6-ldap/#configuration) for possible options.
       '';
     };
-
-    enableOidc = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Enable OIDC-Authentication for Peering Manager.
-
-        This requires a configuration file being pass through `oidcConfigPath`.
-      '';
-    };
-
-    oidcConfigPath = mkOption {
-      type = types.path;
-      description = ''
-        Path to the Configuration-File for OIDC-Authentication, will be loaded as `oidc_config.py`.
-        See the [documentation](https://peering-manager.readthedocs.io/en/stable/setup/6b-oidc/#configuration) for possible options.
-      '';
-    };
   };
 
+  imports = [
+    (lib.mkRemovedOptionModule [ "services" "peering-manager" "enableOidc" ] ''
+      The enableOidc option has been removed, since peering-manager has OIDC support builtin since version >= 1.9.0.
+
+      Make sure to update your OIDC configuration according to the documentation:
+      https://peering-manager.readthedocs.io/en/v1.9.3/administration/authentication/oidc/
+    '')
+    (lib.mkRemovedOptionModule [ "services" "peering-manager" "oidcConfigPath" ] ''
+      The oidcConfigPath option has been removed, since peering-manager has OIDC support builtin since version >= 1.9.0.
+
+      The new config settings for OIDC are explained in the documentation:
+      https://peering-manager.readthedocs.io/en/v1.9.3/administration/authentication/oidc/
+    '')
+  ];
+
   config = lib.mkIf cfg.enable {
     services.peering-manager = {
       settings = {
@@ -208,18 +202,7 @@ in
           PEERINGDB_API_KEY = file.readline()
       '';
 
-      plugins = (
-        ps:
-        (lib.optionals cfg.enableLdap [ ps.django-auth-ldap ])
-        ++ (lib.optionals cfg.enableOidc (
-          with ps;
-          [
-            mozilla-django-oidc
-            pyopenssl
-            josepy
-          ]
-        ))
-      );
+      plugins = (ps: (lib.optionals cfg.enableLdap [ ps.django-auth-ldap ]));
     };
 
     system.build.peeringManagerPkg = pkg;

From 4c21b28447013fbdc59b2e75360786d33d3c9f97 Mon Sep 17 00:00:00 2001
From: Jennifer Graul <jgraul@relaix.net>
Date: Mon, 17 Feb 2025 15:01:15 +0100
Subject: [PATCH 37/54] nixos/peering-manager: add environmentFile option

---
 .../services/web-apps/peering-manager.nix     | 48 ++++++++++++++++++-
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix
index 48f7adca0f5c..b6e079b4eba7 100644
--- a/nixos/modules/services/web-apps/peering-manager.nix
+++ b/nixos/modules/services/web-apps/peering-manager.nix
@@ -19,11 +19,13 @@ let
     settingsFile
     extraConfigFile
   ];
+  finalConfigFile =
+    if (cfg.environmentFile != null) then "/var/lib/peering-manager/configuration.py" else configFile;
 
   pkg =
     (pkgs.peering-manager.overrideAttrs (old: {
       postInstall = ''
-        ln -s ${configFile} $out/opt/peering-manager/peering_manager/configuration.py
+        ln -s ${finalConfigFile} $out/opt/peering-manager/peering_manager/configuration.py
       ''
       + lib.optionalString cfg.enableLdap ''
         ln -s ${cfg.ldapConfigPath} $out/opt/peering-manager/peering_manager/ldap_config.py
@@ -52,6 +54,32 @@ in
       '';
     };
 
+    environmentFile = mkOption {
+      type = with types; nullOr path;
+      default = null;
+      example = "/run/secrets/peering-manager.env";
+      description = ''
+        Environment file as defined in {manpage}`systemd.exec(5)`.
+
+        Secrets may be passed to the service without adding them to the world-readable
+        Nix store, by specifying placeholder variables as the option value in Nix and
+        setting these variables accordingly in the environment file.
+
+        ```
+          # snippet of peering-manager-related config
+          services.peering-manager.settings.SOCIAL_AUTH_OIDC_SECRET = "$PM_OIDC_SECRET";
+        ```
+
+        ```
+          # content of the environment file
+          PM_OIDC_SECRET=topsecret
+        ```
+
+        Note that this file needs to be available on the host on which
+        `peering-manager` is running.
+      '';
+    };
+
     enableScheduledTasks = mkOption {
       type = types.bool;
       default = true;
@@ -249,9 +277,22 @@ in
         };
       in
       {
+        peering-manager-config = lib.mkIf (cfg.environmentFile != null) (
+          lib.recursiveUpdate defaults {
+            description = "Peering Manager config file setup";
+            wantedBy = [ "peering-manager.target" ];
+            serviceConfig = {
+              Type = "oneshot";
+              EnvironmentFile = [ cfg.environmentFile ];
+              ExecStart = "${lib.getExe pkgs.envsubst} -i ${configFile} -o ${finalConfigFile}";
+            };
+          }
+        );
+
         peering-manager-migration = lib.recursiveUpdate defaults {
           description = "Peering Manager migrations";
           wantedBy = [ "peering-manager.target" ];
+          after = lib.mkIf (cfg.environmentFile != null) [ "peering-manager-config.service" ];
           serviceConfig = {
             Type = "oneshot";
             ExecStart = "${pkg}/bin/peering-manager migrate";
@@ -261,7 +302,10 @@ in
         peering-manager = lib.recursiveUpdate defaults {
           description = "Peering Manager WSGI Service";
           wantedBy = [ "peering-manager.target" ];
-          after = [ "peering-manager-migration.service" ];
+          after = [
+            "peering-manager-migration.service"
+          ]
+          ++ lib.optionals (cfg.environmentFile != null) [ "peering-manager-config.service" ];
 
           preStart = ''
             ${pkg}/bin/peering-manager remove_stale_contenttypes --no-input

From 1918e3ced1882d3a31f3ba0753abe78fa84781e4 Mon Sep 17 00:00:00 2001
From: Jennifer Graul <jgraul@relaix.net>
Date: Mon, 17 Feb 2025 15:31:06 +0100
Subject: [PATCH 38/54] nixos/peering-manager: fix bgp session poller

The "--all" flag from poll_bgp_sessions has been removed and is now the
default.
---
 nixos/modules/services/web-apps/peering-manager.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix
index b6e079b4eba7..40533ae760e1 100644
--- a/nixos/modules/services/web-apps/peering-manager.nix
+++ b/nixos/modules/services/web-apps/peering-manager.nix
@@ -368,7 +368,7 @@ in
           after = [ "peering-manager.service" ];
           serviceConfig = {
             Type = "oneshot";
-            ExecStart = "${pkg}/bin/peering-manager poll_bgp_sessions --all";
+            ExecStart = "${pkg}/bin/peering-manager poll_bgp_sessions";
           };
         };
       };

From fbe19e9161bf33bb4fb0c996d2f200eb435af5fa Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 25 Jul 2025 13:01:00 +0200
Subject: [PATCH 39/54] linux_xanmod: 6.12.39 -> 6.12.40

---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 0aa39d4eb0af..2aeaad38d9dc 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,8 +14,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.12.39";
-      hash = "sha256-yv8CtqqxJiiRjnZJrsqRw/q6B9JnS5nmnYlqTYWN6Kc=";
+      version = "6.12.40";
+      hash = "sha256-L8wL47kD+lrnJsrp0B1MZ2Lg8zs+m1vQ24gPGuvxIA0=";
     };
     main = {
       version = "6.15.7";

From 7be33a7605f31f8c3ac48b8b7ce6a0fde242ffb8 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 25 Jul 2025 13:05:41 +0200
Subject: [PATCH 40/54] linux_xanmod_latest: 6.15.7 -> 6.15.8

---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 2aeaad38d9dc..065eceed4008 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -18,8 +18,8 @@ let
       hash = "sha256-L8wL47kD+lrnJsrp0B1MZ2Lg8zs+m1vQ24gPGuvxIA0=";
     };
     main = {
-      version = "6.15.7";
-      hash = "sha256-YMDjtoGz/PQKmbB2umI+5mODP4A1NqzVusc9kg2zGzA=";
+      version = "6.15.8";
+      hash = "sha256-P4DpTS0RhvsgBrNDsZMiA1NvCQucuPmJ4GDyF9mZ7ZU=";
     };
   };
 

From f9f24a086d0130d56e46491f55ae21f07e2f7a6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 02:02:04 +0000
Subject: [PATCH 41/54] minio-client: 2025-07-16T15-35-03Z ->
 2025-07-21T05-28-08Z

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

diff --git a/pkgs/by-name/mi/minio-client/package.nix b/pkgs/by-name/mi/minio-client/package.nix
index 14ae2563da76..01f3eacb7e85 100644
--- a/pkgs/by-name/mi/minio-client/package.nix
+++ b/pkgs/by-name/mi/minio-client/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "minio-client";
-  version = "2025-07-16T15-35-03Z";
+  version = "2025-07-21T05-28-08Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "mc";
     rev = "RELEASE.${version}";
-    sha256 = "sha256-U5bKSew/qqbBs/VR0mSserH/0jdzZsztDJiJ02BHFIY=";
+    sha256 = "sha256-qKlUWppr2zuFkMFoqo1x7xB6PnRYXnkN+31xZKlvuho=";
   };
 
-  vendorHash = "sha256-MpLQZFrf2sBAweXtYeFi5j6p6GaXuN99x+r4UK8D9xM=";
+  vendorHash = "sha256-0ERiUx114EyoooPIVMCjiDkPb4/D0ZC/YuG14+30NPw=";
 
   subPackages = [ "." ];
 

From 1f9431801f5262a09c9dbb113d52beb0d668eabd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 27 Jul 2025 17:34:13 +0200
Subject: [PATCH 42/54] nixos/tlsrpt: fix default postfix sendmail path

It is not in the PATH for the reportd, since it is a SUID wrapper.
---
 nixos/modules/services/mail/tlsrpt.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/tlsrpt.nix b/nixos/modules/services/mail/tlsrpt.nix
index 83b219443fd0..4692f0cdd2ff 100644
--- a/nixos/modules/services/mail/tlsrpt.nix
+++ b/nixos/modules/services/mail/tlsrpt.nix
@@ -229,9 +229,16 @@ in
 
             sendmail_script = mkOption {
               type = with types; nullOr str;
-              default = if config.services.postfix.enable then "sendmail" else null;
+              default =
+                if config.services.postfix.enable && config.services.postfix.setSendmail then
+                  "/run/wrappers/bin/sendmail -i -t"
+                else
+                  null;
               defaultText = lib.literalExpression ''
-                if any [ config.services.postfix.enable ] then "sendmail" else null
+                if config.services.postfix.enable && config.services.postfix.setSendmail then
+                  "/run/wrappers/bin/sendmail -i -t"
+                else
+                  null
               '';
               description = ''
                 Path to a sendmail-compatible executable for delivery reports.

From c3c5a3bfd080e898b92f2f4b30326ba72439a703 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 27 Jul 2025 17:36:00 +0200
Subject: [PATCH 43/54] nixos/tlsrpt: fix restart trigger

Triggering on a symlink target does not work.
---
 nixos/modules/services/mail/tlsrpt.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/mail/tlsrpt.nix b/nixos/modules/services/mail/tlsrpt.nix
index 4692f0cdd2ff..05d8377514c0 100644
--- a/nixos/modules/services/mail/tlsrpt.nix
+++ b/nixos/modules/services/mail/tlsrpt.nix
@@ -50,6 +50,15 @@ let
     ];
   };
 
+  collectdConfigFile = format.generate "tlsrpt-collectd.cfg" {
+    tlsrpt_collectd = dropNullValues cfg.collectd.settings;
+  };
+  fetcherConfigFile = format.generate "tlsrpt-fetcher.cfg" {
+    tlsrpt_fetcher = dropNullValues cfg.fetcher.settings;
+  };
+  reportdConfigFile = format.generate "tlsrpt-reportd.cfg" {
+    tlsrpt_reportd = dropNullValues cfg.reportd.settings;
+  };
 in
 
 {
@@ -266,15 +275,9 @@ in
 
   config = mkIf cfg.enable {
     environment.etc = {
-      "tlsrpt/collectd.cfg".source = format.generate "tlsrpt-collectd.cfg" {
-        tlsrpt_collectd = dropNullValues cfg.collectd.settings;
-      };
-      "tlsrpt/fetcher.cfg".source = format.generate "tlsrpt-fetcher.cfg" {
-        tlsrpt_fetcher = dropNullValues cfg.fetcher.settings;
-      };
-      "tlsrpt/reportd.cfg".source = format.generate "tlsrpt-reportd.cfg" {
-        tlsrpt_reportd = dropNullValues cfg.reportd.settings;
-      };
+      "tlsrpt/collectd.cfg".source = collectdConfigFile;
+      "tlsrpt/fetcher.cfg".source = fetcherConfigFile;
+      "tlsrpt/reportd.cfg".source = reportdConfigFile;
     };
 
     users.users.tlsrpt = {
@@ -295,7 +298,7 @@ in
 
       wantedBy = [ "multi-user.target" ];
 
-      restartTriggers = [ "/etc/tlsrpt/collectd.cfg" ];
+      restartTriggers = [ collectdConfigFile ];
 
       serviceConfig = commonServiceSettings // {
         ExecStart = toString (
@@ -319,7 +322,7 @@ in
 
       wantedBy = [ "multi-user.target" ];
 
-      restartTriggers = [ "/etc/tlsrpt/reportd.cfg" ];
+      restartTriggers = [ reportdConfigFile ];
 
       serviceConfig = commonServiceSettings // {
         ExecStart = toString (

From b438f32b2a8d2b9374644289725ffaf05101970c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 28 Jul 2025 02:16:08 +0200
Subject: [PATCH 44/54] nixos/tlsrpt: fix permissions to execute postdrop

Calling to sendmail without AF_NETLINK causes:

> sendmail: fatal: inet_addr_local[getifaddrs]: getifaddrs: Address family not supported by protocol

and without AF_INET/AF_INET6:

> sendmail: warning: inet_protocols: disabling IPv6 name/address support: Address family not supported by protocol
> sendmail: warning: inet_protocols: disabling IPv4 name/address support: Address family not supported by protocol

Move the configurePostfix option one level up, since it now also
reconfigures the reportd systemd unit.
---
 nixos/modules/services/mail/tlsrpt.nix | 29 ++++++++++++++------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/mail/tlsrpt.nix b/nixos/modules/services/mail/tlsrpt.nix
index 05d8377514c0..309ce400462c 100644
--- a/nixos/modules/services/mail/tlsrpt.nix
+++ b/nixos/modules/services/mail/tlsrpt.nix
@@ -59,6 +59,8 @@ let
   reportdConfigFile = format.generate "tlsrpt-reportd.cfg" {
     tlsrpt_reportd = dropNullValues cfg.reportd.settings;
   };
+
+  withPostfix = config.services.postfix.enable && cfg.configurePostfix;
 in
 
 {
@@ -126,14 +128,6 @@ in
           See {manpage}`tlsrpt-collectd(1)` for possible flags.
         '';
       };
-
-      configurePostfix = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Whether to modify the local Postfix service to grant access to the collectd socket.
-        '';
-      };
     };
 
     fetcher = {
@@ -271,6 +265,14 @@ in
         '';
       };
     };
+
+    configurePostfix = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether to configure permissions to allow integration with Postfix.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
@@ -286,11 +288,9 @@ in
     };
     users.groups.tlsrpt = { };
 
-    users.users.postfix.extraGroups =
-      lib.mkIf (config.services.postfix.enable && cfg.collectd.configurePostfix)
-        [
-          "tlsrpt"
-        ];
+    users.users.postfix.extraGroups = lib.mkIf withPostfix [
+      "tlsrpt"
+    ];
 
     systemd.services.tlsrpt-collectd = {
       description = "TLSRPT datagram collector";
@@ -334,7 +334,10 @@ in
         RestrictAddressFamilies = [
           "AF_INET"
           "AF_INET6"
+          "AF_NETLINK"
         ];
+        ReadWritePaths = lib.optionals withPostfix [ "/var/lib/postfix/queue/maildrop" ];
+        SupplementaryGroups = lib.optionals withPostfix [ "postdrop" ];
         UMask = "0077";
       };
     };

From 9cd50e03ecf3999f737448ff055a23e51b023017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frede=20Br=C3=A6ndstrup?= <frede@vokalo.io>
Date: Mon, 28 Jul 2025 15:12:22 +0200
Subject: [PATCH 45/54] vimPlugins.tardis-nvim: init at 2025-07-28

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix |  5 +++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 3 files changed, 19 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 82f87296aa3e..7566f1ce251a 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -14372,6 +14372,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  tardis-nvim = buildVimPlugin {
+    pname = "tardis.nvim";
+    version = "2025-07-28";
+    src = fetchFromGitHub {
+      owner = "fredehoey";
+      repo = "tardis.nvim";
+      rev = "951f0903dd52eab69a240a89e514c62d4ea0260f";
+      sha256 = "0bdb7bw4f0gidwibs7n6l5gz2a23pm868i9ksh7kkafhl7qf4vz3";
+    };
+    meta.homepage = "https://github.com/fredehoey/tardis.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   targets-vim = buildVimPlugin {
     pname = "targets.vim";
     version = "2024-07-10";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index a1240b616c12..91f0d7191f20 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -3298,6 +3298,11 @@ in
     meta.maintainers = with lib.maintainers; [ callumio ];
   };
 
+  tardis-nvim = super.tardis-nvim.overrideAttrs {
+    dependencies = [ self.plenary-nvim ];
+    meta.maintainers = with lib.maintainers; [ fredeb ];
+  };
+
   taskwarrior2 = buildVimPlugin {
     inherit (taskwarrior2) version pname;
     src = "${taskwarrior2.src}/scripts/vim";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 8994b0de532c..8aba276cc3dd 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1103,6 +1103,7 @@ https://github.com/preservim/tagbar/,,
 https://github.com/vim-scripts/taglist.vim/,,
 https://github.com/luckasRanarison/tailwind-tools.nvim/,HEAD,
 https://github.com/themaxmarchuk/tailwindcss-colors.nvim/,HEAD,
+https://github.com/fredehoey/tardis.nvim/,HEAD,
 https://github.com/wellle/targets.vim/,,
 https://github.com/tbabej/taskwiki/,,
 https://github.com/tomtom/tcomment_vim/,,

From 906c5d079d361fc540fe28ed2ccc22d934744668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frede=20Br=C3=A6ndstrup?= <frede@vokalo.io>
Date: Mon, 28 Jul 2025 13:45:16 +0200
Subject: [PATCH 46/54] vimPlugins.neotest-ctest: init at 2025-07-02

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix |  8 ++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 3 files changed, 22 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 82f87296aa3e..169c597bd57b 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -9370,6 +9370,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  neotest-ctest = buildVimPlugin {
+    pname = "neotest-ctest";
+    version = "2025-07-02";
+    src = fetchFromGitHub {
+      owner = "orjangj";
+      repo = "neotest-ctest";
+      rev = "124e8834a07aa522c6e9fa96f03e8ab0b7f2fa05";
+      sha256 = "0rml2m0v14v7ikllya6d55gwm75lfkf2ip11cm8x4n7x2pw17d04";
+    };
+    meta.homepage = "https://github.com/orjangj/neotest-ctest/";
+    meta.hydraPlatforms = [ ];
+  };
+
   neotest-dart = buildVimPlugin {
     pname = "neotest-dart";
     version = "2025-06-03";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index a1240b616c12..b1b034c394e2 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2045,6 +2045,14 @@ in
     ];
   };
 
+  neotest-ctest = super.neotest-ctest.overrideAttrs {
+    dependencies = with self; [
+      neotest
+      nvim-nio
+      plenary-nvim
+    ];
+  };
+
   neotest-dart = super.neotest-dart.overrideAttrs {
     dependencies = with self; [
       neotest
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 8994b0de532c..8a2c570442ec 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -719,6 +719,7 @@ https://github.com/Shougo/neosnippet-snippets/,,
 https://github.com/Shougo/neosnippet.vim/,,
 https://github.com/kassio/neoterm/,,
 https://github.com/rcasia/neotest-bash/,HEAD,
+https://github.com/orjangj/neotest-ctest/,HEAD,
 https://github.com/sidlatau/neotest-dart/,HEAD,
 https://github.com/MarkEmmons/neotest-deno/,HEAD,
 https://github.com/Issafalcon/neotest-dotnet/,HEAD,

From 39ef8245811706fefc6a46c233d888ec1bb427b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 13:31:10 +0000
Subject: [PATCH 47/54] nest-cli: 11.0.7 -> 11.0.8

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

diff --git a/pkgs/by-name/ne/nest-cli/package.nix b/pkgs/by-name/ne/nest-cli/package.nix
index 811ae2d69a3c..c5f1a457218d 100644
--- a/pkgs/by-name/ne/nest-cli/package.nix
+++ b/pkgs/by-name/ne/nest-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "nest-cli";
-  version = "11.0.7";
+  version = "11.0.8";
 
   src = fetchFromGitHub {
     owner = "nestjs";
     repo = "nest-cli";
     tag = version;
-    hash = "sha256-CCNbkSu/ymSKdFVDKZezekVFXl6Ipg9Dp9+Tyd4D+cY=";
+    hash = "sha256-vqu5eUtr8oO2HgQhXIHel92qHhHJSqyAJmI2+Oc5VoY=";
   };
 
-  npmDepsHash = "sha256-R9uSOeoQJw061ZEJMe8aDYUaUC1QvHQ9nOyoQa+z+fY=";
+  npmDepsHash = "sha256-QLJBqVHEvOhRRGU9x/5hCvRSi0xKYMDXeqMi6yWNHbU=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   env = {

From b5b3d91c3b9f425e455df133c572299f2e5c7736 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 13:48:36 +0000
Subject: [PATCH 48/54] komga: 1.22.1 -> 1.23.0

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

diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix
index 773c43309818..1ac45191a6de 100644
--- a/pkgs/by-name/ko/komga/package.nix
+++ b/pkgs/by-name/ko/komga/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "komga";
-  version = "1.22.1";
+  version = "1.23.0";
 
   src = fetchurl {
     url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
-    sha256 = "sha256-MAMHrYJva1n7TtYNjoN4Yb1+mApWfjpXxgFWgkeFc3g=";
+    sha256 = "sha256-OkRTa0yMmxT95yey/7EIYulJ4zr/fZEWMIygzppr5Lw=";
   };
 
   nativeBuildInputs = [

From e1f3c2b2f312eb1e6b9b6f66c6cf045bcf7f804e Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Mon, 28 Jul 2025 21:54:51 +0800
Subject: [PATCH 49/54] tkimg: mark darwin badPlatform

---
 pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix
index f072975cb5a6..1212bc56d845 100644
--- a/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix
@@ -34,5 +34,6 @@ tcl.mkTclDerivation rec {
     maintainers = with lib.maintainers; [ matthewcroughan ];
     license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
+    badPlatforms = lib.platforms.darwin;
   };
 }

From bf63430dd30072fe5c3aedd2c32e167818e5a48b Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sun, 27 Jul 2025 16:50:02 +0200
Subject: [PATCH 50/54] snipe-it: 8.2.0 -> 8.2.1

Release notes: https://github.com/grokability/snipe-it/releases/tag/v8.2.1
Full changelog: https://github.com/grokability/snipe-it/compare/v8.2.0...v8.2.1
---
 pkgs/by-name/sn/snipe-it/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix
index a40a53373de5..546ddca2587c 100644
--- a/pkgs/by-name/sn/snipe-it/package.nix
+++ b/pkgs/by-name/sn/snipe-it/package.nix
@@ -9,16 +9,16 @@
 
 php84.buildComposerProject2 (finalAttrs: {
   pname = "snipe-it";
-  version = "8.2.0";
+  version = "8.2.1";
 
   src = fetchFromGitHub {
     owner = "grokability";
     repo = "snipe-it";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mXcc6wSDoO7z2xYUjwn6hU39OBmsZOw4JeZTpwZMMbI=";
+    hash = "sha256-l0FiZZbzY49y2Q5WcCZwJD8YlQbBrOXJkMo7fMlSHxg=";
   };
 
-  vendorHash = "sha256-84kllssopKRAC/Dws+5s6e61/O56B+Uy19jjIV8yLUo=";
+  vendorHash = "sha256-+FUEBZdGu+wC9LW2UWz1wM4PZnJdTAxZU0kRkCzgjJE=";
 
   postInstall = ''
     snipe_it_out="$out/share/php/snipe-it"

From 6b78cd27f2ec95105ede09217ad2708ea5d564ea Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 20 Jul 2025 13:30:10 +0800
Subject: [PATCH 51/54] cppman: init at 0.5.9

---
 pkgs/by-name/cp/cppman/package.nix | 70 ++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 pkgs/by-name/cp/cppman/package.nix

diff --git a/pkgs/by-name/cp/cppman/package.nix b/pkgs/by-name/cp/cppman/package.nix
new file mode 100644
index 000000000000..b0ed1eacf92a
--- /dev/null
+++ b/pkgs/by-name/cp/cppman/package.nix
@@ -0,0 +1,70 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  groff,
+  nix-update-script,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "cppman";
+  version = "0.5.9";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "aitjcize";
+    repo = "cppman";
+    tag = version;
+    hash = "sha256-iPJR4XAjNrBhFHZVOATPi3WwTC1/Y6HK3qmKLqbaK98=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+    distutils
+  ];
+
+  dependencies = [
+    python3Packages.beautifulsoup4
+    python3Packages.html5lib
+    python3Packages.lxml
+    python3Packages.six
+    python3Packages.soupsieve
+    python3Packages.typing-extensions
+    python3Packages.webencodings
+    groff
+  ];
+
+  # cppman pins all dependency versions via requirements.txt as install_requires
+  pythonRelaxDeps = true;
+
+  # bs4 is merely a dummy package and can be safely removed
+  # Ideally, its version would also stay fixed.
+  postPatch = ''
+    substituteInPlace requirements.txt \
+      --replace-fail "bs4==0.0.2" ""
+  '';
+
+  pythonImportsCheck = [
+    "cppman"
+  ];
+
+  nativeCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+  # Writable $HOME is required for `cppman --version` to work
+  versionCheckKeepEnvironment = "HOME";
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Terminal viewer for C++ 98/11/14 manual pages";
+    homepage = "https://github.com/aitjcize/cppman";
+    changelog = "https://github.com/aitjcize/cppman/blob/${src.tag}/ChangeLog";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ryan4yin ];
+    mainProgram = "cppman";
+  };
+}

From 3dc48da86236cca6c948dc1e14791f602bde6cbf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 16:12:34 +0000
Subject: [PATCH 52/54] cockpit: 342 -> 343

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

diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix
index c0bd948d0f33..7243379305ec 100644
--- a/pkgs/by-name/co/cockpit/package.nix
+++ b/pkgs/by-name/co/cockpit/package.nix
@@ -41,13 +41,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit";
-  version = "342";
+  version = "343";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit";
     tag = finalAttrs.version;
-    hash = "sha256-NkddZeWvMSP8pcN+eFWDm6iux3REjPP2jBwHF5CTzmU=";
+    hash = "sha256-Yov8C1zpSYkkK5U7Lly6jGqvtfIZVH4modd2mLZRrGs=";
     fetchSubmodules = true;
   };
 

From 7dee852c0058312ff6b0596729e8bc6011f69069 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Sat, 28 Jun 2025 20:00:49 -0400
Subject: [PATCH 53/54] m1n1: init at 1.4.21

---
 pkgs/by-name/m1/m1n1/package.nix | 82 ++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 pkgs/by-name/m1/m1n1/package.nix

diff --git a/pkgs/by-name/m1/m1n1/package.nix b/pkgs/by-name/m1/m1n1/package.nix
new file mode 100644
index 000000000000..229f6522cbbd
--- /dev/null
+++ b/pkgs/by-name/m1/m1n1/package.nix
@@ -0,0 +1,82 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  imagemagick,
+  source-code-pro,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "m1n1";
+  version = "1.4.21";
+
+  src = fetchFromGitHub {
+    owner = "AsahiLinux";
+    repo = "m1n1";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-0ZnDexY/Sf2TJFfUv/YelCctFJVENffWqBU0r0azD0M=";
+  };
+
+  nativeBuildInputs = [
+    imagemagick
+  ];
+
+  postConfigure = ''
+    patchShebangs --build font/makefont.sh
+    FONT_PATH=${source-code-pro}/share/fonts/opentype/SourceCodePro-Bold.otf
+    rm font/{SourceCodePro-Bold.ttf,font.bin,font_retina.bin}
+    ./font/makefont.sh 8 16 12 $FONT_PATH font/font.bin
+    ./font/makefont.sh 16 32 25 $FONT_PATH font/font_retina.bin
+  '';
+
+  makeFlags = [
+    "ARCH=${stdenv.cc.targetPrefix}"
+    "RELEASE=1"
+  ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 build/m1n1.bin -t $out/lib/m1n1/
+
+    install -Dm644 3rdparty_licenses/LICENSE.* -t $out/share/doc/m1n1/licenses/
+    install -Dm644 LICENSE -t $out/share/doc/m1n1/licenses/
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Bootloader to bridge the Apple (XNU) boot to Linux boot";
+    homepage = "https://github.com/AsahiLinux/m1n1";
+    changelog = "https://github.com/AsahiLinux/m1n1/releases/tag/${finalAttrs.src.tag}";
+    license = with lib.licenses; [
+      # m1n1 embeds several libraries, all of which cannot be
+      # unvendored easily.
+
+      # m1n1, minlzma, musl-libc
+      mit
+      # libfdt: dual BSD2 and GPL-2-or-later
+      # tinf: zlib
+      # arm-trusted-firmware: BSD3
+      # dlmalloc: CC0
+      # PDCLib: CC0
+      # Source Code Pro: OFL1.1
+      # dwc3: BSD3 and GPL-2-or-later
+      cc0
+      ofl
+      zlib
+      bsd2
+      gpl2Plus
+      bsd3
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ normalcea ];
+    platforms = lib.platforms.aarch64;
+  };
+})

From e41186f6691a8c0ca1f01fc1eb84cf398c0b8d8e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 03:46:56 +1000
Subject: [PATCH 54/54] home-assistant-custom-lovelace-modules.sankey-chart:
 3.9.3 -> 3.9.4 (#429143)

https://github.com/MindFreeze/ha-sankey-chart/blob/v3.9.4/CHANGELOG.md
---
 .../custom-lovelace-modules/sankey-chart/package.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
index 83ca1d761ea5..812ced9b7697 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "sankey-chart";
-  version = "3.9.3";
+  version = "3.9.4";
 
   src = fetchFromGitHub {
     owner = "MindFreeze";
     repo = "ha-sankey-chart";
     rev = "v${version}";
-    hash = "sha256-qOUzMi2anKc5sQqy9xvA/ISg0NPuPXQqzjqaPbyiYvY=";
+    hash = "sha256-5G/ji9vt4QIs+zyfdBZwgHTjCDTyX68N0lqfIMVMTN0=";
   };
 
-  npmDepsHash = "sha256-mz682Ine+YQHxS/Hni6namkohOsGhVhFZi7lsKMHOnc=";
+  npmDepsHash = "sha256-jlnGmdwQu1AZTDVrH7njgq5/UorDceUhJtFqzo/xLfc=";
 
   installPhase = ''
     runHook preInstall