From 82b80522840cef13d64123b66915470568dc27f4 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Thu, 7 May 2026 15:40:43 -0400
Subject: [PATCH 01/38] buildLakePackage: force pname, version, and structured
 attrs

This is a new builder so we should force those attrs
---
 pkgs/build-support/lake/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/lake/default.nix b/pkgs/build-support/lake/default.nix
index 114a8354fa89..79befcbe7d41 100644
--- a/pkgs/build-support/lake/default.nix
+++ b/pkgs/build-support/lake/default.nix
@@ -43,6 +43,8 @@ lib.extendMkDerivation {
   extendDrvArgs =
     finalAttrs:
     {
+      pname,
+      version,
       nativeBuildInputs ? [ ],
       passthru ? { },
 
@@ -85,8 +87,7 @@ lib.extendMkDerivation {
           null
         else
           (fetchLakeDeps {
-            name = finalAttrs.name or "${finalAttrs.pname}-${finalAttrs.version}";
-            inherit (finalAttrs) src;
+            inherit (finalAttrs) src pname version;
             hash = lakeHash;
             sourceRoot = finalAttrs.sourceRoot or "";
             patches = finalAttrs.patches or [ ];
@@ -112,6 +113,7 @@ lib.extendMkDerivation {
     in
     {
       strictDeps = true;
+      __structuredAttrs = true;
 
       nativeBuildInputs = nativeBuildInputs ++ [
         lean4
@@ -226,6 +228,8 @@ lib.extendMkDerivation {
       };
 
       meta = meta // {
+        # Note: This conflates the platforms that the Lean compiler can run on (a package build system) and the platforms the Lean compiler
+        # can target (build host)
         platforms = meta.platforms or lean4.meta.platforms;
       };
     };

From d692663784e44b1f6d757f61e61c8dce9e8ed9c8 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Thu, 7 May 2026 15:45:02 -0400
Subject: [PATCH 02/38] buildLakePackage: Remove redundant bindings

These just redeclare bindings with their already declared
defaults
---
 pkgs/build-support/lake/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/lake/default.nix b/pkgs/build-support/lake/default.nix
index 79befcbe7d41..4836615b8286 100644
--- a/pkgs/build-support/lake/default.nix
+++ b/pkgs/build-support/lake/default.nix
@@ -68,12 +68,6 @@ lib.extendMkDerivation {
       ...
     }@args:
     let
-      lakeDeps' = args.lakeDeps or null;
-      lakeHash = args.lakeHash or null;
-      leanDeps = args.leanDeps or [ ];
-      overrideLakeDepsAttrs = args.overrideLakeDepsAttrs or (_: _: { });
-      buildTargets = args.buildTargets or [ ];
-      isLibrary = args.isLibrary or true;
       leanPackageName = args.leanPackageName or finalAttrs.pname;
 
       allLeanDeps = lib.unique (
@@ -81,8 +75,8 @@ lib.extendMkDerivation {
       );
 
       computedLakeDeps =
-        if lakeDeps' != null then
-          lakeDeps'
+        if lakeDeps != null then
+          lakeDeps
         else if lakeHash == null then
           null
         else

From cada9af7d2c62e7922742bac8e0361b2abec5113 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Thu, 7 May 2026 15:52:16 -0400
Subject: [PATCH 03/38] buildLakePackage: make FOD use extendMkDerivation as
 well

Also add the usual suspects (strict, structuredAttrs)
---
 pkgs/build-support/lake/fetch-lake-deps.nix | 131 ++++++++++----------
 1 file changed, 68 insertions(+), 63 deletions(-)

diff --git a/pkgs/build-support/lake/fetch-lake-deps.nix b/pkgs/build-support/lake/fetch-lake-deps.nix
index acd165b8d7cd..af55dff26b8f 100644
--- a/pkgs/build-support/lake/fetch-lake-deps.nix
+++ b/pkgs/build-support/lake/fetch-lake-deps.nix
@@ -13,83 +13,88 @@
   jq,
 }:
 
-{
-  name,
-  src,
-  hash,
-  sourceRoot ? "",
-  patches ? [ ],
-  prePatch ? "",
-  postPatch ? "",
-  # Package names to skip (e.g. already packaged in nix).
-  excludePackages ? [ ],
-}:
+lib.extendMkDerivation {
+  constructDrv = stdenvNoCC.mkDerivation;
 
-stdenvNoCC.mkDerivation {
-  name = "${name}-lake-deps";
-
-  inherit
-    src
-    sourceRoot
-    patches
-    prePatch
-    postPatch
-    ;
-
-  nativeBuildInputs = [
-    gitMinimal
-    cacert
-    jq
+  excludeDrvArgNames = [
+    "excludePackages"
   ];
 
-  impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
-    "GIT_PROXY_COMMAND"
-    "SOCKS_SERVER"
-  ];
+  extendDrvArgs =
+    finalAttrs:
+    {
+      pname,
+      version,
+      src,
+      hash,
+      sourceRoot ? "",
+      patches ? [ ],
+      prePatch ? "",
+      postPatch ? "",
+      # Package names to skip (e.g. already packaged in nix).
+      excludePackages ? [ ],
+    }:
+    {
+      strictDeps = true;
+      __structuredAttrs = true;
 
-  dontConfigure = true;
+      pname = "${pname}-lake-deps";
 
-  buildPhase = ''
-    runHook preBuild
+      nativeBuildInputs = [
+        gitMinimal
+        cacert
+        jq
+      ];
 
-    if [ ! -f lake-manifest.json ]; then
-      echo "fetchLakeDeps: lake-manifest.json not found" >&2
-      exit 1
-    fi
+      impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
+        "GIT_PROXY_COMMAND"
+        "SOCKS_SERVER"
+      ];
 
-    export HOME="$TMPDIR"
-    export GIT_SSL_CAINFO="$NIX_SSL_CERT_FILE"
+      dontConfigure = true;
 
-    mkdir -p "$TMPDIR/packages"
+      buildPhase = ''
+        runHook preBuild
 
-    jq -c --argjson exclude ${lib.escapeShellArg (builtins.toJSON excludePackages)} \
-      '.packages[] | select(.type == "git") | select(.name as $n | $exclude | index($n) | not)' \
-      lake-manifest.json | while IFS= read -r pkg; do
-      name=$(echo "$pkg" | jq -r '.name')
-      url=$(echo "$pkg" | jq -r '.url')
-      rev=$(echo "$pkg" | jq -r '.rev')
+        if [ ! -f lake-manifest.json ]; then
+          echo "fetchLakeDeps: lake-manifest.json not found" >&2
+          exit 1
+        fi
 
-      echo "fetchLakeDeps: cloning $name ($url @ $rev)"
+        export HOME="$TMPDIR"
+        export GIT_SSL_CAINFO="$NIX_SSL_CERT_FILE"
 
-      git clone --filter=blob:none --no-checkout "$url" "$TMPDIR/packages/$name"
-      git -C "$TMPDIR/packages/$name" checkout "$rev" --quiet
+        mkdir -p "$TMPDIR/packages"
 
-      # Remove .git to make output deterministic
-      rm -rf "$TMPDIR/packages/$name/.git"
-    done
+        jq -c --argjson exclude ${lib.escapeShellArg (builtins.toJSON excludePackages)} \
+          '.packages[] | select(.type == "git") | select(.name as $n | $exclude | index($n) | not)' \
+          lake-manifest.json | while IFS= read -r pkg; do
+          name=$(echo "$pkg" | jq -r '.name')
+          url=$(echo "$pkg" | jq -r '.url')
+          rev=$(echo "$pkg" | jq -r '.rev')
 
-    runHook postBuild
-  '';
+          echo "fetchLakeDeps: cloning $name ($url @ $rev)"
 
-  installPhase = ''
-    runHook preInstall
-    mv "$TMPDIR/packages" "$out"
-    runHook postInstall
-  '';
+          git clone --filter=blob:none --no-checkout "$url" "$TMPDIR/packages/$name"
+          git -C "$TMPDIR/packages/$name" checkout "$rev" --quiet
 
-  dontFixup = true;
+          # Remove .git to make output deterministic
+          rm -rf "$TMPDIR/packages/$name/.git"
+        done
 
-  outputHashMode = "recursive";
-  outputHash = hash;
-  outputHashAlgo = if hash == "" then "sha256" else null;
+        runHook postBuild
+      '';
+
+      installPhase = ''
+        runHook preInstall
+        mv "$TMPDIR/packages" "$out"
+        runHook postInstall
+      '';
+
+      dontFixup = true;
+
+      outputHashMode = "recursive";
+      outputHash = hash;
+      outputHashAlgo = if hash == "" then "sha256" else null;
+    };
 }

From 785fcc8edcec64ee191010697cf648be7fb3090f Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 26 May 2026 08:27:46 -0500
Subject: [PATCH 04/38] dino: migrate to by-name

---
 .../dino/default.nix => by-name/di/dino/package.nix} | 12 ++++++++----
 pkgs/top-level/all-packages.nix                      |  8 --------
 2 files changed, 8 insertions(+), 12 deletions(-)
 rename pkgs/{applications/networking/instant-messengers/dino/default.nix => by-name/di/dino/package.nix} (93%)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/by-name/di/dino/package.nix
similarity index 93%
rename from pkgs/applications/networking/instant-messengers/dino/default.nix
rename to pkgs/by-name/di/dino/package.nix
index d343c7dedc2c..7188b8965453 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/by-name/di/dino/package.nix
@@ -27,16 +27,20 @@
   srtp,
   libnice,
   gnutls,
-  gstreamer,
-  gst-plugins-base,
-  gst-plugins-good,
+  gst_all_1,
   webrtc-audio-processing,
 }:
 
 # Upstream is very deliberate about which features are enabled per default or are automatically enabled.
 # Everything that is disabled per default has to been seen experimental and should not be enabled without strong reasoning.
 # see https://github.com/NixOS/nixpkgs/issues/469614#issuecomment-3649662176
-
+let
+  inherit (gst_all_1)
+    gstreamer
+    gst-plugins-base
+    ;
+  gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "dino";
   version = "0.5.1";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40a7918d215f..b001e8c4fea5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1698,14 +1698,6 @@ with pkgs;
     plugins = lib.filter (p: p ? pluginName) (builtins.attrValues discourse.plugins);
   };
 
-  dino = callPackage ../applications/networking/instant-messengers/dino {
-    inherit (gst_all_1)
-      gstreamer
-      gst-plugins-base
-      ;
-    gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
-  };
-
   inherit (ocamlPackages) dot-merlin-reader;
 
   inherit (ocamlPackages) dune-release;

From ee90dcbaf2d259bd0140ce79a445d568b62028f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 23:51:19 +0000
Subject: [PATCH 05/38] gh-poi: 0.17.2 -> 0.18.1

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

diff --git a/pkgs/by-name/gh/gh-poi/package.nix b/pkgs/by-name/gh/gh-poi/package.nix
index 9e76b277425c..103b98e5f308 100644
--- a/pkgs/by-name/gh/gh-poi/package.nix
+++ b/pkgs/by-name/gh/gh-poi/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gh-poi";
-  version = "0.17.2";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "seachicken";
     repo = "gh-poi";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-tG6rC5htgC9RsHdExpMwb0CDLs7e8PLKEDLih4mGVu8=";
+    hash = "sha256-t778dPCFrIbVUCRCzo4WjwuKeoCe+vCl/C2ZkpihcoA=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
   vendorHash = "sha256-o3ys+Em27sx3VS3AQIP7G/tWRiBlPnvBq37jLtj9QVQ=";
 
   # Skip checks because some of test suites require fixture.
-  # See: https://github.com/seachicken/gh-poi/blob/v0.17.2/.github/workflows/contract-test.yml#L28-L29
+  # See: https://github.com/seachicken/gh-poi/blob/v0.18.1/.github/workflows/contract-test.yml#L28-L29
   doCheck = false;
 
   meta = {

From 8a6cb8c20dae81e34b1acede080d4614a55816ff Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Thu, 25 Jun 2026 10:29:01 -0400
Subject: [PATCH 06/38] buildFHSEnv: Enable structuredAttrs

---
 pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
index 2c6a297cb7cb..b3406d062449 100644
--- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
+++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
@@ -348,6 +348,8 @@ runCommandLocal name
     // {
       inherit nativeBuildInputs;
 
+      __structuredAttrs = true;
+
       passthru = passthru // {
         env =
           runCommandLocal "${name}-shell-env"

From 5dae15112c56d2fef6ce518cc464fbdb7550ca64 Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Fri, 17 Apr 2026 21:09:14 +0800
Subject: [PATCH 07/38] daed: 1.0.0 -> 1.27.0, add maintainer

---
 pkgs/by-name/da/daed/package.nix | 84 ++++++++++++++++----------------
 1 file changed, 43 insertions(+), 41 deletions(-)

diff --git a/pkgs/by-name/da/daed/package.nix b/pkgs/by-name/da/daed/package.nix
index 3a7ff752a325..823c19ca7602 100644
--- a/pkgs/by-name/da/daed/package.nix
+++ b/pkgs/by-name/da/daed/package.nix
@@ -1,9 +1,9 @@
 {
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   nodejs,
-  stdenv,
+  stdenvNoCC,
   clang,
   buildGoModule,
   fetchFromGitHub,
@@ -11,39 +11,45 @@
   _experimental-update-script-combinators,
   nix-update-script,
 }:
-
 let
+  pnpm = pnpm_10;
+in
+buildGoModule (finalAttrs: {
   pname = "daed";
-  version = "1.0.0";
-
+  version = "1.27.0";
   src = fetchFromGitHub {
     owner = "daeuniverse";
     repo = "daed";
-    tag = "v${version}";
-    hash = "sha256-WaybToEcFrKOcJ+vfCTc9uyHkTPOrcAEw9lZFEIBPgY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CvxCDdOLsdSlFfmoR+C1IUt9HvkAV5JsWGI94DLXB+U=";
     fetchSubmodules = true;
   };
 
-  web = stdenv.mkDerivation {
-    inherit pname version src;
+  sourceRoot = "${finalAttrs.src.name}/wing";
+
+  web = stdenvNoCC.mkDerivation {
+    inherit (finalAttrs) pname version src;
 
     pnpmDeps = fetchPnpmDeps {
-      inherit
+      inherit (finalAttrs)
         pname
         version
         src
         ;
-      pnpm = pnpm_9;
+      inherit pnpm;
       fetcherVersion = 3;
-      hash = "sha256-FBZk7qeYNi7JX99Sk1qe52YUE8GUYINJKid0mEBXMjU=";
+      hash = "sha256-2g/M+4XI1EM+c7W82qyfH8C7sX+Y0QACiSpn65Vei4g=";
     };
 
     nativeBuildInputs = [
       nodejs
       pnpmConfigHook
-      pnpm_9
+      pnpm
     ];
 
+    strictDeps = true;
+    __structuredAttrs = true;
+
     buildPhase = ''
       runHook preBuild
 
@@ -55,25 +61,14 @@ let
     installPhase = ''
       runHook preInstall
 
-      cp -R dist $out
+      mkdir -p $out
+      cp -R apps/web/dist/* $out
 
       runHook postInstall
     '';
   };
-in
-
-buildGoModule rec {
-  inherit
-    pname
-    version
-    src
-    web
-    ;
-
-  sourceRoot = "${src.name}/wing";
-
-  vendorHash = "sha256-+uf8PJQvsJMUyQ6W+nDfdwrxBO2YRUL328ajTJpVDZk=";
 
+  vendorHash = "sha256-l7jgMvrbpOY2+cvnc0e5cvSgKVm4GcWC+bPbff+PE80=";
   proxyVendor = true;
 
   nativeBuildInputs = [ clang ];
@@ -84,9 +79,9 @@ buildGoModule rec {
     substituteInPlace Makefile \
       --replace-fail /bin/bash /bin/sh
 
-    # ${web} does not have write permission
+    # ${finalAttrs.web} does not have write permission
     mkdir dist
-    cp -r ${web}/* dist
+    cp -r ${finalAttrs.web}/* dist
     chmod -R 755 dist
   '';
 
@@ -96,8 +91,8 @@ buildGoModule rec {
     make CFLAGS="-D__REMOVE_BPF_PRINTK -fno-stack-protector -Wno-unused-command-line-argument" \
       NOSTRIP=y \
       WEB_DIST=dist \
-      AppName=${pname} \
-      VERSION=${version} \
+      AppName=daed \
+      VERSION=${finalAttrs.version} \
       OUTPUT=$out/bin/daed \
       bundle
 
@@ -110,21 +105,28 @@ buildGoModule rec {
       --replace-fail /usr/bin $out/bin
   '';
 
-  passthru.updateScript = _experimental-update-script-combinators.sequence [
-    (nix-update-script {
-      attrPath = "daed.web";
-    })
-    (nix-update-script {
-      extraArgs = [ "--version=skip" ];
-    })
-  ];
+  passthru = {
+    inherit (finalAttrs) web;
+    updateScript = _experimental-update-script-combinators.sequence [
+      (nix-update-script {
+        attrPath = "daed.web";
+        extraArgs = [ "--use-github-releases" ];
+      })
+      (nix-update-script {
+        extraArgs = [ "--version=skip" ];
+      })
+    ];
+  };
 
   meta = {
     description = "Modern dashboard with dae";
     homepage = "https://github.com/daeuniverse/daed";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ oluceps ];
+    maintainers = with lib.maintainers; [
+      oluceps
+      ccicnce113424
+    ];
     platforms = lib.platforms.linux;
     mainProgram = "daed";
   };
-}
+})

From 1fd39e9a2fa4385796b2fcc9eca13179428fef1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jul 2026 04:46:43 +0000
Subject: [PATCH 08/38] ollama-cpu: 0.31.1 -> 0.31.2

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

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 5753e38b3c58..056b977b741b 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -152,16 +152,16 @@ let
 in
 goBuild (finalAttrs: {
   pname = "ollama";
-  version = "0.31.1";
+  version = "0.31.2";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-p4saQimdOVRWcJyrYcCuex7NViKC/u0tHUnLRZh6hwg=";
+    hash = "sha256-/ySx6vfOGPo5twwKiNtkuROaTV7SvCeHX2fQiilmTkA=";
   };
 
-  vendorHash = "sha256-lZdGzGb9xRjTm1Rm7/wHjqM490gLznLEndmb4mNbCX0=";
+  vendorHash = "sha256-HMwoaFBMbpoy8f0I+O+i7kIa9BslLu3FcVWeaIOkpvs=";
   proxyVendor = true;
 
   env =

From e3469ceba1969be14a3a2eceeaf43f0af88ec93a Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Thu, 9 Jul 2026 18:09:12 +1000
Subject: [PATCH 09/38] fwupd: 2.1.5 -> 2.1.6; remove efi patch

---
 .../0004-Get-the-efi-app-from-fwupd-efi.patch | 23 -------------------
 pkgs/by-name/fw/fwupd/package.nix             |  7 +++---
 2 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch

diff --git a/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch b/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch
deleted file mode 100644
index b2876ca37a6d..000000000000
--- a/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: r-vdp <ramses@well-founded.dev>
-Date: Mon, 28 Oct 2024 12:08:49 +0100
-Subject: [PATCH] Get the efi app from fwupd-efi
-
-EFI capsule is located in fwupd-efi now.
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 917770b38abb86056d6c42fa9c99dedf27ebe999..f52f3ec12dd9def0a68ea1645f7d508acbb731b9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -651,7 +651,7 @@ endif
- 
- # EFI
- if build_standalone
--  efi_app_location = join_paths(libexecdir, 'fwupd', 'efi')
-+  efi_app_location = join_paths(dependency('fwupd-efi').get_variable(pkgconfig: 'prefix'), 'libexec', 'fwupd', 'efi')
-   conf.set_quoted('EFI_APP_LOCATION', efi_app_location)
- endif
- 
diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix
index 0025fb8d550a..2db794b344ee 100644
--- a/pkgs/by-name/fw/fwupd/package.nix
+++ b/pkgs/by-name/fw/fwupd/package.nix
@@ -122,7 +122,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fwupd";
-  version = "2.1.5";
+  version = "2.1.6";
 
   # libfwupd goes to lib
   # daemon, plug-ins and libfwupdplugin go to out
@@ -140,14 +140,13 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "fwupd";
     repo = "fwupd";
     tag = finalAttrs.version;
-    hash = "sha256-DzQ+N99ZmFRqZc2rN6PSqmoIMXUyrE8Kkn+KnT/AWPc=";
+    hash = "sha256-K8n1rPiLuHDybWPoAUQA7RY4J+Ga1fwNiaj48fHAh9A=";
   };
 
   patches = [
     ./0001-Install-fwupdplugin-to-out.patch
     ./0002-Add-output-for-installed-tests.patch
     ./0003-Add-option-for-installation-sysconfdir.patch
-    ./0004-Get-the-efi-app-from-fwupd-efi.patch
   ];
 
   postPatch = ''
@@ -227,6 +226,8 @@ stdenv.mkDerivation (finalAttrs: {
     "--sysconfdir=/etc"
     (lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc")
     (lib.mesonOption "efi_os_dir" "nixos")
+    # EFI capsule is located in fwupd-efi now.
+    (lib.mesonOption "efi_app_location" "${fwupd-efi}/libexec/fwupd/efi")
     # HSI is auto-disabled on non-x86 upstream; auto_features=enabled overrides
     # that, breaking the fwupdtool installed test which expects rc=1 on non-x86.
     (lib.mesonEnable "hsi" isx86)

From 4897abb584d5cd7c5da851e9866e236b5d29d506 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 15:27:22 +0000
Subject: [PATCH 10/38] ntfy-sh: 2.25.0 -> 2.26.0

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

diff --git a/pkgs/by-name/nt/ntfy-sh/package.nix b/pkgs/by-name/nt/ntfy-sh/package.nix
index 822dc79b6e3d..530489f726f9 100644
--- a/pkgs/by-name/nt/ntfy-sh/package.nix
+++ b/pkgs/by-name/nt/ntfy-sh/package.nix
@@ -18,7 +18,7 @@ buildGoModule (
     ui = buildNpmPackage {
       inherit (finalAttrs) src version;
       pname = "ntfy-sh-ui";
-      npmDepsHash = "sha256-d+/p9ytSqZyYDBBFgnK7skM17GJbHesJsVk4sZxTcBA=";
+      npmDepsHash = "sha256-ENwqAS3HDzezlwiNG7e0dCN16c6RreBirua+Yv6GTS4=";
 
       prePatch = ''
         cd web/
@@ -38,16 +38,16 @@ buildGoModule (
   in
   {
     pname = "ntfy-sh";
-    version = "2.25.0";
+    version = "2.26.0";
 
     src = fetchFromGitHub {
       owner = "binwiederhier";
       repo = "ntfy";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-R0trtATgI+AWXlN2UWEeChMhgX9pLdcNuRLkF4P4opM=";
+      hash = "sha256-/VOCztlfi8n12PrUmv17jNpV2/aVh+G0Qq0/leuHnzw=";
     };
 
-    vendorHash = "sha256-sfMKr5IprwjVo7GwIYojcaixlRlkHOhoqec2PcK8UUU=";
+    vendorHash = "sha256-t/NTLIL+eVFBFuTy6T1st8cdRliJZCYHojyDx76IW7o=";
 
     doCheck = false;
 

From 274a95140837e8f32c8f80baccb93450fcbd4a0a Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri, 10 Jul 2026 19:03:37 +0200
Subject: [PATCH 11/38] pnpm_10: 10.34.4 -> 10.34.5

https://github.com/pnpm/pnpm/releases/tag/v10.34.5

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/development/tools/pnpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 80f37039cfb8..3e497aa9af8b 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -61,8 +61,8 @@ let
       ];
     };
     "10" = {
-      version = "10.34.4";
-      hash = "sha256-mM1XGNvYxLJokVZJO5WWzs9rZLGpjUoIfoITWhdbQOs=";
+      version = "10.34.5";
+      hash = "sha256-zLXEecqxsAYhMlv+fUyaioAx56Ul1ySeJ17L7IGwjbI=";
     };
     "11" = {
       version = "11.10.0";

From 05ae686760cd4e8df6351e63085f0fe67e496dfb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 21:59:29 +0000
Subject: [PATCH 12/38] velocity: 3.5.0-unstable-2026-06-16 ->
 3.5.0-unstable-2026-07-10

---
 pkgs/by-name/ve/velocity/deps.json   | 120 ++++++++++++---------------
 pkgs/by-name/ve/velocity/package.nix |   6 +-
 2 files changed, 58 insertions(+), 68 deletions(-)

diff --git a/pkgs/by-name/ve/velocity/deps.json b/pkgs/by-name/ve/velocity/deps.json
index 480dabf832d6..44f6ca0c7599 100644
--- a/pkgs/by-name/ve/velocity/deps.json
+++ b/pkgs/by-name/ve/velocity/deps.json
@@ -767,24 +767,24 @@
    "jar": "sha256-NXXcuKmPr5Q9PBWVxHoWBHxPzoqD67smJi8aL2dUY1c=",
    "pom": "sha256-7n+6hWnDu1wekeWBL9n0oPMb4n5WjVNU4a39GRGfl7M="
   },
-  "net/kyori#adventure-api/4.26.1": {
-   "jar": "sha256-VR5Ta56oaPMOcseQCjCbNRJO59SIn6OzrtCRApl1GiY=",
-   "module": "sha256-+XWMFoAnCGyZ2aJmc3ZOqLgNU28gwmxZjcFwUrE6yvo=",
-   "pom": "sha256-nHaC7LSU1b7CVpD2VkJ4Jh9HfTUdGrRPL5AB6kAIqBg="
+  "net/kyori#adventure-api/5.2.0": {
+   "jar": "sha256-flL+cZC+Poezs/cXEs+hIxX80nEJ8wKntEDBLwH66Cc=",
+   "module": "sha256-rtsJZVoi/1b2qRn2RFWrtAVvNmuEn9eIcub3g5FRt2k=",
+   "pom": "sha256-0A3foQcl22Y8j2ljSU1JozZaIWP5aO23GUeqfOJA77M="
   },
-  "net/kyori#adventure-bom/4.26.1": {
-   "module": "sha256-mNH1y89agGdyYrwrxwX8TAtSNl6YukwgRzs5Y7E2bHE=",
-   "pom": "sha256-KWshlV/2W4tQiYtKfVnLGDcDAHqjG/dhfVKRMuUnUiM="
+  "net/kyori#adventure-bom/5.2.0": {
+   "module": "sha256-PbGqbpyXqvjLV4kn0KI/tJu6WHk3p3R3LmwYpLvUoBc=",
+   "pom": "sha256-BRngJAfaaycLtQykki/ZMkrqIS5FPOzCYo730oR9bIg="
   },
-  "net/kyori#adventure-key/4.26.1": {
-   "jar": "sha256-7sFy1j23e0Drer7rJfZe7eqJvTAmTQV7aLEv7Lcxvl4=",
-   "module": "sha256-o73U11zwxeU8f4seYbGJ+O9KrlnRMbX5fU7ylDgzexA=",
-   "pom": "sha256-UyMAkH0veoQYwywtiJlK2+ZKovETAzb59R6A0dEMvKk="
+  "net/kyori#adventure-key/5.2.0": {
+   "jar": "sha256-AYTRcyAOLu+PvHkfYi0dWP1Fn4kwxha1pP556D7abFU=",
+   "module": "sha256-mfdB4rTvjPHMMXb9HpExFp7hxafxHu2W0Fpuj1oeWO4=",
+   "pom": "sha256-yth/VZccXpktQ9jt06b5XyKprfE9ZHj5azNHmtt4fXg="
   },
-  "net/kyori#adventure-nbt/4.26.1": {
-   "jar": "sha256-8m72v/X83YF5ArTf01NWHZjLExtOy2c0H/AO8u0TNvg=",
-   "module": "sha256-mb9lcD9G2mjFbd5sMBQg26Fc+OhAN+s/XsMmhRBH60w=",
-   "pom": "sha256-VX6DLc2gsbN3/YQQrfCrxYf4wxjDkqvQ+0MBnq0LB60="
+  "net/kyori#adventure-nbt/5.2.0": {
+   "jar": "sha256-g06U1siDrF26QwVGMrw4Pu5uOb1CuhuHtrb0e8+EVUs=",
+   "module": "sha256-14HUFbA5BUa6FkvPf74dwreas6rTtN6jpIrEvpQzI54=",
+   "pom": "sha256-QzBXYlX/5/CT5fjU2AQ0t3P5VCqovZs7L+36+BCCSGQ="
   },
   "net/kyori#adventure-platform-api/4.4.1": {
    "jar": "sha256-7GBGKMK3wWXqdMH8s6LQ8DNZwsd6FJYOOgvC43lnCsI=",
@@ -796,66 +796,56 @@
    "module": "sha256-5bh8za6MLPoH27A4UsnTVFaMXk5XbCKgIpHzoYOFZaE=",
    "pom": "sha256-SLtXCyvxeN2kDMBb6aJtOpY5QLcYpl8X2YvDhcgGaXQ="
   },
-  "net/kyori#adventure-text-logger-slf4j/4.26.1": {
-   "jar": "sha256-AJqZUY2bTw7FRmXyCXJIE7+YosH/AgrqvPNKNpn9Hfo=",
-   "module": "sha256-4oZ3rlJEmHup6sDxIzOGRmUHqPU+zArAHEdg6wZ+dYo=",
-   "pom": "sha256-LpgSt+02k9mGBeQv/mIdQuHjtF5EwvNxXtiKKs0TTmI="
+  "net/kyori#adventure-text-logger-slf4j/5.2.0": {
+   "jar": "sha256-rnm384RsXZc7N8fuwDGQvUThgpGNE0bncFxZkaG137M=",
+   "module": "sha256-0BEmhpPSXU/YmXCP+s90I40Cyi/eBDgnbUxgaRM3SMk=",
+   "pom": "sha256-HgigEztbDmaempgKw0xYGuU+R6PZ5E69cpa1r6qf1Ro="
   },
-  "net/kyori#adventure-text-minimessage/4.26.1": {
-   "jar": "sha256-HUNFHpr0cyUtyK8+gIQjjVzmitQ68OO3OD6z1LY//58=",
-   "module": "sha256-GjsjhMRxBMgvJ+7rejj/A887A+UH4cewUoOHu8E9FJ4=",
-   "pom": "sha256-I8/VHJcSj6jNuMdxFhOSTMA4f46YZJh43Ie4SFaC+Og="
+  "net/kyori#adventure-text-minimessage/5.2.0": {
+   "jar": "sha256-4YcauhUR2+Sc/yEcEPhWgohgFBYeXWKTGKppWDwxosA=",
+   "module": "sha256-8QtEhf3AwYc7dQZZrFkuH1OkxMmxuA30ch33Tw2fME4=",
+   "pom": "sha256-jTQKfd1B+agWs08ftOY7vVmZxribmJ+/ss+nkGuBLGA="
   },
-  "net/kyori#adventure-text-serializer-ansi/4.26.1": {
-   "jar": "sha256-eVB8NmhZMhZmiUI74nnqeW20K5XZbaKnlM+WJCgMsUU=",
-   "module": "sha256-NSSXxmsJ0RJmRGqj92D782iO+Vlot4+M/71qFKnquAg=",
-   "pom": "sha256-fdiSu6ByT3wOvdsn9PKW7JA+Cb6Y4OElrrAf5lAskls="
+  "net/kyori#adventure-text-serializer-ansi/5.2.0": {
+   "jar": "sha256-kinQkIMuKIAY899pAnYC3NolMRg1hYXcJyj4RZfpyp0=",
+   "module": "sha256-hSYFjrL7Cgf5vw1iIfLGxb84lOwtRJYklaGsaEs5TgQ=",
+   "pom": "sha256-jGhTBUWgpvyCgEFN5H1xUXdYnqC+MHFX5ntHEE4EpZI="
   },
-  "net/kyori#adventure-text-serializer-commons/4.26.1": {
-   "jar": "sha256-ZlJ/71WdpNkc2mkkkQNPkD1bAeg13hsJHt+7a1HO5aI=",
-   "module": "sha256-PH1zGXBAAHttiOr3bVgtyggsQLaYSZRUcpcU3/KKbwc=",
-   "pom": "sha256-3VJcA1RfZxRWXy+LDVCNydxgc9tp14/zIi55qoyrRTs="
+  "net/kyori#adventure-text-serializer-commons/5.2.0": {
+   "jar": "sha256-ZLPkXZOqV/TamyV9FsjyFyYS2eMxKwYfSJL9Qmki0sM=",
+   "module": "sha256-+K+796mcidxqDh8vLYHpCFWAt8eQQ6UJdSTtkMtM2T4=",
+   "pom": "sha256-uUoJo8YY+6r46MGldzfNqlX/Tiq2g16udHDXNlGlg0Y="
   },
-  "net/kyori#adventure-text-serializer-gson/4.26.1": {
-   "jar": "sha256-5KkI3txKy0MFCD2RbTYt3Csh7PRS1XegvmZSgL3a6fw=",
-   "module": "sha256-CiEWKUFuNW29H9ARckrrkJi0wLzzoFJf04/LIav0eLA=",
-   "pom": "sha256-08rRApPx95VLmlYJRGnDVmPuoIdtuwlgUUQfczau95U="
+  "net/kyori#adventure-text-serializer-gson/5.2.0": {
+   "jar": "sha256-WyrRyKZef6CBEnm1GkXV/FdLamNUCXtUXk/bW2iq7XM=",
+   "module": "sha256-wv9zvosfd96+YbyXFLc6aiY3hpLmYuBWnL7pV3DD/yQ=",
+   "pom": "sha256-aCWFTlwZj6ooKSaFWRE1hjq7BpzvOpa2sehckk/uihc="
   },
-  "net/kyori#adventure-text-serializer-json-legacy-impl/4.26.1": {
-   "jar": "sha256-y+YY4uxVpOd5Va/etyov8B3DCXkMlWKuTFOb8w/li5E=",
-   "module": "sha256-e6tASr/8xmENfdUU729WI06wqRnGTwwh+N3aWC0wT3k=",
-   "pom": "sha256-ag7DsWK1/gLbOVKRgdHGuwcRgUssdqzIHKQox30jwh8="
+  "net/kyori#adventure-text-serializer-json-legacy-impl/5.2.0": {
+   "jar": "sha256-2Yv2e/BtHsov9mGVZ+MqRoHDxlLgd9PIN5rC/0wU80k=",
+   "module": "sha256-rXApop2uafcNLLdD+MIEUW+MBBkO8nalkKBBdcBlODQ=",
+   "pom": "sha256-6naj56V+UgSFRjOKY/3odXjRLxChkRv9KeH6y3WHHIY="
   },
-  "net/kyori#adventure-text-serializer-json/4.26.1": {
-   "jar": "sha256-VcZLQzPV0paKASW48p2ufPuhU5LV+Z94266nEcsNTcI=",
-   "module": "sha256-cl5HkQqwG0pZ0pqTw/8tCkexdgwMG2w4T4bCqVmzB5I=",
-   "pom": "sha256-V2t6GjAzfixlFtXlsg4OMZ874IuH6234Iqdnh1OpFoI="
+  "net/kyori#adventure-text-serializer-json/5.2.0": {
+   "jar": "sha256-rbVBAAYXW5qmNDv63QvRHEppVe4qvBpYq+Kj+my9mrU=",
+   "module": "sha256-fXtnT5iaSZhaV6qX84BHbucFIqmYPoWCqNoUOpsetOw=",
+   "pom": "sha256-3DXUwApv+IZXRdfVz6mjltj0JtLurHpx8XkiYwp8sw4="
   },
-  "net/kyori#adventure-text-serializer-legacy/4.26.1": {
-   "jar": "sha256-chEHvCE1ckVN8b++Q426Yw4wRXVQx1C3oVSzXcMmSqg=",
-   "module": "sha256-Uedmd9M5pW4rj7N+NwR3X/Pi/+rDAj5U5bayhixYmb0=",
-   "pom": "sha256-JC4/tXRmwrW3lcvMPi6C7ICXNselyvPzACLf0IpFQLA="
+  "net/kyori#adventure-text-serializer-legacy/5.2.0": {
+   "jar": "sha256-EjGg3kF95mxZ4vKjiS7MprjUhiHfbx2aL4GwH1fjKLc=",
+   "module": "sha256-sdKjeA0clHc7B2s7oc4WaKWy82me2znRiai2HVWk22I=",
+   "pom": "sha256-EvKtHOTBjUKmA6d8z5niNu322hwuQHKhLI/ww4RtEnY="
   },
-  "net/kyori#adventure-text-serializer-plain/4.26.1": {
-   "jar": "sha256-Obm/5XkPZFYF/1RkOCwOBiR29I+b+yVIgB8nXxL69AU=",
-   "module": "sha256-yNM2HeweZVGFqyqocSiNePZ0n/JPN3zKKvK4K25htIs=",
-   "pom": "sha256-uhg5th3wyaMs9OLwm0vBvSDSNHfCMsxX67wCC6nfGso="
+  "net/kyori#adventure-text-serializer-plain/5.2.0": {
+   "jar": "sha256-9kJMwDimMbecxLdLazU9XQB8mbOPm+SC4MJEigDuzSE=",
+   "module": "sha256-qBShSpd4ia7oeaUMNh+OkkicJnxfe/X0MpcCX8C1rVk=",
+   "pom": "sha256-kAmYaPkRk0fB/VK4doaI3RyuAR4hjHjzJp5yMqxCyIQ="
   },
   "net/kyori#ansi/1.1.1": {
    "jar": "sha256-tsVp4aCSW57rNJ4S2zXiI3VWEH4zNmV+Cy694mHYr9c=",
    "module": "sha256-dl9vgpVJJAkqjC43uHqaXJvlYyA0roGa2RG2mqC8KlM=",
    "pom": "sha256-Zy7yclzYkPUxZ1b+ja1h9ibv4SoxTaQFJxCg403qkVY="
   },
-  "net/kyori#examination-api/1.3.0": {
-   "jar": "sha256-ySN//ssFQo9u/4YhYkascM4LR7BMCOp8o1Ag/eV/hJI=",
-   "module": "sha256-0rHaPRkLwbv8yDfbgBaSG7gbIPYzHaWGpeEmIkSwbfA=",
-   "pom": "sha256-wSIYa7dDZK3V6TRxu9HF5zjlKTm9K7H0Cxngo7i3yC4="
-  },
-  "net/kyori#examination-string/1.3.0": {
-   "jar": "sha256-fQH8JaS7OvDhZiaFRV9FQfv0YmIW6lhG5FXBSR4Va4w=",
-   "module": "sha256-qfpHivwqQ0b4pb4JH14UZmhgGS3YZbHj2FkilmRsdP4=",
-   "pom": "sha256-XuAEEIIvNukBnZR2LOAbzWA5VpdlNRvvBmCUXNT5pW4="
-  },
   "net/kyori#mammoth/1.5.0": {
    "jar": "sha256-VWADh4OJSANDhUCBUlabP48n9Nj2t+zQ01yKtiFFa+o=",
    "module": "sha256-UwaA2PrrD8gaSS2/Hyp0sJOlsqyDeQoRhzGMMzvPYps=",
@@ -1098,10 +1088,10 @@
    "module": "sha256-x/njSbNN+LIRRw4imGJEnDzBPLweeMebKXo3Ryey5gU=",
    "pom": "sha256-kEBuKDkHRCqz88ZftqO25RdILNb4Ywgep70sggENrFc="
   },
-  "org/jetbrains#annotations/26.0.2-1": {
-   "jar": "sha256-IDe+N4mA07qTM+l5VfOyzeOSqhJNBMpzzi7uZlcZkpc=",
-   "module": "sha256-n+hq62S4YyPo5XlQOxGgOKFAaUwTtoBDQ/ik3Jo6RrE=",
-   "pom": "sha256-mn4e3huQFzBSwebtck+w8OvMiP9oLQI/DJs0PhN3p/8="
+  "org/jetbrains#annotations/26.1.0": {
+   "jar": "sha256-68euwlLtDH0tBMA51/AOafe4ax9JPHQdZ7PvMbmGsFQ=",
+   "module": "sha256-W07rjbph51OBYVPgxz9WKyDgF+OTk5UtTeTdMbdyYLs=",
+   "pom": "sha256-+NxQzzqsS87HQKkJVfKADkElHpxANjC3W3UtO271vuI="
   },
   "org/jetbrains/intellij/deps#trove4j/1.0.20200330": {
    "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=",
diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix
index 3b281253b08c..eeb87546ce27 100644
--- a/pkgs/by-name/ve/velocity/package.nix
+++ b/pkgs/by-name/ve/velocity/package.nix
@@ -34,13 +34,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "velocity";
-  version = "3.5.0-unstable-2026-06-16";
+  version = "3.5.0-unstable-2026-07-10";
 
   src = fetchFromGitHub {
     owner = "PaperMC";
     repo = "Velocity";
-    rev = "a7581821fb72a3eb5011f725d8876c91aa7843e1";
-    hash = "sha256-Y3IltMGlf4PCc4DbA1CuWp5NlVcOLfr07wgJcDfY1ms=";
+    rev = "97b386d86ff99f787117cb30e8a4b50c83dba6c2";
+    hash = "sha256-EzoR12YsXP0F7n1ifk/Eg16S//pmYnRpSiO7qkerBes=";
   };
 
   nativeBuildInputs = [

From c0a79c94d0d96c429d3fa596ecbd3a80e96999b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 02:51:32 +0000
Subject: [PATCH 13/38] snips-sh: 0.10.0 -> 0.10.1

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

diff --git a/pkgs/by-name/sn/snips-sh/package.nix b/pkgs/by-name/sn/snips-sh/package.nix
index dc123f4c7a59..2f03ffc67fce 100644
--- a/pkgs/by-name/sn/snips-sh/package.nix
+++ b/pkgs/by-name/sn/snips-sh/package.nix
@@ -9,14 +9,14 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "snips-sh";
-  version = "0.10.0";
-  vendorHash = "sha256-HCrikrdQhufG6/bZoKT5aU4Qrlb7Y3RcGWf1iOCrT6Y=";
+  version = "0.10.1";
+  vendorHash = "sha256-OjcYz7RdCCWur8y+AhGVlQx3UeW+u6rmB73lDUYBsnM=";
 
   src = fetchFromGitHub {
     owner = "robherley";
     repo = "snips.sh";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-DmjS+rhPlUuZZPbNlrhHab9S2mWvKvwrlDsxYPBzvnQ=";
+    hash = "sha256-KPIit7U+630EQ8SeFArCR2qcXVdsjaO1LKZmDO86c0Y=";
   };
 
   tags = (lib.optional (!withTensorflow) "noguesser");

From 019d77691cfce39294b89d15fc5db7d6e88d96b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 04:54:27 +0000
Subject: [PATCH 14/38] ffmpeg-normalize: 1.41.0 -> 1.41.1

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

diff --git a/pkgs/by-name/ff/ffmpeg-normalize/package.nix b/pkgs/by-name/ff/ffmpeg-normalize/package.nix
index 0196c3fdf138..8944f7bda4c9 100644
--- a/pkgs/by-name/ff/ffmpeg-normalize/package.nix
+++ b/pkgs/by-name/ff/ffmpeg-normalize/package.nix
@@ -7,13 +7,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ffmpeg-normalize";
-  version = "1.41.0";
+  version = "1.41.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "ffmpeg_normalize";
-    hash = "sha256-tyDAWBnMwffvTLaLmklQp5e4biaVK5VgHOTtXfHetLc=";
+    hash = "sha256-v5icrioELMBi2uJSdoojgY4EMnwHGxncanrT6GpSpSc=";
   };
 
   build-system = with python3Packages; [ uv-build ];

From 3cbbd497f9ab81c3a9d90742f7c2ad26793f235a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 07:46:25 +0000
Subject: [PATCH 15/38] llmfit: 0.9.34 -> 1.1.2

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

diff --git a/pkgs/by-name/ll/llmfit/package.nix b/pkgs/by-name/ll/llmfit/package.nix
index 56e6ab1885c3..c328d95b7d7d 100644
--- a/pkgs/by-name/ll/llmfit/package.nix
+++ b/pkgs/by-name/ll/llmfit/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "llmfit";
-  version = "0.9.34";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "AlexsJones";
     repo = "llmfit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-S8BvvM1HvMuiXaOBr3TQMtsnWOrQCeYCPamGSz5XDU0=";
+    hash = "sha256-c5q5ok/81JVGUB02oj3fQuHIiQv2aNeXb3L5VprskCs=";
   };
 
-  cargoHash = "sha256-ktXH4iFFwkqQI+un7NNQ3Bsyxwh7Qua8UPwjuQZU1XY=";
+  cargoHash = "sha256-GoMA0G3YXIkHeeIbW4/bOKSeAf2cQk5Tb1e4Rivwx/U=";
 
   passthru.updateScript = nix-update-script { };
 

From 688d2cc58097b13ac24e8b66e076c8c031574718 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sat, 11 Jul 2026 08:12:41 +0000
Subject: [PATCH 16/38] olivetin-3k: 3000.15.0 -> 3000.17.0

---
 pkgs/by-name/ol/olivetin/3k.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ol/olivetin/3k.nix b/pkgs/by-name/ol/olivetin/3k.nix
index 8979c680a5c7..6178db460409 100644
--- a/pkgs/by-name/ol/olivetin/3k.nix
+++ b/pkgs/by-name/ol/olivetin/3k.nix
@@ -16,13 +16,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "olivetin";
-  version = "3000.15.0";
+  version = "3000.17.0";
 
   src = fetchFromGitHub {
     owner = "OliveTin";
     repo = "OliveTin";
     tag = finalAttrs.version;
-    hash = "sha256-AztJqhSJV9hIsnhaYZoIMC8ZE17pUT37nRUdCZ6ZiCA=";
+    hash = "sha256-oLBXDd1grSFEbCvB4bK2XeVOZONSYro/6rvMJkG8eU0=";
   };
 
   modRoot = "service";
@@ -75,7 +75,7 @@ buildGoModule (finalAttrs: {
     '';
 
     outputHashMode = "recursive";
-    outputHash = "sha256-v7aSikl1VSFZdNKnIucs7RdqFWoaVNIH9u27YG9Ei90=";
+    outputHash = "sha256-X602MebKdmdxZ9OEtQ150u+/Z1O9FEvcxRtOhMorqyw=";
   };
 
   webui = buildNpmPackage {

From 21f6825d30fa850e281c83053f9d3b40e2c3c515 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 22:52:48 +0000
Subject: [PATCH 17/38] c3c: 0.8.1 -> 0.8.2

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

diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix
index ee4d24d771d9..806cd0c3f6ab 100644
--- a/pkgs/by-name/c3/c3c/package.nix
+++ b/pkgs/by-name/c3/c3c/package.nix
@@ -19,13 +19,13 @@ in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
 
   pname = "c3c${optionalString debug "-debug"}";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "c3lang";
     repo = "c3c";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HPPeedpbEgG6Zx6a+eV8CBO3rxMXMstLa4kx2NkNYnM=";
+    hash = "sha256-6XUMlF9SRQ9aqVRl5BQdELVsj/DyXhCnH85QrbK8Xxo=";
   };
 
   cmakeBuildType = if debug then "Debug" else "Release";

From 2eebe2bf904403839357d556560f449e41ef3245 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 23:15:23 +0000
Subject: [PATCH 18/38] objfw: 1.5.6 -> 1.5.7

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

diff --git a/pkgs/by-name/ob/objfw/package.nix b/pkgs/by-name/ob/objfw/package.nix
index 8c2eb0486f23..97a793af194b 100644
--- a/pkgs/by-name/ob/objfw/package.nix
+++ b/pkgs/by-name/ob/objfw/package.nix
@@ -12,14 +12,14 @@
 
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "objfw";
-  version = "1.5.6";
+  version = "1.5.7";
 
   src = fetchFromGitea {
     domain = "git.nil.im";
     owner = "ObjFW";
     repo = "ObjFW";
     rev = "${finalAttrs.version}-release";
-    hash = "sha256-9wrsRi3HnAhDbWsK8AcKBesFANvBLkGvgaE/mOK5KSw=";
+    hash = "sha256-3MdQG2pVjlBdbmBzTrrKdkbSzsvjZWZRoSPsN+MURCQ=";
   };
 
   nativeBuildInputs = [

From 2bd424c93ff912b061d55cc69058e24bb7d37a5f Mon Sep 17 00:00:00 2001
From: Sapphire <imsapphire0@gmail.com>
Date: Fri, 10 Jul 2026 16:01:21 -0500
Subject: [PATCH 19/38] alcom: 1.1.6 -> 1.1.8

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

diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix
index eccbad84748d..870741182607 100644
--- a/pkgs/by-name/al/alcom/package.nix
+++ b/pkgs/by-name/al/alcom/package.nix
@@ -21,12 +21,12 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "alcom";
-  version = "1.1.6";
+  version = "1.1.8";
   src = fetchFromGitHub {
     owner = "vrc-get";
     repo = "vrc-get";
     tag = "gui-v${finalAttrs.version}";
-    hash = "sha256-TpVHE3e3dMdBOtPVKomKvg5tQf42QWik18k5oVD2Hms=";
+    hash = "sha256-86oR2+qKCmgkQMROq/RZDsSYINzdG5U08dmPznzMSzg=";
   };
 
   nativeBuildInputs = [
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     webkitgtk_4_1
   ];
 
-  cargoHash = "sha256-J8vCr+B4J3ZqxkkNk+x0jr52qNJJYfBJe2oyLf0GLsc=";
+  cargoHash = "sha256-z3VLIRTyS127TS+jdGTdlt1xmMHdwFAsMzkkuVc78lU=";
   buildFeatures = [ "no-self-updater" ];
   buildAndTestSubdir = subdir;
 
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/${subdir}";
-    hash = "sha256-VyA2c2659Kg1DjLmmtvSAivltdraSBNArIu1XGENGmQ=";
+    hash = "sha256-flWM2ctaGak/KaTZ5sCj3Z28vIqOeiX8VJMTaIxg2fw=";
   };
   npmRoot = subdir;
 

From 299a6fb08206ad55c64bc32fc9ac2ea688f73eb8 Mon Sep 17 00:00:00 2001
From: Sapphire <imsapphire0@gmail.com>
Date: Fri, 10 Jul 2026 16:49:12 -0500
Subject: [PATCH 20/38] alcom: install app icon

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

diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix
index 870741182607..b8dede7d42c8 100644
--- a/pkgs/by-name/al/alcom/package.nix
+++ b/pkgs/by-name/al/alcom/package.nix
@@ -52,6 +52,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildFeatures = [ "no-self-updater" ];
   buildAndTestSubdir = subdir;
 
+  postInstall = ''
+    install -Dm644 ${subdir}/icons/icon.png $out/share/icons/hicolor/512x512/apps/ALCOM.png
+    for size in 32x32 64x64 128x128 128x128@2x; do
+      install -Dm644 ${subdir}/icons/$size.png $out/share/icons/hicolor/''${size%x}/apps/ALCOM.png
+    done
+  '';
+
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;

From 41deab48de88de6d0450724bc713a0e1c34f333d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 04:54:40 +0000
Subject: [PATCH 21/38] entire: 0.7.8 -> 0.8.42

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

diff --git a/pkgs/by-name/en/entire/package.nix b/pkgs/by-name/en/entire/package.nix
index 8ce5c4ec6804..6c9ac2aa2b12 100644
--- a/pkgs/by-name/en/entire/package.nix
+++ b/pkgs/by-name/en/entire/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "entire";
-  version = "0.7.8";
+  version = "0.8.42";
 
   src = fetchFromGitHub {
     owner = "entireio";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SqJnrvRwjuPMCEkd4d+ULIUOfDW6mPs6VeW84Tc5vN0=";
+    hash = "sha256-luxUyIScUCY/hd2vp32HcItRd3xfra+SDYdzf3q8Dv0=";
   };
 
-  vendorHash = "sha256-foQkuVJtyWJrGSPV8kxMcAWdjCw4TOgMV/KUa92FL/Y=";
+  vendorHash = "sha256-N8VH9uHPfF+WX1LF6ysV+mkhgpb81Txz1Y68+DoxQ3A=";
 
   subPackages = [ "cmd/entire" ];
 

From 03e3d071fbe6f7bd4c9eb01a6762222875086e14 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 05:29:17 +0000
Subject: [PATCH 22/38] mise: 2026.7.4 -> 2026.7.5

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

diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix
index 500e504b15a3..51d6a9def25f 100644
--- a/pkgs/by-name/mi/mise/package.nix
+++ b/pkgs/by-name/mi/mise/package.nix
@@ -22,16 +22,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mise";
-  version = "2026.7.4";
+  version = "2026.7.5";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "mise";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WNxOHnaT31Wfezwp48g/5P+OYIxG9uoSU3FpX8/J51Q=";
+    hash = "sha256-oHZXd9u+FbwOs60yrmg5oSnQoHskVCi29TRgu0RKOpM=";
   };
 
-  cargoHash = "sha256-gjp4H6OtrdCtboAYqPX7+LrHkL2Dh7LkQ9GiMGwjIFM=";
+  cargoHash = "sha256-JXipQn9gN5cJx6PSpDYHuxjYLNRyAwpjSaROxqSvIog=";
 
   nativeBuildInputs = [
     installShellFiles

From aa9d1355338a03f2f15088c089eee8879df05c87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 05:37:48 +0000
Subject: [PATCH 23/38] oxicloud: 0.8.1 -> 0.8.3

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

diff --git a/pkgs/by-name/ox/oxicloud/package.nix b/pkgs/by-name/ox/oxicloud/package.nix
index 31027047f7cf..7d83e10e6ca4 100644
--- a/pkgs/by-name/ox/oxicloud/package.nix
+++ b/pkgs/by-name/ox/oxicloud/package.nix
@@ -10,7 +10,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oxicloud";
-  version = "0.8.1";
+  version = "0.8.3";
 
   __structuredAttrs = true;
 
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "AtalayaLabs";
     repo = "OxiCloud";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vfVh1yqVYQD43RsTqUn2gVR6MldYG0MC0cdRWPZ6rRk=";
+    hash = "sha256-9bUfHSBXEEwU35J7zXdpS7zPKOFyCerQq5WQ6rO5tag=";
   };
 
-  cargoHash = "sha256-sEO8Q980S/jXR8SoI1hTPA+gvV7pNZ8ZD7re5qlSJwY=";
+  cargoHash = "sha256-M3gl00jSvykx6+ewbvgEZiNL9bDDjfnq089nYXiwEiQ=";
 
   nativeBuildInputs = [
     pkg-config

From 40b1cf654149434a485d212a286b1e01b9f34aed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 05:41:28 +0000
Subject: [PATCH 24/38] blesh: 0.4.0-devel3-unstable-2026-06-27 ->
 0.4.0-devel3-unstable-2026-07-11

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

diff --git a/pkgs/by-name/bl/blesh/package.nix b/pkgs/by-name/bl/blesh/package.nix
index 74fba950d70b..78d9aca9f693 100644
--- a/pkgs/by-name/bl/blesh/package.nix
+++ b/pkgs/by-name/bl/blesh/package.nix
@@ -10,14 +10,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "blesh";
-  version = "0.4.0-devel3-unstable-2026-06-27";
+  version = "0.4.0-devel3-unstable-2026-07-11";
 
   src = fetchFromGitHub {
     owner = "akinomyoga";
     repo = "ble.sh";
-    rev = "5d39ebe6db67a46de4195f8ce8186e34cd2618d1";
+    rev = "d69e4d549a1881a37300fe6b4a05478bd9157dfc";
     fetchSubmodules = true;
-    hash = "sha256-12aSZl0qx0CwaIq/U77pCFz9Ij2CrzhojQuBngc7oag=";
+    hash = "sha256-w2d7JCa/cBpe8x+pnGWq+h6cpUVJCNyHZymgbKKPDQE=";
   };
 
   nativeBuildInputs = [

From 878dc0f6faf5c2225dfdf34a63c2b2781fbb3f10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 05:55:13 +0000
Subject: [PATCH 25/38] home-assistant-custom-components.yandex-station: 3.21.3
 -> 3.21.4

---
 .../custom-components/yandex-station/package.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix b/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix
index ddb2df0214e4..f59180a2050c 100644
--- a/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
   owner = "AlexxIT";
   domain = "yandex_station";
-  version = "3.21.3";
+  version = "3.21.4";
 
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "YandexStation";
     tag = "v${version}";
-    hash = "sha256-oaH9zJ0LdKjKcVTsw1IKpc+s/AXWWYVU7mTUoiO/hWY=";
+    hash = "sha256-NbR8CqF7dr0q2nFZHi90IGmDELflcboeJTlVeYoBdvw=";
   };
 
   dependencies = [

From 3e99ff2db857888cb2dbb2a353a6dd940cada196 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 06:00:21 +0000
Subject: [PATCH 26/38] meilisearch: 1.48.3 -> 1.49.0

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

diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix
index 079f4b68e1f5..6f4876cfbf5b 100644
--- a/pkgs/by-name/me/meilisearch/package.nix
+++ b/pkgs/by-name/me/meilisearch/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "meilisearch";
-  version = "1.48.3";
+  version = "1.49.0";
 
   src = fetchFromGitHub {
     owner = "meilisearch";
     repo = "meilisearch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Za5yhCPahJAZQhavhCwIqX6xhWa7l4sYRzhs+ozN94U=";
+    hash = "sha256-obUX84KNeJzkuRjOFBtLmCo/lcq0AwsaY/WDgaLhN2k=";
   };
 
   cargoBuildFlags = [ "--package=meilisearch" ];
 
-  cargoHash = "sha256-405b/puYbcIByE8nacJu8tjw5oh846c7UaCpWH4MpME=";
+  cargoHash = "sha256-1UjXuvzT3gN0byKtYs6fv6xyKAi4uPBip9l+r6I1lHU=";
 
   # Default features include mini dashboard which downloads something from the internet.
   buildNoDefaultFeatures = true;

From 6aa012a63186e0482c2312117ef30a96e8f35c7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 06:12:16 +0000
Subject: [PATCH 27/38] python3Packages.knx-frontend: 2026.6.23.203726 ->
 2026.7.8.100603

---
 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 00a90f5aaa2e..9229225803a1 100644
--- a/pkgs/development/python-modules/knx-frontend/default.nix
+++ b/pkgs/development/python-modules/knx-frontend/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "knx-frontend";
-  version = "2026.6.23.203726";
+  version = "2026.7.8.100603";
   pyproject = true;
 
   # TODO: source build, uses yarn.lock
   src = fetchPypi {
     pname = "knx_frontend";
     inherit (finalAttrs) version;
-    hash = "sha256-lbkdw/OmMzwnhy2Z61rVhAi74euwx5M7h21YFZYcR4c=";
+    hash = "sha256-80yeDZ8a8WDf/NEXjFSkcfpglp9yTnmg+4csFbgdFpM=";
   };
 
   build-system = [ setuptools ];

From d86ef8ddf5f921068a50605f86e7f886b2000a46 Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@proton.me>
Date: Sun, 12 Jul 2026 08:28:08 +0200
Subject: [PATCH 28/38] maintainers: remove diniamo

---
 maintainers/maintainer-list.nix                    | 6 ------
 nixos/modules/services/misc/shoko.nix              | 5 +----
 nixos/tests/shoko.nix                              | 5 +----
 pkgs/by-name/an/ananicy-cpp/package.nix            | 1 -
 pkgs/by-name/an/ani-cli/package.nix                | 5 +----
 pkgs/by-name/an/ani-skip/package.nix               | 2 +-
 pkgs/by-name/od/odin/package.nix                   | 1 -
 pkgs/by-name/ra/raylib/package.nix                 | 2 +-
 pkgs/by-name/sh/shoko-webui/package.nix            | 5 +----
 pkgs/by-name/sh/shoko/package.nix                  | 5 +----
 pkgs/by-name/um/umu-launcher-unwrapped/package.nix | 1 -
 11 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 94c94c3d8c3a..3a26d7cfad55 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7036,12 +7036,6 @@
     github = "DimitarNestorov";
     githubId = 8790386;
   };
-  diniamo = {
-    name = "diniamo";
-    email = "diniamo53@gmail.com";
-    github = "diniamo";
-    githubId = 55629891;
-  };
   diogomdp = {
     email = "me@diogodp.dev";
     github = "diogomdp";
diff --git a/nixos/modules/services/misc/shoko.nix b/nixos/modules/services/misc/shoko.nix
index 2b9ab971e212..9b41d45ca9c1 100644
--- a/nixos/modules/services/misc/shoko.nix
+++ b/nixos/modules/services/misc/shoko.nix
@@ -90,8 +90,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [
-    diniamo
-    nanoyaki
-  ];
+  meta.maintainers = with lib.maintainers; [ nanoyaki ];
 }
diff --git a/nixos/tests/shoko.nix b/nixos/tests/shoko.nix
index dfddc19b83c5..7fe68abbbd52 100644
--- a/nixos/tests/shoko.nix
+++ b/nixos/tests/shoko.nix
@@ -17,10 +17,7 @@
         machine.succeed("curl --fail http://localhost:8111")
       '';
 
-      meta.maintainers = with lib.maintainers; [
-        diniamo
-        nanoyaki
-      ];
+      meta.maintainers = with lib.maintainers; [ nanoyaki ];
     }
   );
 
diff --git a/pkgs/by-name/an/ananicy-cpp/package.nix b/pkgs/by-name/an/ananicy-cpp/package.nix
index 1ce7a6228d1b..d9459897ecbd 100644
--- a/pkgs/by-name/an/ananicy-cpp/package.nix
+++ b/pkgs/by-name/an/ananicy-cpp/package.nix
@@ -85,7 +85,6 @@ clangStdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       artturin
       johnrtitor
-      diniamo
     ];
     mainProgram = "ananicy-cpp";
   };
diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix
index 79b1d8bdab15..d53722be88dd 100644
--- a/pkgs/by-name/an/ani-cli/package.nix
+++ b/pkgs/by-name/an/ani-cli/package.nix
@@ -66,10 +66,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/pystardust/ani-cli";
     description = "Cli tool to browse and play anime";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [
-      skykanin
-      diniamo
-    ];
+    maintainers = with lib.maintainers; [ skykanin ];
     platforms = lib.platforms.unix;
     mainProgram = "ani-cli";
     sourceProvenance = with lib.sourceTypes; [
diff --git a/pkgs/by-name/an/ani-skip/package.nix b/pkgs/by-name/an/ani-skip/package.nix
index a42bac4297a8..2cb08aba8adb 100644
--- a/pkgs/by-name/an/ani-skip/package.nix
+++ b/pkgs/by-name/an/ani-skip/package.nix
@@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Automated solution to bypassing anime opening and ending sequences";
     mainProgram = "ani-skip";
     license = lib.licenses.gpl3;
-    maintainers = [ lib.maintainers.diniamo ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/od/odin/package.nix b/pkgs/by-name/od/odin/package.nix
index 37c7e15c20ce..b23e7a24a94b 100644
--- a/pkgs/by-name/od/odin/package.nix
+++ b/pkgs/by-name/od/odin/package.nix
@@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       astavie
       atomicptr
-      diniamo
     ];
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isMusl;
diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix
index 69de9e052379..e08181297cb8 100644
--- a/pkgs/by-name/ra/raylib/package.nix
+++ b/pkgs/by-name/ra/raylib/package.nix
@@ -88,7 +88,7 @@ lib.checkListOfEnum "raylib: platform"
         homepage = "https://www.raylib.com/";
         downloadPage = "https://github.com/raysan5/raylib";
         license = lib.licenses.zlib;
-        maintainers = [ lib.maintainers.diniamo ];
+        maintainers = [ ];
         teams = [ lib.teams.ngi ];
         platforms = lib.platforms.all;
         changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.src.rev}/CHANGELOG";
diff --git a/pkgs/by-name/sh/shoko-webui/package.nix b/pkgs/by-name/sh/shoko-webui/package.nix
index 5e25f5c5bf22..4a64b65afd0c 100644
--- a/pkgs/by-name/sh/shoko-webui/package.nix
+++ b/pkgs/by-name/sh/shoko-webui/package.nix
@@ -64,10 +64,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ShokoAnime/Shoko-WebUI";
     changelog = "https://github.com/ShokoAnime/Shoko-WebUI/releases/tag/v${finalAttrs.version}";
     description = "Web-based frontend for the Shoko anime management system";
-    maintainers = with lib.maintainers; [
-      diniamo
-      nanoyaki
-    ];
+    maintainers = with lib.maintainers; [ nanoyaki ];
     inherit (shoko.meta) license platforms;
   };
 })
diff --git a/pkgs/by-name/sh/shoko/package.nix b/pkgs/by-name/sh/shoko/package.nix
index b59646aa000a..8ed20a1be403 100644
--- a/pkgs/by-name/sh/shoko/package.nix
+++ b/pkgs/by-name/sh/shoko/package.nix
@@ -55,10 +55,7 @@ buildDotnetModule (finalAttrs: {
     description = "Backend for the Shoko anime management system";
     license = lib.licenses.mit;
     mainProgram = "Shoko.CLI";
-    maintainers = with lib.maintainers; [
-      diniamo
-      nanoyaki
-    ];
+    maintainers = with lib.maintainers; [ nanoyaki ];
     inherit (dotnet-sdk_8.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
index 6826436d1b0d..81002115d6dd 100644
--- a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
+++ b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
@@ -99,7 +99,6 @@ python3Packages.buildPythonPackage rec {
     license = lib.licenses.gpl3;
     mainProgram = "umu-run";
     maintainers = with lib.maintainers; [
-      diniamo
       MattSturgeon
       fuzen
     ];

From 5049f771c0c3a6e919a6fb92f35d5977ea4ca5e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 06:57:53 +0000
Subject: [PATCH 29/38] anda: 0.7.1 -> 0.7.3

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

diff --git a/pkgs/by-name/an/anda/package.nix b/pkgs/by-name/an/anda/package.nix
index b494810cee55..71749b894593 100644
--- a/pkgs/by-name/an/anda/package.nix
+++ b/pkgs/by-name/an/anda/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "anda";
-  version = "0.7.1";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "FyraLabs";
     repo = "anda";
     tag = finalAttrs.version;
-    hash = "sha256-4KiqIBWQfI8IagSoa39+bh0bVdhbuwTmxPdNkRlNEdA=";
+    hash = "sha256-2I+4n/RWC8hqztjiKjqJadaajTaiwFrqGDL7166Gvso=";
   };
 
-  cargoHash = "sha256-EWPahdExDi0TFVVMPljTb+j8iUtoqYOqU8LI621gj30=";
+  cargoHash = "sha256-v0HnWbLq8zwJZr0uNVj/1c5fg6b//X1szm6eel/8Ls8=";
 
   __structuredAttrs = true;
 

From ad3d97426255abeb146261dbf423c1ff3a21b6d0 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Fri, 10 Jul 2026 19:26:58 +0200
Subject: [PATCH 30/38] matrix-continuwuity: 0.5.10 -> 26.6.1

Release notes: https://forgejo.ellis.link/continuwuation/continuwuity/releases/tag/v26.6.1 and https://forgejo.ellis.link/continuwuation/continuwuity/releases/tag/v26.6.0
Changelog: https://forgejo.ellis.link/continuwuation/continuwuity/src/commit/v26.6.1/CHANGELOG.md
Diff: https://forgejo.ellis.link/continuwuation/continuwuity/compare/v0.5.10...v26.6.1
---
 pkgs/by-name/ma/matrix-continuwuity/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix
index 57ee2cd74ca2..6e7e99fcc997 100644
--- a/pkgs/by-name/ma/matrix-continuwuity/package.nix
+++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix
@@ -23,13 +23,13 @@ let
     }).overrideAttrs
       (
         final: old: {
-          version = "10.10.1";
+          version = "11.1.1";
           src = fetchFromGitea {
             domain = "forgejo.ellis.link";
             owner = "continuwuation";
             repo = "rocksdb";
-            rev = "10.10.fb";
-            hash = "sha256-1ef75IDMs5Hba4VWEyXPJb02JyShy5k4gJfzGDhopRk=";
+            rev = "3756b2b905e13216d8b56bcc783d814e7b073aff";
+            hash = "sha256-rSv4fr2bf9JJwdodgeuPCuceeh7k97KVxrAOC0wyPQY=";
           };
 
           patches = [ ];
@@ -38,17 +38,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-continuwuity";
-  version = "0.5.10";
+  version = "26.6.1";
 
   src = fetchFromGitea {
     domain = "forgejo.ellis.link";
     owner = "continuwuation";
     repo = "continuwuity";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oevEGYlAK/rMJhm200CkwerT5oVak8sJj0Fa6r6+J/Q=";
+    hash = "sha256-sfUxhBPf0P46Xf0lcZFDj23cuZ9apJDyTQPa97jlcSY=";
   };
 
-  cargoHash = "sha256-uvMiFURXxkLbbbwq4pG5hevsLZHQ1wVfTNvzQRTQWxE=";
+  cargoHash = "sha256-Qmw9Xum+Osu/4kbVqJP79gbtimpV2P7SkCMuQWyBYxg=";
 
   nativeBuildInputs = [
     pkg-config

From fe3454e664e7c550ad7eecbd51a34cc0b0195f0c Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Fri, 10 Jul 2026 01:13:11 +0200
Subject: [PATCH 31/38] nixos/tests/matrix-continuwuity: refactor to mautrix
 library

This is because [matrix-nio](https://github.com/matrix-nio/matrix-nio) is pretty dead, and does not seem to like the new continuwuity version with the new default v12 rooms.
Mautrix is actively maintained and a good fit for basic testing of the client-server connection on NixOS.
---
 nixos/tests/matrix/continuwuity.nix | 69 ++++++++++++++++-------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/nixos/tests/matrix/continuwuity.nix b/nixos/tests/matrix/continuwuity.nix
index cf07293b1ab0..91571301661a 100644
--- a/nixos/tests/matrix/continuwuity.nix
+++ b/nixos/tests/matrix/continuwuity.nix
@@ -20,61 +20,66 @@ in
       };
       networking.firewall.allowedTCPPorts = [ 6167 ];
     };
+
     client =
       { pkgs, ... }:
       {
         environment.systemPackages = [
-          (pkgs.writers.writePython3Bin "do_test" { libraries = [ pkgs.python3Packages.matrix-nio ]; } ''
+          (pkgs.writers.writePython3Bin "do_test" { libraries = [ pkgs.python3Packages.mautrix ]; } ''
             import asyncio
-            import nio
+
+            from mautrix.client import Client
+            from mautrix.types import EventType, RoomFilter
 
 
             async def main() -> None:
                 # Connect to continuwuity
-                client = nio.AsyncClient("http://continuwuity:6167", "${user}")
+                client = Client(
+                    mxid="@${user}:${name}",
+                    base_url="http://continuwuity:6167",
+                )
 
                 # Log in as user alice
-                response = await client.login("${pass}")
+                await client.login(password="${pass}")
 
                 # Create a new room
-                response = await client.room_create(federate=False)
-                print("Matrix room create response:", response)
-                assert isinstance(response, nio.RoomCreateResponse)
-                room_id = response.room_id
+                room_id = await client.create_room()
+                print("Created room:", room_id)
 
                 # Join the room
-                response = await client.join(room_id)
-                print("Matrix join response:", response)
-                assert isinstance(response, nio.JoinResponse)
+                await client.join_room_by_id(room_id)
+                print("Joined room")
 
                 # Send a message to the room
-                response = await client.room_send(
-                    room_id=room_id,
-                    message_type="m.room.message",
-                    content={
-                        "msgtype": "m.text",
-                        "body": "Hello continuwuity!"
-                    }
-                )
-                print("Matrix room send response:", response)
-                assert isinstance(response, nio.RoomSendResponse)
+                received = asyncio.Event()
+                msg = "Hello continuwuity!"
 
-                # Sync responses
-                response = await client.sync(timeout=30000)
-                print("Matrix sync response:", response)
-                assert isinstance(response, nio.SyncResponse)
+                async def on_message(evt):
+                    if (
+                        evt.room_id != room_id
+                        or evt.sender != client.mxid
+                        or evt.type != EventType.ROOM_MESSAGE
+                    ):
+                        return
 
-                # Check the message was received by continuwuity
-                last_message = response.rooms.join[room_id].timeline.events[-1].body
-                assert last_message == "Hello continuwuity!"
+                    assert evt.content.body == msg
+                    received.set()
+
+                client.add_event_handler(EventType.ROOM_MESSAGE, on_message)
+                sync_task = client.start(RoomFilter(rooms=[room_id]))
+
+                await client.send_text(room_id, msg)
+
+                # Sync until message is received
+                await asyncio.wait_for(received.wait(), timeout=30)
 
                 # Leave the room
-                response = await client.room_leave(room_id)
-                print("Matrix room leave response:", response)
-                assert isinstance(response, nio.RoomLeaveResponse)
+                await client.leave_room(room_id)
+                print("Left room")
 
                 # Close the client
-                await client.close()
+                client.stop()
+                await sync_task
 
 
             if __name__ == "__main__":

From 91bc748a73e6b14f74e69af75c6701c664314029 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Fri, 10 Jul 2026 01:37:53 +0200
Subject: [PATCH 32/38] nixos/tests/matrix-continuwuity: add bartoostveen as a
 maintainer

---
 nixos/tests/matrix/continuwuity.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/matrix/continuwuity.nix b/nixos/tests/matrix/continuwuity.nix
index 91571301661a..80c46fb21362 100644
--- a/nixos/tests/matrix/continuwuity.nix
+++ b/nixos/tests/matrix/continuwuity.nix
@@ -101,6 +101,7 @@ in
   '';
 
   meta.maintainers = with lib.maintainers; [
+    bartoostveen
     nyabinary
     snaki
   ];

From d59ab689eead5c981f0d90aeff93cf94c6e1f1c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 09:24:42 +0000
Subject: [PATCH 33/38] libretro.fceumm: 0-unstable-2026-06-30 ->
 0-unstable-2026-07-06

---
 pkgs/applications/emulators/libretro/cores/fceumm.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix
index fa4b3cbf53a0..1ba899595e21 100644
--- a/pkgs/applications/emulators/libretro/cores/fceumm.nix
+++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fceumm";
-  version = "0-unstable-2026-06-30";
+  version = "0-unstable-2026-07-06";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-fceumm";
-    rev = "6e00afac498903586330492cdd81354a6c4c0d4c";
-    hash = "sha256-0WPMqXj/hNtFxUAIL16B80SxZ8FW31M4g/8wVMZLv/w=";
+    rev = "0d610d9a6401697157f693a5407adf450a0e52fb";
+    hash = "sha256-4QroyuhQrH5FhK86nuUztvrIwG4Ibj2zltPhhdLuJm0=";
   };
 
   meta = {

From 485001582244f552fc1be2a3780f2724410d764a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 09:28:41 +0000
Subject: [PATCH 34/38] restate: 1.7.0 -> 1.7.2

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

diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix
index 189f5baddae5..47cbb4928025 100644
--- a/pkgs/by-name/re/restate/package.nix
+++ b/pkgs/by-name/re/restate/package.nix
@@ -26,16 +26,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "restate";
-  version = "1.7.0";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "restatedev";
     repo = "restate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iXBGYgzguSHRFOR4ZqX7jGeQvGrBq9/+EFrc0RdVTMA=";
+    hash = "sha256-UXyDlrhCVD4lPVnlNvLg8QcV+nBOmHrq8m0eiJFsq/c=";
   };
 
-  cargoHash = "sha256-haCi9qaDrRccw+2DKNi8gErp3jx5OuMWDJNy19xesNQ=";
+  cargoHash = "sha256-Enouq6a0V0q/raMfjXIDIijF1gb7ezBn1kFIqxwklp4=";
 
   env = {
     PROTOC = lib.getExe protobuf;

From 2c276e7d4e65c273cc73711dafe899a6fd75963c Mon Sep 17 00:00:00 2001
From: kaynetik <aleksandar@nesovic.dev>
Date: Sun, 12 Jul 2026 12:18:57 +0200
Subject: [PATCH 35/38] hunk: init at v0.17.0

Signed-off-by: kaynetik <aleksandar@nesovic.dev>
---
 pkgs/by-name/hu/hunk/package.nix | 152 +++++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 pkgs/by-name/hu/hunk/package.nix

diff --git a/pkgs/by-name/hu/hunk/package.nix b/pkgs/by-name/hu/hunk/package.nix
new file mode 100644
index 000000000000..588ef9ef3ae3
--- /dev/null
+++ b/pkgs/by-name/hu/hunk/package.nix
@@ -0,0 +1,152 @@
+{
+  lib,
+  stdenv,
+  bun,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+let
+  pname = "hunk";
+  version = "0.17.0";
+
+  src = fetchFromGitHub {
+    owner = "modem-dev";
+    repo = "hunk";
+    tag = "v${version}";
+    hash = "sha256-FlwCtcu2JRECyKC1balItY/DmQyb+obh+97wo7+06DU=";
+  };
+
+  node_modules = stdenv.mkDerivation {
+    pname = "${pname}-node_modules";
+    inherit version src;
+
+    nativeBuildInputs = [
+      bun
+      writableTmpDirAsHomeHook
+    ];
+
+    dontConfigure = true;
+
+    buildPhase = ''
+      runHook preBuild
+
+      export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
+      bun install \
+        --cpu="*" \
+        --frozen-lockfile \
+        --ignore-scripts \
+        --no-progress \
+        --os="*"
+
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out
+      cp -R node_modules $out
+      find packages -type d -name node_modules -exec cp -R --parents {} $out \;
+
+      runHook postInstall
+    '';
+
+    dontFixup = true;
+
+    outputHash = "sha256-LkOAWScuNPx9/KOcG110ngLz0QmB4/S3VxIAb3EIH7I=";
+    outputHashMode = "recursive";
+  };
+in
+stdenv.mkDerivation {
+  inherit pname version src;
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    bun
+    writableTmpDirAsHomeHook
+  ];
+
+  configurePhase = ''
+    runHook preConfigure
+
+    cp -R ${node_modules}/. .
+    chmod -R u+w node_modules
+    find packages -type d -name node_modules -exec chmod -R u+w {} \;
+
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    mkdir -p .bun-tmp .bun-install
+    BUN_TMPDIR=$PWD/.bun-tmp \
+    BUN_INSTALL=$PWD/.bun-install \
+      bun build --compile \
+        --no-compile-autoload-bunfig \
+        --no-compile-autoload-dotenv \
+        src/main.tsx \
+        --outfile hunk
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 hunk $out/bin/hunk
+    mkdir -p $out/share/hunk
+    cp -R skills $out/share/hunk/skills
+    ln -s share/hunk/skills $out/skills
+
+    runHook postInstall
+  '';
+
+  dontFixup = true;
+  dontStrip = true;
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+  versionCheckProgramArg = "--version";
+
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    $out/bin/hunk --version | grep -F ${version}
+    test -f "$($out/bin/hunk skill path)"
+
+    runHook postInstallCheck
+  '';
+
+  passthru = {
+    inherit node_modules;
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage"
+        "node_modules"
+      ];
+    };
+  };
+
+  meta = {
+    description = "Terminal diff viewer for agentic changesets";
+    homepage = "https://github.com/modem-dev/hunk";
+    changelog = "https://github.com/modem-dev/hunk/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    mainProgram = "hunk";
+    maintainers = with lib.maintainers; [
+      MarkusZoppelt
+      kaynetik
+    ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    sourceProvenance = [ lib.sourceTypes.fromSource ];
+  };
+}

From ec145f08f2d7b19808d3e23c614abab2a5221e8d Mon Sep 17 00:00:00 2001
From: Conor <conorboyle07@protonmail.com>
Date: Sun, 12 Jul 2026 12:09:42 +0100
Subject: [PATCH 36/38] breakpad: fix build on musl and modernise

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

diff --git a/pkgs/by-name/br/breakpad/package.nix b/pkgs/by-name/br/breakpad/package.nix
index b6785405496c..9853e94d8975 100644
--- a/pkgs/by-name/br/breakpad/package.nix
+++ b/pkgs/by-name/br/breakpad/package.nix
@@ -13,17 +13,24 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "breakpad";
-
   version = "2024.02.16";
 
+  __structuredAttrs = true;
+
   src = fetchgit {
     url = "https://chromium.googlesource.com/breakpad/breakpad";
     rev = "v${finalAttrs.version}";
     hash = "sha256-yk+TSzjmAr9QMTYduKVe/Aizph/NNmSS385pvGJckiQ=";
   };
 
+  strictDeps = true;
+
+  enableParallelBuilding = true;
+
   buildInputs = [ zlib ];
 
+  configureFlags = lib.optionals stdenv.hostPlatform.isMusl [ "--disable-tools" ];
+
   postUnpack = ''
     ln -s ${lss} $sourceRoot/src/third_party/lss
   '';

From c44229527a4e46bb3680b998e9d5a5108ea7a8a8 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Sun, 12 Jul 2026 14:05:19 +0200
Subject: [PATCH 37/38] fwupd: clarify efi_app_location comment

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

diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix
index 2db794b344ee..f1b00d478d60 100644
--- a/pkgs/by-name/fw/fwupd/package.nix
+++ b/pkgs/by-name/fw/fwupd/package.nix
@@ -226,7 +226,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--sysconfdir=/etc"
     (lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc")
     (lib.mesonOption "efi_os_dir" "nixos")
-    # EFI capsule is located in fwupd-efi now.
+    # Use the EFI app from the separate fwupd-efi package.
     (lib.mesonOption "efi_app_location" "${fwupd-efi}/libexec/fwupd/efi")
     # HSI is auto-disabled on non-x86 upstream; auto_features=enabled overrides
     # that, breaking the fwupdtool installed test which expects rc=1 on non-x86.

From 85fc5a135e84136f92c58f1884fe7066fd410db3 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Sun, 12 Jul 2026 14:05:43 +0200
Subject: [PATCH 38/38] fwupd: fix seal check rejecting files on tmpfs

Backport the upstream fix, to be removed when updating to 2.1.7.
---
 pkgs/by-name/fw/fwupd/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix
index f1b00d478d60..734a4f07e844 100644
--- a/pkgs/by-name/fw/fwupd/package.nix
+++ b/pkgs/by-name/fw/fwupd/package.nix
@@ -13,6 +13,7 @@
   unstableGitUpdater,
 
   # fwupd
+  fetchpatch2,
   pkg-config,
   pkgsBuildBuild,
 
@@ -147,6 +148,14 @@ stdenv.mkDerivation (finalAttrs: {
     ./0001-Install-fwupdplugin-to-out.patch
     ./0002-Add-output-for-installed-tests.patch
     ./0003-Add-option-for-installation-sysconfdir.patch
+
+    # The memfd seal check added in 2.1.6 rejects any file on tmpfs, since
+    # F_GET_SEALS also works on tmpfs files on recent kernels.
+    # Remove when updating to 2.1.7.
+    (fetchpatch2 {
+      url = "https://github.com/fwupd/fwupd/commit/c2ff6e0bf9e3fea5b8502ed12fdc9ab604a51518.patch";
+      hash = "sha256-Y8YbECfUGqvpNTlKCLOXgRSIZYO+MsZYIMcMgIQfkIs=";
+    })
   ];
 
   postPatch = ''