From 6980046568bb8649947ef8331826da9128356aad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Apr 2026 21:39:20 +0000
Subject: [PATCH 001/100] acme-sh: 3.1.2 -> 3.1.3

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

diff --git a/pkgs/by-name/ac/acme-sh/package.nix b/pkgs/by-name/ac/acme-sh/package.nix
index 25d059324e1d..54c619405d8e 100644
--- a/pkgs/by-name/ac/acme-sh/package.nix
+++ b/pkgs/by-name/ac/acme-sh/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "acme.sh";
-  version = "3.1.2";
+  version = "3.1.3";
 
   src = fetchFromGitHub {
     owner = "acmesh-official";
     repo = "acme.sh";
     tag = finalAttrs.version;
-    hash = "sha256-eTNligdr4LV+yer+D2GJ1tdv2APP3I4Revjw1q8WrH0=";
+    hash = "sha256-oWVTk4fKbplMY4NJWf9eTokiHSxPMZ8lgSoG4aF8DVk=";
   };
 
   nativeBuildInputs = [

From f983beed685b64db591e5c36dd053678813b5da1 Mon Sep 17 00:00:00 2001
From: Andrew Field <27866671+andrew-field@users.noreply.github.com>
Date: Wed, 15 Apr 2026 15:56:07 +0300
Subject: [PATCH 002/100] revive: 1.11.0 -> 1.15.0

---
 pkgs/by-name/re/revive/package.nix | 63 +++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/re/revive/package.nix b/pkgs/by-name/re/revive/package.nix
index d61af351aa13..0c4c652a2d2f 100644
--- a/pkgs/by-name/re/revive/package.nix
+++ b/pkgs/by-name/re/revive/package.nix
@@ -1,30 +1,33 @@
 {
   buildGoModule,
   fetchFromGitHub,
-  go,
   lib,
-  makeWrapper,
+  stdenv,
+  testers,
+  revive,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "revive";
-  version = "1.11.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "mgechev";
     repo = "revive";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-89BlSc2tgxAJUGZM951fF+0H+SOsl0+xz/G18neRZxI=";
-    # populate values that require us to use git. By doing this in postFetch we
-    # can delete .git afterwards and maintain better reproducibility of the src.
-    leaveDotGit = true;
+    hash = "sha256-FA3IP8TNY911CasYI+m+qpNCvFgMcJ0jUeT1Gk8frAw=";
+
     postFetch = ''
-      date -u -d "@$(git -C $out log -1 --pretty=%ct)" "+%Y-%m-%d %H:%M UTC" > $out/DATE
-      git -C $out rev-parse HEAD > $out/COMMIT
-      rm -rf $out/.git
+      # The repository currently has a 'v1' and 'V1' directory.
+      # On Darwin these are treated as the same. To prevent a hash mismatch, remove the directory.
+      rm -r $out/testdata/package_directory_mismatch/api
     '';
   };
-  vendorHash = "sha256-ZxTBGcGSRWlYFBz0+5wR/9d8p7lvjJjyId5VNIVW9rQ=";
+
+  vendorHash = "sha256-KxDWd+fd30eOttNEB6kQDxc2Lnf5Rj2zTCohjyfjMnU=";
+
+  # Only build the revive package at the root.
+  subPackages = [ "." ];
 
   ldflags = [
     "-s"
@@ -33,26 +36,40 @@ buildGoModule (finalAttrs: {
     "-X github.com/mgechev/revive/cli.builtBy=nix"
   ];
 
-  # ldflags based on metadata from git and source
-  preBuild = ''
-    ldflags+=" -X github.com/mgechev/revive/cli.commit=$(cat COMMIT)"
-    ldflags+=" -X 'github.com/mgechev/revive/cli.date=$(cat DATE)'"
-  '';
+  passthru.tests = {
+    version = testers.testVersion { package = revive; };
+    simple-execution = testers.runCommand {
+      name = "Executes the linter";
+      nativeBuildInputs = [ finalAttrs.finalPackage ];
+      script = ''
+        # Write a simple go program.
+        cat > main.go << EOF
+        // The main package
+        package main
 
-  allowGoReference = true;
+        import "fmt"
 
-  nativeBuildInputs = [ makeWrapper ];
+        func main() {
+          fmt.Println("Hello World")
+        }
+        EOF
 
-  postFixup = ''
-    wrapProgram $out/bin/revive \
-      --prefix PATH : ${lib.makeBinPath [ go ]}
-  '';
+        # This will return an exit status of 1 if there are errors and the test will fail.
+        revive -set_exit_status main.go
+
+        # Test successful.
+        touch $out
+      '';
+    };
+  };
 
   meta = {
     description = "Fast, configurable, extensible, flexible, and beautiful linter for Go";
     mainProgram = "revive";
+    longDescription = "Drop-in replacement for golint. Revive provides a framework for development of custom rules, and lets you define a strict preset for enhancing your development & code review processes";
     homepage = "https://revive.run";
+    downloadPage = "https://github.com/mgechev/revive";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ andrewfield ];
   };
 })

From 1a52daf3e7f0e2fe14125de11602b5dae7eeaf78 Mon Sep 17 00:00:00 2001
From: bandithedoge <bandithedoge@protonmail.com>
Date: Sat, 14 Feb 2026 07:09:04 +0100
Subject: [PATCH 003/100] shelter: init at 0-unstable-2026-06-05

---
 pkgs/by-name/sh/shelter/package.nix | 67 +++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 pkgs/by-name/sh/shelter/package.nix

diff --git a/pkgs/by-name/sh/shelter/package.nix b/pkgs/by-name/sh/shelter/package.nix
new file mode 100644
index 000000000000..b2b7ce07b56d
--- /dev/null
+++ b/pkgs/by-name/sh/shelter/package.nix
@@ -0,0 +1,67 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
+  fetchPnpmDeps,
+  nix-update-script,
+  nodejs,
+  pnpmConfigHook,
+  pnpm_9,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "shelter";
+  version = "0-unstable-2026-06-05";
+  src = fetchFromGitHub {
+    owner = "uwu";
+    repo = "shelter";
+    rev = "4c08e2e8ad5d7e8fe741be3c9e2151ec25d20d8d";
+    hash = "sha256-8poWWDuCOrgJYjwRfOPIXTdyVlau5SxG9FxjcN8o/wo=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    pnpmConfigHook
+    pnpm_9
+  ];
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-tYeV62IZes8O5rN9uvpx0K72B88gftqpL2VXrOUxI8s=";
+    pnpm = pnpm_9;
+    fetcherVersion = 3;
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm --filter=@uwu/shelter-ui prepare
+    pnpm --filter=shelter build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r packages/shelter/dist $out
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version=branch"
+      "--version-regex=(0.*)"
+    ];
+  };
+
+  meta = {
+    description = "New generation Discord client mod built to be essentially bulletproof";
+    homepage = "https://shelter.uwu.network/";
+    license = lib.licenses.cc0;
+    maintainers = with lib.maintainers; [ bandithedoge ];
+  };
+})

From 82c1517ecf9d2bbbf14a18b73e7cdc19ca0ba605 Mon Sep 17 00:00:00 2001
From: bandithedoge <bandithedoge@protonmail.com>
Date: Sat, 14 Feb 2026 07:17:55 +0100
Subject: [PATCH 004/100] dorion: use shelter from nixpkgs

---
 pkgs/by-name/do/dorion/package.nix | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix
index c184d89ca1fc..8c6292e26396 100644
--- a/pkgs/by-name/do/dorion/package.nix
+++ b/pkgs/by-name/do/dorion/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchurl,
   rustPlatform,
   cmake,
   ninja,
@@ -25,22 +24,14 @@
   pipewire,
   apple-sdk_15,
   darwin,
+  shelter,
+  nix-update-script,
 }:
 
 let
   webkitgtk_4_1' = webkitgtk_4_1.override {
     enableExperimental = true;
   };
-
-  shelter = fetchurl {
-    url = "https://raw.githubusercontent.com/uwu/shelter-builds/7a1beaff4bb4ec5e8590d069549686fda4200e82/shelter.js";
-    hash = "sha256-LeZTxrGRQb0rl3BMP34UFHIEFnil4k3Fet3MTujvVB8=";
-    meta = {
-      homepage = "https://github.com/uwu/shelter";
-      sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; # actually, minified JS
-      license = lib.licenses.cc0;
-    };
-  };
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dorion";
@@ -124,7 +115,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ' src-tauri/tauri.conf.json
 
     # link shelter injection
-    ln -s "${shelter}" src-tauri/injection/shelter.js
+    ln -s ${shelter}/shelter.js src-tauri/injection/shelter.js
 
     # link html/frontend data
     ln -s "$(pwd)/src" src-tauri/html
@@ -192,6 +183,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     TAURI_RESOURCE_DIR = "${placeholder "out"}/lib";
   };
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     homepage = "https://spikehd.github.io/projects/dorion/";
     description = "Tiny alternative Discord client";
@@ -201,10 +194,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     changelog = "https://github.com/SpikeHD/Dorion/releases/tag/v${finalAttrs.version}";
     downloadPage = "https://github.com/SpikeHD/Dorion/releases/tag/v${finalAttrs.version}";
-    license = [
-      lib.licenses.gpl3Only
-      shelter.meta.license
-    ];
+    license = lib.licenses.gpl3Only;
     mainProgram = "Dorion";
     maintainers = with lib.maintainers; [
       nyabinary
@@ -214,7 +204,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ];
     platforms = lib.platforms.unix;
     sourceProvenance = [
-      lib.sourceTypes.binaryBytecode # actually, minified JS
       lib.sourceTypes.fromSource
     ];
   };

From 9911678f69b5a5087b48077272b5f462935e57e3 Mon Sep 17 00:00:00 2001
From: Stefan Haan <stefan@kikeriki.at>
Date: Thu, 11 Jun 2026 03:46:03 +0200
Subject: [PATCH 005/100] stabber: 2020-06-08 -> 2026-03-05

---
 pkgs/by-name/st/stabber/package.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/st/stabber/package.nix b/pkgs/by-name/st/stabber/package.nix
index 1980a6d426f5..10f18838854f 100644
--- a/pkgs/by-name/st/stabber/package.nix
+++ b/pkgs/by-name/st/stabber/package.nix
@@ -10,20 +10,15 @@
 }:
 stdenv.mkDerivation {
   pname = "stabber-unstable";
-  version = "2020-06-08";
+  version = "2026-03-05";
 
   src = fetchFromGitHub {
-    owner = "boothj5";
+    owner = "profanity-im";
     repo = "stabber";
-    rev = "3e5c2200715666aad403d0076e8ab584b329965e";
-    sha256 = "0042nbgagl4gcxa5fj7bikjdi1gbk0jwyqnzc5lswpb0l5y0i1ql";
+    rev = "ba6ca0707833c70ab38681bcc28bfff025c491f1";
+    hash = "sha256-q3WfPjqD4AotdDukVMNg9Hz/Ns2PgBaoNk06sFm0E68=";
   };
 
-  postPatch = ''
-    # New toolchainsd like gcc-13 trigger warnings and fail the build.
-    substituteInPlace configure.ac --replace "-Werror" ""
-  '';
-
   preAutoreconf = ''
     mkdir m4
   '';

From 66092a5e1e2f7894a85ca97b8b3eeaf497ffb202 Mon Sep 17 00:00:00 2001
From: Stefan Haan <stefan@kikeriki.at>
Date: Thu, 11 Jun 2026 03:47:21 +0200
Subject: [PATCH 006/100] profanity: 0.17.0 -> 0.18.2

---
 .../instant-messengers/profanity/default.nix  | 65 +++++++++++--------
 .../profanity/patches/packages-osx.patch      | 13 ----
 2 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch

diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 31c6c9cdfc6e..008b7b574509 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  autoconf-archive,
-  autoreconfHook,
+  meson,
+  ninja,
   cmocka,
   curl,
   expat,
@@ -12,7 +12,6 @@
   glibcLocales,
   libstrophe,
   libmicrohttpd,
-  libotr,
   libuuid,
   ncurses,
   openssl,
@@ -35,41 +34,39 @@
   python3,
   traySupport ? true,
   gtk3,
+  otrSupport ? true,
+  libotr,
+  avatarScalingSupport ? true,
+  spellcheckSupport ? true,
+  enchant,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "profanity";
-  version = "0.17.0";
+  version = "0.18.2";
 
   src = fetchFromGitHub {
     owner = "profanity-im";
     repo = "profanity";
     rev = finalAttrs.version;
-    hash = "sha256-fZFLEkbwiYeAtnqDOImV8aXbYGMqO9TEcXPFMuchJaE=";
+    hash = "sha256-rPiYzG5KvJyKt7b99AImmO6wTYxZPFcf/6Xhz8SrgIo=";
   };
 
-  patches = [
-    ./patches/packages-osx.patch
-  ];
-
   enableParallelBuilding = true;
 
   nativeBuildInputs = [
-    autoconf-archive
-    autoreconfHook
-    glibcLocales
+    meson
     pkg-config
+    ninja
   ];
 
   buildInputs = [
-    cmocka
     curl
     expat
     expect
     glib
     libstrophe
     libmicrohttpd
-    libotr
     libuuid
     ncurses
     openssl
@@ -91,22 +88,38 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals pgpSupport [ gpgme ]
   ++ lib.optionals pythonPluginSupport [ python3 ]
-  ++ lib.optionals traySupport [ gtk3 ];
+  ++ lib.optionals traySupport [ gtk3 ]
+  ++ lib.optionals otrSupport [ libotr ]
+  ++ lib.optionals spellcheckSupport [ enchant ]
+  ++ lib.optionals avatarScalingSupport [ gdk-pixbuf ];
 
-  # Enable feature flags, so that build fail if libs are missing
-  configureFlags = [
-    "--enable-c-plugins"
-    "--enable-otr"
-  ]
-  ++ lib.optionals notifySupport [ "--enable-notifications" ]
-  ++ lib.optionals traySupport [ "--enable-icons-and-clipboard" ]
-  ++ lib.optionals pgpSupport [ "--enable-pgp" ]
-  ++ lib.optionals pythonPluginSupport [ "--enable-python-plugins" ]
-  ++ lib.optionals omemoSupport [ "--enable-omemo" ];
+  # see also: https://profanity-im.github.io/guide/latest/build.html#expl
+  mesonFlags = [
+    (lib.mesonBool "tests" finalAttrs.doCheck)
+    (lib.mesonEnable "notifications" notifySupport)
+    (lib.mesonEnable "python-plugins" pythonPluginSupport)
+    (lib.mesonEnable "c-plugins" true)
+    (lib.mesonEnable "otr" otrSupport)
+    (lib.mesonEnable "pgp" pgpSupport)
+    (lib.mesonEnable "omemo" omemoSupport)
+    (lib.mesonEnable "omemo-qrcode" omemoSupport)
+    (lib.mesonEnable "icons-and-clipboard" traySupport)
+    (lib.mesonEnable "gdk-pixbuf" avatarScalingSupport)
+    (lib.mesonEnable "xscreensaver" autoAwaySupport)
+    (lib.mesonEnable "spellcheck" spellcheckSupport)
+  ];
+
+  # this build directory is hard coded by the tests:
+  # https://github.com/profanity-im/profanity/blob/c9033aae568d1a8f5435c566f31aa165718c7726/tests/functionaltests/proftest.c#L275
+  mesonBuildDir = "build_run";
 
   doCheck = true;
+  nativeCheckInputs = [
+    cmocka
 
-  env.LC_ALL = "en_US.utf8";
+    # when stabber is found, functional tests are enabled which take a very long time
+    # stabber
+  ];
 
   meta = {
     homepage = "https://profanity-im.github.io";
diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch b/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch
deleted file mode 100644
index 796ec6b0a615..000000000000
--- a/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 5c00aca..eb78060 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,6 @@ PLATFORM="unknown"
- AS_CASE([$host_os],
-     [freebsd*], [PLATFORM="freebsd"],
-     [openbsd*], [PLATFORM="openbsd"],
--    [darwin*], [PLATFORM="osx"],
-     [cygwin], [PLATFORM="cygwin"],
-     [PLATFORM="nix"])
- 
-

From aaaa7e8879388216f383800830aaeb0825bd6d57 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 11 Jun 2026 10:37:36 -0400
Subject: [PATCH 007/100] node-red: 4.1.8 -> 5.0.0

Changelog: https://github.com/node-red/node-red/blob/5.0.0/CHANGELOG.md
---
 pkgs/by-name/no/node-red/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/no/node-red/package.nix b/pkgs/by-name/no/node-red/package.nix
index d85af08c4590..12a368265b5b 100644
--- a/pkgs/by-name/no/node-red/package.nix
+++ b/pkgs/by-name/no/node-red/package.nix
@@ -9,25 +9,23 @@
 
 buildNpmPackage rec {
   pname = "node-red";
-  version = "4.1.8";
+  version = "5.0.0";
 
   src = fetchFromGitHub {
     owner = "node-red";
     repo = "node-red";
     tag = version;
-    hash = "sha256-IjV3hS1v+KgtXbXO2/Nr4GpABK+l2HXfqsPukGD7ViQ=";
+    hash = "sha256-CKYIlBTZsnkgbhWs1Bg04r8JIubCmVgDEUbvCXvaNck=";
   };
 
-  npmDepsHash = "sha256-eFRA3oJeuxHWrZepWyGztvNdJ3QKG+J6pAxQhdVqxxw=";
-
-  nativeBuildInputs = [ jq ];
+  npmDepsHash = "sha256-bm9C2MWV3BlyxXrBBy/ZyGkWSyh1w9b8/IJI1W74O00=";
 
   postPatch =
     let
       packageDir = "packages/node_modules/node-red";
     in
     ''
-      jq '. += {"bin": {"node-red": "${packageDir}/red.js", "node-red-pi": "${packageDir}/bin/node-red-pi"}}' package.json > package.json.tmp
+      ${lib.getExe jq} '. += {"bin": {"node-red": "${packageDir}/red.js", "node-red-pi": "${packageDir}/bin/node-red-pi"}}' package.json > package.json.tmp
       mv package.json.tmp package.json
     '';
 

From 0e99d67346ae2ca90cfdd9ac01918f31876919ac Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Sun, 14 Jun 2026 19:33:44 +0300
Subject: [PATCH 008/100] backintime-qt: don't inherit `meta`

---
 pkgs/by-name/ba/backintime-qt/package.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/backintime-qt/package.nix b/pkgs/by-name/ba/backintime-qt/package.nix
index 52a2ff52452a..d3336c2183c6 100644
--- a/pkgs/by-name/ba/backintime-qt/package.nix
+++ b/pkgs/by-name/ba/backintime-qt/package.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation {
     version
     src
     installFlags
-    meta
     dontAddPrefix
     ;
 
@@ -105,4 +104,15 @@ stdenv.mkDerivation {
     wrapProgram "$out/bin/backintime-qt_polkit" \
       --prefix PATH : "${lib.getBin polkit}/bin:$PATH"
   '';
+
+  meta = {
+    inherit (backintime-common.meta)
+      homepage
+      description
+      license
+      maintainers
+      platforms
+      longDescription
+      ;
+  };
 }

From f236e94578fe2b0367afa54cd569b89f1268a410 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Sun, 14 Jun 2026 19:33:44 +0300
Subject: [PATCH 009/100] backintime-common: split `doc` & `man` outputs

output size changes:
out: 3152K -> 2864K
doc: 0 -> 272K
man: 0 -> 16K
---
 pkgs/by-name/ba/backintime-common/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/backintime-common/package.nix b/pkgs/by-name/ba/backintime-common/package.nix
index e9fb6e0d9025..61cb8657d877 100644
--- a/pkgs/by-name/ba/backintime-common/package.nix
+++ b/pkgs/by-name/ba/backintime-common/package.nix
@@ -46,6 +46,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-/33Lx62S/9RcqrfJumE6/o3KnAObBa3DcmuGkcOXIQE=";
   };
 
+  outputs = [
+    "out"
+    "man"
+    "doc"
+  ];
+
   nativeBuildInputs = [
     makeWrapper
     gettext
@@ -79,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "'grep'" "'${lib.getExe gnugrep}'" \
 
     substituteInPlace "bitlicense.py" \
-      --replace-fail "/usr/share/doc" "$out/share/doc" \
+      --replace-fail "/usr/share/doc" "$doc/share/doc" \
   '';
 
   dontAddPrefix = true;

From be6a0d69f7b7c946454942fd1a25cb6c645e0ab5 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Sun, 14 Jun 2026 19:33:44 +0300
Subject: [PATCH 010/100] backintime-common: `__structuredAttrs`, `strictDeps`,
 `enableParallelBuilding`

`nix store make-content-addressed` gives the same output
before and after this change.
---
 pkgs/by-name/ba/backintime-common/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ba/backintime-common/package.nix b/pkgs/by-name/ba/backintime-common/package.nix
index 61cb8657d877..cd66e8c91767 100644
--- a/pkgs/by-name/ba/backintime-common/package.nix
+++ b/pkgs/by-name/ba/backintime-common/package.nix
@@ -15,6 +15,7 @@
   gnugrep,
   man,
   asciidoctor,
+  bashNonInteractive,
 }:
 
 let
@@ -46,6 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-/33Lx62S/9RcqrfJumE6/o3KnAObBa3DcmuGkcOXIQE=";
   };
 
+  __structuredAttrs = true;
+  strictDeps = true;
+  enableParallelBuilding = true;
   outputs = [
     "out"
     "man"
@@ -55,12 +59,13 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     makeWrapper
     gettext
+    asciidoctor
+    man
   ];
 
   buildInputs = [
     python'
-    man
-    asciidoctor
+    bashNonInteractive
   ];
 
   installFlags = [ "DEST=$(out)" ];

From 9ab07e24302ffba0d06e14616e456baf5eefe695 Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@speicherleck.de>
Date: Wed, 17 Jun 2026 01:08:35 +0200
Subject: [PATCH 011/100] nixosTests.luks-suspend: init

---
 nixos/tests/all-tests.nix    |   1 +
 nixos/tests/luks-suspend.nix | 146 +++++++++++++++++++++++++++++++++++
 2 files changed, 147 insertions(+)
 create mode 100644 nixos/tests/luks-suspend.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index ef321d3af0bf..791864396103 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -944,6 +944,7 @@ in
   lomiri-system-settings = runTest ./lomiri-system-settings.nix;
   lorri = handleTest ./lorri/default.nix { };
   luks = runTest ./luks.nix;
+  luks-suspend = runTest ./luks-suspend.nix;
   lvm2 = import ./lvm2 { inherit pkgs runTest; };
   lxc = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./lxc;
   lxd-image-server = runTest ./lxd-image-server.nix;
diff --git a/nixos/tests/luks-suspend.nix b/nixos/tests/luks-suspend.nix
new file mode 100644
index 000000000000..d1aa4862a85e
--- /dev/null
+++ b/nixos/tests/luks-suspend.nix
@@ -0,0 +1,146 @@
+# Tests that `cryptsetup luksSuspend` successfully wipes the volume key from memory.
+{ pkgs, lib, ... }:
+
+let
+  # Fixed 64-byte volume key.
+  # Chosen by fair dice roll. Guaranteed to be random. :-)
+  # (tr -dc '0-9A-Za-z' </dev/urandom | head -c 64)
+  volumeKey = "Okqf1piY8oebIL11l3x5lkqzyqLuY8X0aROgI6wMuUV99PoeqHbgsptcACs0ojaL";
+  luksUUID = "55555555-5555-5555-5555-555555555555";
+
+  # 1 GiB of RAM for the VM. Less than the 4 GiB PCI hole, so that a
+  # single `pmemsave 0 <MEM_BYTES>` captures all of guest RAM.
+  memorySizeMiB = 1024;
+
+  # A LUKS2 container with the known master key above.
+  luksImage =
+    pkgs.runCommand "luks-suspend-test-disk.img" { nativeBuildInputs = [ pkgs.cryptsetup ]; }
+      ''
+        truncate -s 64M $out
+
+        echo -n abc | cryptsetup luksFormat \
+          --batch-mode \
+          --uuid ${luksUUID} \
+          --pbkdf pbkdf2 --pbkdf-force-iterations 1000 \
+          --volume-key-file <(echo -n "${volumeKey}") \
+          $out
+      '';
+
+  commonMachine =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = [ pkgs.cryptsetup ];
+      virtualisation.memorySize = memorySizeMiB;
+      virtualisation.qemu.drives = [
+        {
+          name = "luks";
+          file = "${luksImage}";
+          driveExtraOpts = {
+            format = "raw";
+            readonly = "on";
+          };
+        }
+      ];
+    };
+in
+{
+  name = "luks-suspend";
+  meta.maintainers = with lib.maintainers; [ iblech ];
+
+  nodes = {
+    # Variant 1: LUKS volume opened after boot via the cryptsetup CLI.
+    cli = commonMachine;
+
+    # Variant 2: LUKS volume opened during boot by systemd-cryptsetup,
+    # driven by the native NixOS LUKS module.
+    native =
+      { pkgs, lib, ... }:
+      {
+        imports = [ commonMachine ];
+        boot.initrd.systemd.enable = true;
+
+        # The test framework's qemu-vm module force-clears
+        # boot.initrd.luks.devices via mkVMOverride (priority 10) when
+        # virtualisation.useDefaultFilesystems is on (the default).
+        # Our setting should have priority.
+        boot.initrd.luks.devices = lib.mkOverride 5 {
+          foo = {
+            device = "/dev/disk/by-uuid/${luksUUID}";
+            keyFile = "/etc/luks-foo.key";
+          };
+        };
+
+        # Will produce (harmless) warnings about a world-readable keyFile.
+        boot.initrd.systemd.contents."/etc/luks-foo.key".source = pkgs.writeText "luks-foo-key" "abc";
+      };
+  };
+
+  testScript = ''
+    import mmap
+
+    MEM_BYTES = ${toString memorySizeMiB} * 1024 * 1024
+    VOLUME_KEY = b"${volumeKey}"
+    LUKS_DEV = "/dev/disk/by-uuid/${luksUUID}"
+
+    def count_occurrences(dump_path, needle):
+        count = 0
+        with open(dump_path, "rb") as f:
+            with mmap.mmap(f.fileno(), 0, prot=mmap.PROT_READ) as m:
+                i = m.find(needle)
+                while i != -1:
+                    count += 1
+                    i = m.find(needle, i + 1)
+        return count
+
+    def dump_and_count(machine, label):
+        path = machine.state_dir / f"ram-{machine.name}-{label}.raw"
+        reply = machine.send_monitor_command(f'pmemsave 0 {MEM_BYTES} "{path}"')
+        if not path.exists():
+            raise Exception(f"pmemsave wrote no dump; monitor replied: {reply!r}")
+        full = count_occurrences(path, VOLUME_KEY)
+        first = count_occurrences(path, VOLUME_KEY[:32])
+        second = count_occurrences(path, VOLUME_KEY[32:])
+        path.unlink()
+        print(
+            f"[{machine.name}/{label}] volume-key copies in RAM: "
+            f"full={full} first-half={first} second-half={second}"
+        )
+        return full, first, second
+
+    def check_suspend_wipes_key(machine):
+        # Precondition: `machine` reached multi-user.target with the LUKS
+        # volume open as /dev/mapper/foo.
+        machine.succeed("test -b /dev/mapper/foo")
+
+        # Give kernel-keyring garbage collection time to run.
+        machine.sleep(10)
+
+        before_full, before_first, before_second = dump_and_count(machine, "before-suspend")
+        assert (before_full, before_first, before_second) == (0, 1, 1), (
+          f"[{machine.name}] expected exactly one copy of the two parts of the volume key each "
+          f"while the volume is open, found {before_full} / {before_first} / {before_second}"
+        )
+
+        # Suspend the volume -- this must wipe the key from kernel memory.
+        machine.succeed("cryptsetup luksSuspend foo")
+
+        after_full, after_first, after_second = dump_and_count(machine, "after-suspend")
+        assert (after_full, after_first, after_second) == (0, 0, 0), (
+            f"[{machine.name}] volume key material still present in RAM after luksSuspend "
+            f"(full={after_full} first-half={after_first} second-half={after_second}) "
+            f"-- key-wipe bug is present"
+        )
+
+    # Variant 1
+    cli.start()
+    cli.wait_for_unit("multi-user.target")
+    cli.wait_for_file(LUKS_DEV)
+    cli.succeed(f"echo -n abc | cryptsetup luksOpen {LUKS_DEV} foo")
+    check_suspend_wipes_key(cli)
+
+    # Variant 2
+    native.start()
+    native.wait_for_unit("multi-user.target")
+    check_suspend_wipes_key(native)
+  '';
+}

From 3c0a7119efb780a09912b62092b0a28638102f26 Mon Sep 17 00:00:00 2001
From: Angel J <78835633+iamanaws@users.noreply.github.com>
Date: Sat, 20 Jun 2026 10:02:36 -0700
Subject: [PATCH 012/100] cwm: add iamanaws as maintainer

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

diff --git a/pkgs/by-name/cw/cwm/package.nix b/pkgs/by-name/cw/cwm/package.nix
index 58c5da37a0fe..8a863b5efad9 100644
--- a/pkgs/by-name/cw/cwm/package.nix
+++ b/pkgs/by-name/cw/cwm/package.nix
@@ -40,7 +40,10 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Lightweight and efficient window manager for X11";
     homepage = "https://github.com/leahneukirchen/cwm";
-    maintainers = with lib.maintainers; [ _0x4A6F ];
+    maintainers = with lib.maintainers; [
+      _0x4A6F
+      iamanaws
+    ];
     license = lib.licenses.isc;
     platforms = lib.platforms.linux;
     mainProgram = "cwm";

From da0e02d5c81007bd6b586e225cb192ac1fc65180 Mon Sep 17 00:00:00 2001
From: Angel J <78835633+iamanaws@users.noreply.github.com>
Date: Sat, 20 Jun 2026 10:02:53 -0700
Subject: [PATCH 013/100] cwm: 7.4 -> 7.9

---
 pkgs/by-name/cw/cwm/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cw/cwm/package.nix b/pkgs/by-name/cw/cwm/package.nix
index 8a863b5efad9..fecb8b857bc6 100644
--- a/pkgs/by-name/cw/cwm/package.nix
+++ b/pkgs/by-name/cw/cwm/package.nix
@@ -13,16 +13,17 @@
 stdenv.mkDerivation (finalAttrs: {
 
   pname = "cwm";
-  version = "7.4";
+  version = "7.9";
 
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "cwm";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-L3u4mH2UH2pTHhSPVr5dUi94b9DheslkIWL6EgQ05yA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-YC+x4YSPAgZ47PFMbzICv9ixfDxA1PG3ncLiMahSoUc=";
   };
 
   strictDeps = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     pkg-config

From 1250fc046fb0a0adcf0f23069b3f006b7df00729 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jun 2026 21:05:15 +0000
Subject: [PATCH 014/100] vscode-extensions.biomejs.biome: 2026.3.311859 ->
 2026.6.181955

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

diff --git a/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix b/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix
index 669c066b81d4..0d9d9b62839a 100644
--- a/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix
@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "biome";
     publisher = "biomejs";
-    version = "2026.3.311859";
-    hash = "sha256-HH+KJYY4J6nuHwQ/+DhEFsJ7P5S97UsNuoc+y7GnE00=";
+    version = "2026.6.181955";
+    hash = "sha256-6FRrVKDY+E9wuqgeNKArgGn4PDp5ViJsdCPjjwBGbGI=";
   };
 
   postInstall = ''

From 389ad66caaf36cfb980fd7b7340e943bda2d9818 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 06:25:32 +0000
Subject: [PATCH 015/100] python3Packages.django-reversion: 6.1.0 -> 6.3.0

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

diff --git a/pkgs/development/python-modules/django-reversion/default.nix b/pkgs/development/python-modules/django-reversion/default.nix
index f3739ebb66d5..c5b9cb67b77a 100644
--- a/pkgs/development/python-modules/django-reversion/default.nix
+++ b/pkgs/development/python-modules/django-reversion/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "django-reversion";
-  version = "6.1.0";
+  version = "6.3.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "django_reversion";
     inherit version;
-    hash = "sha256-Md1/7gLiohr3wtCmHBwPJ7oH3yMXyaCj8x0+5ABpAl0=";
+    hash = "sha256-CqVOszRpT1Iv0jR0OXjGFNRap4XtxwphdyZ82q8G+Wc=";
   };
 
   build-system = [ setuptools ];

From 615e6a6ca95a5fd8beb73136d250d2c0483f40f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 12:30:11 +0000
Subject: [PATCH 016/100] courier-unicode: 2.5.0 -> 2.6.0

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

diff --git a/pkgs/by-name/co/courier-unicode/package.nix b/pkgs/by-name/co/courier-unicode/package.nix
index 899fae0fe2c9..3f1b1b84b7a2 100644
--- a/pkgs/by-name/co/courier-unicode/package.nix
+++ b/pkgs/by-name/co/courier-unicode/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "courier-unicode";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/courier/courier-unicode/${finalAttrs.version}/courier-unicode-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-Xsp6U2UWEg745d5gFOaQcRvGs/saG9V9LxkDxU3ts+A=";
+    hash = "sha256-Cu0jScW2LeDTPM+MI1J6rkHa+VoDyAVMiN5Prvjaigg=";
   };
 
   nativeBuildInputs = [

From 45fd270fb8507f5cd9b70c27699374c2350f7b08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 14:05:58 +0000
Subject: [PATCH 017/100] vscode-extensions.azdavis.millet: 0.15.1 -> 0.15.2

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

diff --git a/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix b/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix
index 563253536441..370cd2ee9ec1 100644
--- a/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "Millet";
     publisher = "azdavis";
-    version = "0.15.1";
-    hash = "sha256-5V5GG7M52ohpS9Zg2TTamEjbWyXH9kllZyy7Oezy4Iw=";
+    version = "0.15.2";
+    hash = "sha256-mtI4IW+xBIuo11ctTIv5/6LOXVStD3YqSYkIQYJWqmo=";
   };
   nativeBuildInputs = [
     jq

From f7dad419d79b21d1baa11673ac61787f5d4089f6 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 21 Jun 2026 22:44:06 +0200
Subject: [PATCH 018/100] {lomiri,lomiri-qt6}.lomiri-app-launch: 0.1.12 ->
 0.2.0

---
 .../desktops/lomiri/development/lomiri-app-launch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix
index f597587a834c..bfec47a37e61 100644
--- a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix
+++ b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix
@@ -31,7 +31,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-app-launch";
-  version = "0.1.12";
+  version = "0.2.0";
 
   outputs = [
     "out"
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ubports";
     repo = "development/core/lomiri-app-launch";
     tag = finalAttrs.version;
-    hash = "sha256-vlSlQJysKmoGNmRtJ34FCI3p5bL7GDc8TjOljnKSiAE=";
+    hash = "sha256-MPBgqui3RIOdiK/lmslhg23RlMqDAjYaTQAJ53+93sU=";
   };
 
   patches = [

From 19f2b69e3078e3da2626b2d4414a5766f763d3c4 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 21 Jun 2026 23:12:07 +0200
Subject: [PATCH 019/100] lomiri.mediascanner2: 0.200 -> 0.201

---
 .../lomiri/services/mediascanner2/default.nix | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
index fa17efbedac3..3a15ca477b7f 100644
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -27,15 +27,18 @@
   wrapQtAppsHook,
 }:
 
+let
+  withQt6 = lib.versions.major qtbase.version == "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mediascanner2";
-  version = "0.200";
+  version = "0.201";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/mediascanner2";
     tag = finalAttrs.version;
-    hash = "sha256-tTEbH5gXK+0y3r1LCxsZ6vr1FVyXWZaNAXaR6jcIP0Y=";
+    hash = "sha256-Z57ptFR+/W80sPquM5hgaqnCjd9pWYheq2VnkR+fGSY=";
   };
 
   outputs = [
@@ -46,12 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     substituteInPlace src/qml/MediaScanner.*/CMakeLists.txt \
       --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
-  ''
-  # https://gitlab.com/ubports/development/core/mediascanner2/-/commit/4268b8c0a7e99c1d12f43599b1ae76b5b27572ec
-  # Remove when version > 0.200
-  + ''
-    substituteInPlace src/extractor/CMakeLists.txt src/qml/MediaScanner.0.1/CMakeLists.txt \
-      --replace-fail 'msg(' 'message('
   '';
 
   strictDeps = true;
@@ -86,10 +83,12 @@ stdenv.mkDerivation (finalAttrs: {
     gst-plugins-good
   ]);
 
+  nativeCheckInputs = [ dbus ];
+
   checkInputs = [ gtest ];
 
   cmakeFlags = [
-    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
+    (lib.cmakeBool "ENABLE_QT6" withQt6)
     (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
   ];
 
@@ -97,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   preCheck = ''
     export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
+    export QML2_IMPORT_PATH=${lib.getBin qtdeclarative}/${qtbase.qtQmlPrefix}
     export XDG_DATA_DIRS=${shared-mime-info}/share:$XDG_DATA_DIRS
   '';
 
@@ -109,10 +109,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests = {
+      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    }
+    // lib.optionalAttrs (!withQt6) {
       # music app needs mediascanner to work properly, so it can find files
       music-app = nixosTests.lomiri-music-app;
-
-      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
     };
     updateScript = gitUpdater { };
   };

From 9a48e2f706c07aa29dc8753278bffe19e674d7bb Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 21 Jun 2026 23:12:26 +0200
Subject: [PATCH 020/100] lomiri-qt6.mediascanner2: init at 0.201

---
 pkgs/desktops/lomiri/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index 830934908149..722e06d6b6f6 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -53,6 +53,7 @@ let
       lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { };
       lomiri-thumbnailer = callPackage ./services/lomiri-thumbnailer { };
       lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { };
+      mediascanner2 = callPackage ./services/mediascanner2 { };
     }
     // lib.optionalAttrs useQt6 {
       #### Core Apps
@@ -98,7 +99,6 @@ let
       lomiri-indicator-datetime = ayatana-indicator-datetime.override { enableLomiriFeatures = true; };
       lomiri-polkit-agent = callPackage ./services/lomiri-polkit-agent { };
       lomiri-telephony-service = callPackage ./services/lomiri-telephony-service { };
-      mediascanner2 = callPackage ./services/mediascanner2 { };
     };
 in
 lib.makeScope qtPackages.newScope packages

From a517bf63b4e14795c98e8497b24c1801b9e5a801 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 21 Jun 2026 23:32:41 +0200
Subject: [PATCH 021/100] {lomiri,lomiri-qt6}.lomiri-thumbnailer: 3.1.1 ->
 3.1.2

---
 .../desktops/lomiri/services/lomiri-thumbnailer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
index 800bc37d145c..0e6cab178aac 100644
--- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
@@ -33,17 +33,17 @@
 }:
 
 let
-  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+  withQt6 = lib.versions.major qtbase.version == "6";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-thumbnailer";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-thumbnailer";
     tag = finalAttrs.version;
-    hash = "sha256-NEFwNofW0Ry9V0oUiUeuzs7q6+Ht2B0oCEGjmc3ywck=";
+    hash = "sha256-6fQonYnOjxzHcM51VgCeL5OfsmThq9tNpGnMvNWrDXI=";
   };
 
   outputs = [

From 334cee49e7ea8b39cec44e989fe1330d0963bf7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Jun 2026 04:31:53 +0000
Subject: [PATCH 022/100] calico-app-policy: 3.31.5 -> 3.31.6

---
 pkgs/applications/networking/cluster/calico/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix
index 63a9d7107b47..c498b380b616 100644
--- a/pkgs/applications/networking/cluster/calico/default.nix
+++ b/pkgs/applications/networking/cluster/calico/default.nix
@@ -14,16 +14,16 @@ builtins.mapAttrs
     }:
     buildGoModule rec {
       inherit pname;
-      version = "3.31.5";
+      version = "3.31.6";
 
       src = fetchFromGitHub {
         owner = "projectcalico";
         repo = "calico";
         rev = "v${version}";
-        hash = "sha256-HdTnERSuqJ2ORijvI8AbzLGTwXaRl349p9onKgH4HE8=";
+        hash = "sha256-lME1x04iFaNg+dilS66dGuFmw3IEJQmyPcnDvGTzk/8=";
       };
 
-      vendorHash = "sha256-LwOEshx4VU+a0oBlq/881RC/ViQVDnZZlZs/U3BMJ7M=";
+      vendorHash = "sha256-8CvnDaoEkb/yMMgGBG03RFrdHdc5Anbv9t1TnOYHA9A=";
 
       inherit doCheck subPackages;
 

From 7b1a37cb382c8126b5fc04b5ea8aa3b289274dbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Jun 2026 04:32:20 +0000
Subject: [PATCH 023/100] calicoctl: 3.31.5 -> 3.31.6

---
 pkgs/applications/networking/cluster/calico/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix
index 63a9d7107b47..c498b380b616 100644
--- a/pkgs/applications/networking/cluster/calico/default.nix
+++ b/pkgs/applications/networking/cluster/calico/default.nix
@@ -14,16 +14,16 @@ builtins.mapAttrs
     }:
     buildGoModule rec {
       inherit pname;
-      version = "3.31.5";
+      version = "3.31.6";
 
       src = fetchFromGitHub {
         owner = "projectcalico";
         repo = "calico";
         rev = "v${version}";
-        hash = "sha256-HdTnERSuqJ2ORijvI8AbzLGTwXaRl349p9onKgH4HE8=";
+        hash = "sha256-lME1x04iFaNg+dilS66dGuFmw3IEJQmyPcnDvGTzk/8=";
       };
 
-      vendorHash = "sha256-LwOEshx4VU+a0oBlq/881RC/ViQVDnZZlZs/U3BMJ7M=";
+      vendorHash = "sha256-8CvnDaoEkb/yMMgGBG03RFrdHdc5Anbv9t1TnOYHA9A=";
 
       inherit doCheck subPackages;
 

From 0738d64c6245e447adfdc9dc450b2aefc127ac9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Jun 2026 13:42:56 +0000
Subject: [PATCH 024/100] python3Packages.zeep: 4.3.2 -> 4.3.3

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

diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index f20cbc16cffc..8f6d7762d3bf 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "zeep";
-  version = "4.3.2";
+  version = "4.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mvantellingen";
     repo = "python-zeep";
     tag = version;
-    hash = "sha256-mGX61fAbFwheamOgK5lq/A/3FmTCuv0UfAlhOUwX2zg=";
+    hash = "sha256-0Mzvb86f1r07PCJqTy9CGUq9Zk2PtAsFfd3SmFlOayk=";
   };
 
   build-system = [ setuptools ];

From a7b7c60952e228c2b9a6e8a95bc2cab1e74ceee7 Mon Sep 17 00:00:00 2001
From: Mirza Arnaut <mirza.arnaut45@gmail.com>
Date: Tue, 23 Jun 2026 14:21:33 +0200
Subject: [PATCH 025/100] stump: refactor to utilize finalAttrs

While the functional behaviour was introduced, the stump package hasn't
been using it much and instead utilized a let-in block.
The contents of the let-in block has been moved inside and the
derivation function and the `finalAttrs` argument has been used where
needed.
This will enable easier automatic updates using nix-update-script (see
next commit).
---
 pkgs/by-name/st/stump/package.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/st/stump/package.nix b/pkgs/by-name/st/stump/package.nix
index 7045bcb575d4..614b50bbd4ac 100644
--- a/pkgs/by-name/st/stump/package.nix
+++ b/pkgs/by-name/st/stump/package.nix
@@ -17,19 +17,20 @@
   pkg-config,
   makeWrapper,
 }:
-let
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "stump";
   version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "stumpapp";
     repo = "stump";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-kstMk4HJopLHW22ynVZF0itWUixwiDkbsMUpYMvw1Ag=";
   };
 
-  frontend = stdenv.mkDerivation (finalAttrs: {
+  frontend = stdenv.mkDerivation (_: {
     pname = "stump-frontend";
-    inherit src version;
+    inherit (finalAttrs) src version;
 
     yarnOfflineCache = fetchYarnDeps {
       yarnLock = finalAttrs.src + "/yarn.lock";
@@ -55,10 +56,6 @@ let
       mv ./apps/web/dist $out
     '';
   });
-in
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "stump";
-  inherit src version;
 
   __structuredAttrs = true;
 
@@ -71,7 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "stump_server"
   ];
 
-  env.GIT_REV = "v${version}";
+  env.GIT_REV = "v${finalAttrs.version}";
 
   nativeBuildInputs = [
     pkg-config
@@ -97,7 +94,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   postInstall = ''
     wrapProgram $out/bin/stump_server \
       --set-default STUMP_CONFIG_DIR /var/lib/stump/config \
-      --set-default STUMP_CLIENT_DIR ${frontend} \
+      --set-default STUMP_CLIENT_DIR ${finalAttrs.frontend} \
       --set-default STUMP_PORT 10001 \
       --set-default STUMP_PROFILE release \
       --set-default PDFIUM_PATH ${pdfium-binaries}/lib/libpdfium.so \

From 4387325b40b42d72a67e467b7298a56a3b1e0a96 Mon Sep 17 00:00:00 2001
From: Mirza Arnaut <mirza.arnaut45@gmail.com>
Date: Tue, 23 Jun 2026 14:22:28 +0200
Subject: [PATCH 026/100] stump: enable auto update PRs via nix-update-script

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

diff --git a/pkgs/by-name/st/stump/package.nix b/pkgs/by-name/st/stump/package.nix
index 614b50bbd4ac..e926c610f82e 100644
--- a/pkgs/by-name/st/stump/package.nix
+++ b/pkgs/by-name/st/stump/package.nix
@@ -16,6 +16,7 @@
   cacert,
   pkg-config,
   makeWrapper,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stump";
@@ -101,7 +102,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --set-default API_VERSION v1
   '';
 
-  passthru.tests = nixosTests.stump;
+  passthru = {
+    tests = nixosTests.stump;
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage"
+        "frontend"
+      ];
+    };
+  };
 
   meta = {
     homepage = "https://stumpapp.dev/";

From 71bccf41ea8fec4691dd4a39f99dc65d552b6eef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jun 2026 14:25:21 +0000
Subject: [PATCH 027/100] intel-cmt-cat: 26.03 -> 26.06

---
 pkgs/by-name/in/intel-cmt-cat/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/in/intel-cmt-cat/package.nix b/pkgs/by-name/in/intel-cmt-cat/package.nix
index 7c469dc1cb6c..42bfe92cf37c 100644
--- a/pkgs/by-name/in/intel-cmt-cat/package.nix
+++ b/pkgs/by-name/in/intel-cmt-cat/package.nix
@@ -5,14 +5,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "26.03";
+  version = "26.06";
   pname = "intel-cmt-cat";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "intel-cmt-cat";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-uGSWpP5CWyUpdLX5F/Lpiqbcdb0Zldeh5XSjptUqLqY=";
+    sha256 = "sha256-4rpmbQzxLD7FrtIzE+iE4G0sU7Dvz4rWs4MSlJqZcok=";
   };
 
   enableParallelBuilding = true;

From dbafe94990698b978eb88c8cb0274239ee8531e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jun 2026 21:41:33 +0000
Subject: [PATCH 028/100] rutorrent: 5.3.1 -> 5.3.3

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

diff --git a/pkgs/by-name/ru/rutorrent/package.nix b/pkgs/by-name/ru/rutorrent/package.nix
index 11ae8465b548..cf1af4777066 100644
--- a/pkgs/by-name/ru/rutorrent/package.nix
+++ b/pkgs/by-name/ru/rutorrent/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rutorrent";
-  version = "5.3.1";
+  version = "5.3.3";
 
   src = fetchFromGitHub {
     owner = "Novik";
     repo = "ruTorrent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UWXykIrpmnbjJZih+SAxmqjdu1+F/5ohBXxWLr5fa1c=";
+    hash = "sha256-1quWNiG8oW4HQJ1KJ7MkY7XzPmcYZnMXFxarANavwYI=";
   };
 
   installPhase = ''

From 4ac9b0660f358b4f94c8bc9e2642a9bb7a3300da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 04:23:19 +0000
Subject: [PATCH 029/100] amarok: 3.3.1 -> 3.3.3

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

diff --git a/pkgs/by-name/am/amarok/package.nix b/pkgs/by-name/am/amarok/package.nix
index ff187b8d3618..3a912fb74fda 100644
--- a/pkgs/by-name/am/amarok/package.nix
+++ b/pkgs/by-name/am/amarok/package.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "amarok";
-  version = "3.3.1";
+  version = "3.3.3";
 
   src = fetchurl {
     url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz";
-    hash = "sha256-OW8uqToH25XI+762gNeAai5ZVKUgxSwFZIXBHeYznAE=";
+    hash = "sha256-aOnoPX2MDL3UcJWOdogV9XPWHzzjK+e8G4f7VtYiQ24=";
   };
 
   outputs = [

From 0b9dd9e0b66a4527f383ad93d49e2530d11a7202 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 05:49:53 +0000
Subject: [PATCH 030/100] twingate: 2025.310.174671 -> 2026.160.6555

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

diff --git a/pkgs/by-name/tw/twingate/package.nix b/pkgs/by-name/tw/twingate/package.nix
index 1bab8cce0607..b0abdad761ed 100644
--- a/pkgs/by-name/tw/twingate/package.nix
+++ b/pkgs/by-name/tw/twingate/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "twingate";
-  version = "2025.310.174671";
+  version = "2026.160.6555";
 
   src = fetchurl {
     url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb";
-    hash = "sha256-ZzOsXpjLBR447Kvo2kwy9y8TRm8Yp3EMlVx6vQU72jQ=";
+    hash = "sha256-Sk2pALZtcraNpca6wkDiPCvWgU0hYlSeiwwszfZeKeM=";
   };
 
   buildInputs = [

From 9c782ee65e3faa2e983207930c28dffc1d364b74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 10:59:14 +0000
Subject: [PATCH 031/100] fvm: 4.0.5 -> 4.1.1

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

diff --git a/pkgs/by-name/fv/fvm/package.nix b/pkgs/by-name/fv/fvm/package.nix
index f94cd3862d08..8edb7b4aefd5 100644
--- a/pkgs/by-name/fv/fvm/package.nix
+++ b/pkgs/by-name/fv/fvm/package.nix
@@ -9,13 +9,13 @@
 }:
 
 let
-  version = "4.0.5";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "leoafarias";
     repo = "fvm";
     tag = version;
-    hash = "sha256-NLFEGUo4Zy/OYOlbPKirN+JhbGfvzX2Eg0qB10SiGxs=";
+    hash = "sha256-5XQK90aJ32A74FWV9ukwg0lRmRUU62ENy2SEjwsu+Os=";
   };
 in
 buildDartApplication {

From 6dbb8f4e3149b46a96fd21f5c22c76cd2076b47b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 21:58:39 +0000
Subject: [PATCH 032/100] python3Packages.google-cloud-dlp: 3.34.0 -> 3.38.0

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

diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix
index 4d6e46b35c30..cee8ca896753 100644
--- a/pkgs/development/python-modules/google-cloud-dlp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dlp";
-  version = "3.34.0";
+  version = "3.38.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_dlp";
     inherit version;
-    hash = "sha256-bfoxclINWn+ozM5HqWIs3oFfA3tKpvttaZhP1Ze/gAc=";
+    hash = "sha256-BcdlhL62CzBcE9xRMhp9Aebj7DHd8QXxjVDy+DT3toQ=";
   };
 
   build-system = [ setuptools ];

From 341d88103fc4b581d701f1361234731a8327e471 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 23:32:55 +0000
Subject: [PATCH 033/100] schemacrawler: 17.6.3 -> 17.11.3

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

diff --git a/pkgs/by-name/sc/schemacrawler/package.nix b/pkgs/by-name/sc/schemacrawler/package.nix
index 8d321fb4002a..b552e4c9a967 100644
--- a/pkgs/by-name/sc/schemacrawler/package.nix
+++ b/pkgs/by-name/sc/schemacrawler/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "schemacrawler";
-  version = "17.6.3";
+  version = "17.11.3";
 
   src = fetchzip {
     url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip";
-    hash = "sha256-yWp2UJ0kwSebYj8jYGPODIJrmrPhmDzavhoJsVfYQWw=";
+    hash = "sha256-8xE8mGLMtU90wJtCVMTf0kstFnh2Bxr9Ld2PkiUpQuw=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 3c5bebd045ce88cead17b91a697871c1308bc444 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Jun 2026 00:27:20 +0000
Subject: [PATCH 034/100] coin3d: 4.0.8 -> 4.0.10

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

diff --git a/pkgs/by-name/co/coin3d/package.nix b/pkgs/by-name/co/coin3d/package.nix
index c464f1078b38..c5faea3690d1 100644
--- a/pkgs/by-name/co/coin3d/package.nix
+++ b/pkgs/by-name/co/coin3d/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "coin";
-  version = "4.0.8";
+  version = "4.0.10";
 
   src = fetchFromGitHub {
     owner = "coin3d";
     repo = "coin";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2rKTDyDdmY7ItxUCHHfs3OyTlOQHdHaWITLxdGhrQ/I=";
+    hash = "sha256-Zymizcj+HeNgvvuuIoIHf03I0suOyWGOBIqvnjx5qyw=";
   };
 
   nativeBuildInputs = [ cmake ];

From 61fc93fbb8eea28629e7be7565fd7b77ba3920a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Jun 2026 03:05:53 +0000
Subject: [PATCH 035/100] amazon-cloudwatch-agent: 1.300069.0 -> 1.300070.0

---
 pkgs/by-name/am/amazon-cloudwatch-agent/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
index 12d808516bca..fe9f8fa7216a 100644
--- a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
+++ b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
@@ -11,16 +11,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "amazon-cloudwatch-agent";
-  version = "1.300069.0";
+  version = "1.300070.0";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-cloudwatch-agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-A9UASdKERo/vg3K8EDu//r6SqQjskhmVKeBlbqqpdDM=";
+    hash = "sha256-w0/y4qW109MjgO1/HWcBfPQ3zhIQb8lzZLCnoDMM99c=";
   };
 
-  vendorHash = "sha256-Qlwy0wz79TgYlBcsdHLzZA3OWbSIg6reK6KGSKsMlzI=";
+  proxyVendor = true; # darwin/linux hash mismatch
+  vendorHash = "sha256-ilpoDtOLVh4i/pGv8a90meCqw4DU3CeuAqDZyA/bgXE=";
 
   # See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77.
   subPackages = [

From 41e50bf5fbba896268ab4c5528557af2db8edcd1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Jun 2026 18:41:45 +0000
Subject: [PATCH 036/100] gpauth: 2.5.4 -> 2.6.4

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

diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix
index 08906b1fe59b..c7759ccae790 100644
--- a/pkgs/by-name/gp/gpauth/package.nix
+++ b/pkgs/by-name/gp/gpauth/package.nix
@@ -12,19 +12,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gpauth";
-  version = "2.5.4";
+  version = "2.6.4";
 
   src = fetchFromGitHub {
     owner = "yuezk";
     repo = "GlobalProtect-openconnect";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RDfxhf0t70Ex6MfgHAX2AaWcPAwTCvjm1bQkek+92zc=";
+    hash = "sha256-cFzQhogahw4/LXI6B9K2xxkMitbHfZg/3/00UORiGEE=";
     fetchSubmodules = true;
   };
 
   buildAndTestSubdir = "apps/gpauth";
 
-  cargoHash = "sha256-SY0PS5GxvVO1jaCNyLa3/l/v8/JT2R+4lM3W9kA7fVM=";
+  cargoHash = "sha256-9O9DHkn2ZG3SOnqjd5xYTNTTJ3w6yj0bs9Nl7m+rg64=";
 
   nativeBuildInputs = [
     perl

From 577110cd8453ed3f4037157332dcac19238766c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 06:41:35 +0000
Subject: [PATCH 037/100] poptracker: 0.35.1 -> 0.35.3

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

diff --git a/pkgs/by-name/po/poptracker/package.nix b/pkgs/by-name/po/poptracker/package.nix
index 871adeb86aa1..e075920a8355 100644
--- a/pkgs/by-name/po/poptracker/package.nix
+++ b/pkgs/by-name/po/poptracker/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "poptracker";
-  version = "0.35.1";
+  version = "0.35.3";
 
   src = fetchFromGitHub {
     owner = "black-sliver";
     repo = "PopTracker";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YPYGK1yDw0K5/gbJ9jwFSbpIJGKpkGy2iIcMiA9/xmA=";
+    hash = "sha256-HMuv6y8xPGI0+bI5/FCEnDwNbuP+Omcx2sn38d+6l7s=";
     fetchSubmodules = true;
   };
 

From feaf293791c34f56957fd2bd311c7913baf5503b Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Sun, 28 Jun 2026 15:10:51 -0300
Subject: [PATCH 038/100] i3pystatus: 3.35-unstable-2025-06-24 ->
 3.35-unstable-2026-04-21

Propagate requests and dbus-python for new hassio/kdeconnect/element_call
modules. Add mock for tests. Disable four element_call tests that fail
because upstream constructs ElementCall without Module.__init__.

https://nixpkgs-update-logs.nix-community.org/i3pystatus/2026-06-22.log

Assisted-by: Grok Build / Grok 4.3 (xAI)
---
 pkgs/by-name/i3/i3pystatus/package.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/i3/i3pystatus/package.nix b/pkgs/by-name/i3/i3pystatus/package.nix
index 46c1d229cee5..55465c92de41 100644
--- a/pkgs/by-name/i3/i3pystatus/package.nix
+++ b/pkgs/by-name/i3/i3pystatus/package.nix
@@ -14,7 +14,7 @@
 python3Packages.buildPythonApplication rec {
   # i3pystatus moved to rolling release:
   # https://github.com/enkore/i3pystatus/issues/584
-  version = "3.35-unstable-2025-06-24";
+  version = "3.35-unstable-2026-04-21";
   pname = "i3pystatus";
   pyproject = true;
   build-system = [ python3Packages.setuptools ];
@@ -22,8 +22,8 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "enkore";
     repo = "i3pystatus";
-    rev = "e8e03934d95658c85fa9f594987dac0481ca26c9";
-    hash = "sha256-uAt6jxNAUR9txyPtHS4BRtu8Z5QaP6uqFg0sROf356c=";
+    rev = "045d5f09220ccec1146a220619ff80b1077206a4";
+    hash = "sha256-K6sCII8qw0JLcMw5QVCY0RCu0O55MlEKFQXDY96V3NM=";
   };
 
   patches = [
@@ -44,12 +44,20 @@ python3Packages.buildPythonApplication rec {
 
   nativeCheckInputs = [
     python3Packages.pytestCheckHook
+    python3Packages.mock
     writableTmpDirAsHomeHook
   ];
 
-  checkInputs = [ python3Packages.requests ];
+  # Upstream tests construct ElementCall via __new__ without Module.__init__, so
+  # output/_output is never set (AttributeError on .output after run()).
+  disabledTests = [
+    "test_active_output"
+    "test_empty_output"
+    "test_error_output"
+    "test_format_includes_room_alias"
+  ];
 
-  propagatedBuildInputs =
+  dependencies =
     with python3Packages;
     [
       keyring
@@ -58,6 +66,8 @@ python3Packages.buildPythonApplication rec {
       psutil
       basiciw
       pygobject3
+      requests
+      dbus-python
     ]
     ++ extraLibs;
 

From 78d8a22eaebac46f6f744e4318e9f8bc7d8bdb19 Mon Sep 17 00:00:00 2001
From: Rasmus Enevoldsen <rasmus@enev.dk>
Date: Mon, 29 Jun 2026 15:12:40 +0200
Subject: [PATCH 039/100] octave-packages: enforce alphabetical order

---
 pkgs/top-level/octave-packages.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/octave-packages.nix b/pkgs/top-level/octave-packages.nix
index 89a847c6dcea..4d1a19bdf688 100644
--- a/pkgs/top-level/octave-packages.nix
+++ b/pkgs/top-level/octave-packages.nix
@@ -62,6 +62,8 @@ makeScope newScope (
       writeRequiredOctavePackagesHook
       ;
 
+    # keep-sorted start block=yes newline_separated=yes case=no numeric=yes skip_lines=1
+
     arduino = callPackage ../development/octave-modules/arduino {
       inherit (pkgs) arduino-core-unwrapped;
     };
@@ -94,10 +96,10 @@ makeScope newScope (
 
     econometrics = callPackage ../development/octave-modules/econometrics { };
 
-    fits = callPackage ../development/octave-modules/fits { };
-
     financial = callPackage ../development/octave-modules/financial { };
 
+    fits = callPackage ../development/octave-modules/fits { };
+
     fpl = callPackage ../development/octave-modules/fpl { };
 
     fuzzy-logic-toolkit = callPackage ../development/octave-modules/fuzzy-logic-toolkit { };
@@ -128,12 +130,12 @@ makeScope newScope (
 
     instrument-control = callPackage ../development/octave-modules/instrument-control { };
 
+    interval = callPackage ../development/octave-modules/interval { };
+
     io = callPackage ../development/octave-modules/io {
       inherit (octave) enableJava;
     };
 
-    interval = callPackage ../development/octave-modules/interval { };
-
     linear-algebra = callPackage ../development/octave-modules/linear-algebra { };
 
     lssa = callPackage ../development/octave-modules/lssa { };
@@ -191,12 +193,12 @@ makeScope newScope (
 
     sockets = callPackage ../development/octave-modules/sockets { };
 
-    stk = callPackage ../development/octave-modules/stk { };
-
     splines = callPackage ../development/octave-modules/splines { };
 
     statistics = callPackage ../development/octave-modules/statistics { };
 
+    stk = callPackage ../development/octave-modules/stk { };
+
     strings = callPackage ../development/octave-modules/strings { };
 
     struct = callPackage ../development/octave-modules/struct { };
@@ -215,6 +217,7 @@ makeScope newScope (
       inherit (pkgs) zeromq autoreconfHook;
     };
 
+    # keep-sorted end
   }
   // lib.optionalAttrs config.allowAliases {
     fem-fenics = throw "octavePackages.fem-fenics has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05

From 1a551cb15cb895083b8ca4bb2c21664ff2c49fcf Mon Sep 17 00:00:00 2001
From: eymeric <hatchchien@protonmail.com>
Date: Sun, 31 May 2026 23:32:04 +0200
Subject: [PATCH 040/100] ratatouille-lv2: init at 0.9.11

Assisted-by: gemini-cli Gemini 3
---
 pkgs/by-name/ra/ratatouille-lv2/package.nix | 65 +++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 pkgs/by-name/ra/ratatouille-lv2/package.nix

diff --git a/pkgs/by-name/ra/ratatouille-lv2/package.nix b/pkgs/by-name/ra/ratatouille-lv2/package.nix
new file mode 100644
index 000000000000..22c9bc0fa762
--- /dev/null
+++ b/pkgs/by-name/ra/ratatouille-lv2/package.nix
@@ -0,0 +1,65 @@
+{
+  cairo,
+  fetchFromGitHub,
+  lib,
+  libx11,
+  libjack2,
+  libsndfile,
+  lv2,
+  pkg-config,
+  stdenv,
+  xorgproto,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ratatouille-lv2";
+  version = "0.9.11";
+
+  src = fetchFromGitHub {
+    owner = "brummer10";
+    repo = "Ratatouille.lv2";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-mig3yUGSNz1xuyz6ljKqJUjNqmEcsbXSH1vTxTGdOFk=";
+    fetchSubmodules = true;
+  };
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libx11
+    xorgproto
+    cairo
+    lv2
+    libsndfile
+    libjack2
+  ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "INSTALL_DIR=$(out)/lib/lv2"
+    "EXE_INSTALL_DIR=$(out)/bin"
+    "CLAP_INSTAL_DIR=$(out)/lib/clap"
+    "VST2_INSTAL_DIR=$(out)/lib/vst"
+    "user=root"
+    "STRIP=:"
+  ];
+
+  postPatch = ''
+    substituteInPlace Ratatouille/makefile \
+      --replace-fail "-flto=auto" ""
+  '';
+
+  meta = {
+    homepage = "https://github.com/brummer10/Ratatouille.lv2";
+    description = "Neural Amp Modeler LV2 plugin";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ eymeric ];
+    platforms = lib.platforms.linux;
+    mainProgram = "Ratatouille";
+  };
+})

From 54a885b59c3300851797b8230e569e595ce55db8 Mon Sep 17 00:00:00 2001
From: bahrom04 <magdiyevbahrom@gmail.com>
Date: Tue, 30 Jun 2026 15:56:52 +0500
Subject: [PATCH 041/100] e-imzo-manager: 1.2.0 -> 1.3.0

---
 pkgs/by-name/e-/e-imzo-manager/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/e-/e-imzo-manager/package.nix b/pkgs/by-name/e-/e-imzo-manager/package.nix
index e0f05cd3cbac..23e3a43b7a0b 100644
--- a/pkgs/by-name/e-/e-imzo-manager/package.nix
+++ b/pkgs/by-name/e-/e-imzo-manager/package.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  fetchFromGitHub,
+  fetchFromForgejo,
   cargo,
   desktop-file-utils,
   gnome-desktop,
@@ -22,18 +22,19 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "e-imzo-manager";
-  version = "1.2.0";
+  version = "1.3.0";
 
-  src = fetchFromGitHub {
-    owner = "xinux-org";
+  src = fetchFromForgejo {
+    domain = "git.oss.uzinfocom.uz";
+    owner = "xinux";
     repo = "e-imzo-manager";
     tag = finalAttrs.version;
-    hash = "sha256-LX13zdwjlV99NziEP7PoJH8yxPV1gVQQH/L0VkuRLD4=";
+    hash = "sha256-QXAfrNPaq76HALhUlMdSygbfA5wJI4rGHDpnwPI/74w";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-qnwAJ0gRzIxEkkDeNqiYMB+Dvth4MugUIe9sv7c46/E=";
+    hash = "sha256-9yyTtMf1oCJWfFxWsaYWGT2/iTqU+3Ls0LIdHrNGZJI=";
   };
 
   strictDeps = true;
@@ -72,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    homepage = "https://github.com/xinux-org/e-imzo-manager";
+    homepage = "https://git.oss.uzinfocom.uz/xinux/e-imzo-manager";
     mainProgram = "E-IMZO-Manager";
     description = "GTK application for managing E-IMZO keys";
     license = with lib.licenses; [ agpl3Plus ];

From d697e418f5196313deefb47b07e064278015fabc Mon Sep 17 00:00:00 2001
From: Pavel Borzenkov <pavel@borzenkov.net>
Date: Tue, 30 Jun 2026 15:24:42 +0200
Subject: [PATCH 042/100] ghr-cli: do version check

---
 pkgs/by-name/gh/ghr-cli/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/gh/ghr-cli/package.nix b/pkgs/by-name/gh/ghr-cli/package.nix
index e66d4997aa64..1b5c81832a3f 100644
--- a/pkgs/by-name/gh/ghr-cli/package.nix
+++ b/pkgs/by-name/gh/ghr-cli/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   nix-update-script,
   gitMinimal,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -27,6 +28,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     gitMinimal
   ];
 
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
   meta = {
     description = "Fast terminal workspace for staying on top of GitHub";
     homepage = "https://catcoding.me/ghr/";

From 69a0dc9488c7b8b1e3cf21c85271ddcf0d927903 Mon Sep 17 00:00:00 2001
From: Muhammad Talal Anwar <noreply@talal.ch>
Date: Tue, 30 Jun 2026 21:49:55 +0200
Subject: [PATCH 043/100] remnote: add talal to maintainers

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

diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index 3a4a14c94c40..c4cf418d8a6b 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -39,7 +39,7 @@ appimageTools.wrapType2 {
   meta = {
     description = "Note-taking application focused on learning and productivity";
     homepage = "https://remnote.com/";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ talal ];
     license = lib.licenses.unfree;
     platforms = [ "x86_64-linux" ];
     mainProgram = "remnote";

From 736380d96edeaaa44d273dceea14a5c54f31af8b Mon Sep 17 00:00:00 2001
From: Muhammad Talal Anwar <noreply@talal.ch>
Date: Tue, 30 Jun 2026 21:53:34 +0200
Subject: [PATCH 044/100] remnote: add changelog to meta

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

diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index c4cf418d8a6b..fbfded978243 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -39,6 +39,7 @@ appimageTools.wrapType2 {
   meta = {
     description = "Note-taking application focused on learning and productivity";
     homepage = "https://remnote.com/";
+    changelog = "https://feedback.remnote.com/changelog";
     maintainers = with lib.maintainers; [ talal ];
     license = lib.licenses.unfree;
     platforms = [ "x86_64-linux" ];

From 06746a162badacd1578a9cd1895cd3e3ea326542 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Mon, 4 May 2026 17:40:01 -0700
Subject: [PATCH 045/100] build2 packages: 0.17 -> 0.18

These packages are all highly interdependent and have to be updated in
lockstep, so I'm just doing it all in one commit - there's no benefit to
having cherry-pickable commits as they wouldn't work individually.
---
 pkgs/by-name/bd/bdep/package.nix               |  4 ++--
 pkgs/by-name/bp/bpkg/package.nix               |  4 ++--
 .../build2-bootstrap/nix-ldflags-sysdirs.patch |  9 ++-------
 pkgs/by-name/bu/build2-bootstrap/package.nix   | 14 ++++----------
 pkgs/by-name/bu/build2/package.nix             |  4 ++--
 .../bu/build2/remove-config-store-paths.patch  | 18 +++++++++---------
 pkgs/by-name/li/libbpkg/package.nix            |  4 ++--
 pkgs/by-name/li/libbutl/package.nix            |  4 ++--
 pkgs/by-name/li/libodb-sqlite/package.nix      |  6 +++---
 pkgs/by-name/li/libodb/package.nix             |  6 +++---
 10 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/pkgs/by-name/bd/bdep/package.nix b/pkgs/by-name/bd/bdep/package.nix
index 5fd388204d1a..3c5509f76b7f 100644
--- a/pkgs/by-name/bd/bdep/package.nix
+++ b/pkgs/by-name/bd/bdep/package.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bdep";
-  version = "0.17.0";
+  version = "0.18.0";
 
   outputs = [
     "out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   src = fetchurl {
     url = "https://pkg.cppget.org/1/alpha/build2/bdep-${finalAttrs.version}.tar.gz";
-    hash = "sha256-+2Hl5kanxWJmOpfePAvvSBSmG3kZLQv/kYIkT4J+kaQ=";
+    hash = "sha256-7pfGiIelaHQydpZqd6KiF7gwCqC9oJspig87BrKz6QU=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/bp/bpkg/package.nix b/pkgs/by-name/bp/bpkg/package.nix
index 7265bb38ce28..cf4f45450711 100644
--- a/pkgs/by-name/bp/bpkg/package.nix
+++ b/pkgs/by-name/bp/bpkg/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bpkg";
-  version = "0.17.0";
+  version = "0.18.0";
 
   outputs = [
     "out"
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://pkg.cppget.org/1/alpha/build2/bpkg-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Yw6wvTqO+VfCo91B2BUT0A8OIN0MVhGK1USYM7hgGMs=";
+    hash = "sha256-EcDxvQ3P182gkZWkE3qI586vIlJXlDrYC2DoU0Out18=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/bu/build2-bootstrap/nix-ldflags-sysdirs.patch b/pkgs/by-name/bu/build2-bootstrap/nix-ldflags-sysdirs.patch
index 4a1013f16e01..f4ed117cc497 100644
--- a/pkgs/by-name/bu/build2-bootstrap/nix-ldflags-sysdirs.patch
+++ b/pkgs/by-name/bu/build2-bootstrap/nix-ldflags-sysdirs.patch
@@ -1,8 +1,6 @@
-diff --git a/libbuild2/cc/common.cxx b/libbuild2/cc/common.cxx
-index f848003c..0f14f9a5 100644
 --- a/libbuild2/cc/common.cxx
 +++ b/libbuild2/cc/common.cxx
-@@ -966,6 +966,17 @@ namespace build2
+@@ -1806,6 +1806,17 @@ namespace build2
      void
      msvc_extract_library_search_dirs (const strings&, dir_paths&); // msvc.cxx
  
@@ -20,11 +18,8 @@ index f848003c..0f14f9a5 100644
      dir_paths common::
      extract_library_search_dirs (const scope& bs) const
      {
-@@ -987,8 +998,19 @@ namespace build2
-           msvc_extract_library_search_dirs (v, r);
-         else
+@@ -1829,6 +1840,16 @@ namespace build2
            gcc_extract_library_search_dirs (v, r);
-+
        };
  
 +      // NIX_LDFLAGS are implicitly used when linking,
diff --git a/pkgs/by-name/bu/build2-bootstrap/package.nix b/pkgs/by-name/bu/build2-bootstrap/package.nix
index f6002a9b8385..7b57124f9e93 100644
--- a/pkgs/by-name/bu/build2-bootstrap/package.nix
+++ b/pkgs/by-name/bu/build2-bootstrap/package.nix
@@ -8,20 +8,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "build2-bootstrap";
-  version = "0.17.0";
+  version = "0.18.1";
   src = fetchurl {
     url = "https://download.build2.org/${finalAttrs.version}/build2-toolchain-${finalAttrs.version}.tar.xz";
-    hash = "sha256-NyKonqht90JTnQ+Ru0Qp/Ua79mhVOjUHgKY0EbZIv10=";
+    hash = "sha256-pfPqudRSK8InBImVk91scBM0mhuMNyeMiyMhBz4l/xY=";
   };
   patches = [
     # Pick up sysdirs from NIX_LDFLAGS
     ./nix-ldflags-sysdirs.patch
-    # Fix build on newer clang/libcpp
-    (fetchpatch {
-      name = "new-libcpp-fix.patch";
-      url = "https://github.com/build2/build2/commit/7cf9cece1d88cd1be283ab309f9a851bd02b43d0.patch";
-      hash = "sha256-PTo1C6Aa1L9fvjiJ08KtGgVqHMw2ZlW5LSKoripL22g=";
-    })
   ];
 
   sourceRoot = "build2-toolchain-${finalAttrs.version}/build2";
@@ -43,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = true;
   checkPhase = ''
     runHook preCheck
-    build2/b-boot --version
+    b/b-boot --version
     runHook postCheck
   '';
 
   installPhase = ''
     runHook preInstall
-    install -D build2/b-boot $out/bin/b
+    install -D b/b-boot $out/bin/b
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/bu/build2/package.nix b/pkgs/by-name/bu/build2/package.nix
index 8c0391dc4f75..7e70389f408e 100644
--- a/pkgs/by-name/bu/build2/package.nix
+++ b/pkgs/by-name/bu/build2/package.nix
@@ -16,7 +16,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "build2";
-  version = "0.17.0";
+  version = "0.18.1";
 
   outputs = [
     "out"
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://pkg.cppget.org/1/alpha/build2/build2-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Kx5X/GV3GjFSbjo1mzteiHnnm4mr6+NAKIR/mEE+IdA=";
+    hash = "sha256-BLMBd/1kofVuB2MalPyuj4lXNMi3p5uuzVIJUzQv3A0=";
   };
 
   patches = [
diff --git a/pkgs/by-name/bu/build2/remove-config-store-paths.patch b/pkgs/by-name/bu/build2/remove-config-store-paths.patch
index 6eeed0eb061b..ec29b7af77c0 100644
--- a/pkgs/by-name/bu/build2/remove-config-store-paths.patch
+++ b/pkgs/by-name/bu/build2/remove-config-store-paths.patch
@@ -1,14 +1,14 @@
 --- a/libbuild2/buildfile
 +++ b/libbuild2/buildfile
-@@ -86,8 +86,11 @@ build2_config_lines = [strings]
- host_config_lines = [strings]
+@@ -109,8 +109,11 @@ host_config_no_warnings_lines = [strings]
+ build2_config_no_warnings_lines = [strings]
  
- for l: $regex.replace_lines(                                                   \
-+  $regex.replace_lines(                                                        \
-   $config.save(),                                                              \
-   '^( *(#|(config\.(test[. ]|dist\.|install\.chroot|config\.hermetic))).*|)$', \
-+  [null], return_lines),                                                       \
-+  '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$',                                  \
+ for l: $regex.replace_lines(                                                            \
++  $regex.replace_lines(                                                                 \
+   $config.save(),                                                                       \
+   '^( *(#|(config\.(build2\.|test[. ]|dist\.|install\.chroot|config\.hermetic))).*|)$', \
++  [null], return_lines),                                                                \
++  '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$',                                           \
    [null])
  {
-   build2_config_lines += $l
+   if ($defined(config.build2.host_c) && $regex.match($l, ' *config\.c[ =].*'))
diff --git a/pkgs/by-name/li/libbpkg/package.nix b/pkgs/by-name/li/libbpkg/package.nix
index 483ce5791778..3b6a8d2651a0 100644
--- a/pkgs/by-name/li/libbpkg/package.nix
+++ b/pkgs/by-name/li/libbpkg/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libbpkg";
-  version = "0.17.0";
+  version = "0.18.0";
   outputs = [
     "out"
     "dev"
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://pkg.cppget.org/1/alpha/build2/libbpkg-${finalAttrs.version}.tar.gz";
-    hash = "sha256-4P4+uJGWB3iblYPuErJNr8c7/pS2UhN6LXr7MY2rWDY=";
+    hash = "sha256-ROaIgIql1oXOqiwz8giTcz0landh6rITyzX3WxR16L4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libbutl/package.nix b/pkgs/by-name/li/libbutl/package.nix
index dc136a91796f..a4f2491e5d10 100644
--- a/pkgs/by-name/li/libbutl/package.nix
+++ b/pkgs/by-name/li/libbutl/package.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libbutl";
-  version = "0.17.0";
+  version = "0.18.1";
 
   outputs = [
     "out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://pkg.cppget.org/1/alpha/build2/libbutl-${finalAttrs.version}.tar.gz";
-    hash = "sha256-sFqaEf6s2rF1YcZjw5J6oY5ol5PbO9vy6NseKjrvTvs=";
+    hash = "sha256-tQl7FRJh/CJ7A5MIlxlVv5aduPy/C0shcn9l+IB1oZU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libodb-sqlite/package.nix b/pkgs/by-name/li/libodb-sqlite/package.nix
index 28a42f053e64..4b9bfd1b7d48 100644
--- a/pkgs/by-name/li/libodb-sqlite/package.nix
+++ b/pkgs/by-name/li/libodb-sqlite/package.nix
@@ -10,7 +10,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libodb-sqlite";
-  version = "2.5.0-b.27";
+  version = "2.5.0";
 
   outputs = [
     "out"
@@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   src = fetchurl {
-    url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${finalAttrs.version}.tar.gz";
-    hash = "sha256-jpxtY/VMkh88IzqGYgedu5TZGVIbPpy/FZNvUaOMf+w=";
+    url = "https://pkg.cppget.org/1/stable/odb/libodb-sqlite-${finalAttrs.version}.tar.gz";
+    hash = "sha256-soq3OpAlVLum65um9MkJnR4Vgm3nofpPumRRpBCFb70=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libodb/package.nix b/pkgs/by-name/li/libodb/package.nix
index fc513eeebc23..90a42db2b0eb 100644
--- a/pkgs/by-name/li/libodb/package.nix
+++ b/pkgs/by-name/li/libodb/package.nix
@@ -8,7 +8,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libodb";
-  version = "2.5.0-b.27";
+  version = "2.5.0";
 
   outputs = [
     "out"
@@ -17,8 +17,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   src = fetchurl {
-    url = "https://pkg.cppget.org/1/beta/odb/libodb-${finalAttrs.version}.tar.gz";
-    hash = "sha256-04Et/wHYsWvJPLlcL0J2iOPV2SBFC6J32EleGw38K2Q=";
+    url = "https://pkg.cppget.org/1/stable/odb/libodb-${finalAttrs.version}.tar.gz";
+    hash = "sha256-cAA4pzxsvq0BESmxUDC3zdP3NRC2h/LEUEgI30IwRBs=";
   };
 
   nativeBuildInputs = [ build2 ];

From f9115e69137ec74193a1fd004ac17bc54f8cd546 Mon Sep 17 00:00:00 2001
From: Riadh <22998716+KiKoS0@users.noreply.github.com>
Date: Wed, 1 Jul 2026 01:48:29 +0100
Subject: [PATCH 046/100] maintainers: add kikos0

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 516d4817bedf..24096aff4f9e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14418,6 +14418,11 @@
     githubId = 464625;
     name = "Enric Morales";
   };
+  kikos0 = {
+    github = "KiKoS0";
+    githubId = 22998716;
+    name = "Riadh Daghmoura";
+  };
   kilianar = {
     email = "mail@kilianar.de";
     github = "kilianar";

From 3eef782bfb4a07bff03f47b023deecd2d018a1f9 Mon Sep 17 00:00:00 2001
From: Riadh <22998716+KiKoS0@users.noreply.github.com>
Date: Wed, 1 Jul 2026 01:48:44 +0100
Subject: [PATCH 047/100] inngest: init at 1.34.0

---
 pkgs/by-name/in/inngest/package.nix | 106 ++++++++++++++++++++++++++++
 pkgs/by-name/in/inngest/update.sh   |  46 ++++++++++++
 2 files changed, 152 insertions(+)
 create mode 100644 pkgs/by-name/in/inngest/package.nix
 create mode 100755 pkgs/by-name/in/inngest/update.sh

diff --git a/pkgs/by-name/in/inngest/package.nix b/pkgs/by-name/in/inngest/package.nix
new file mode 100644
index 000000000000..94fcf1527099
--- /dev/null
+++ b/pkgs/by-name/in/inngest/package.nix
@@ -0,0 +1,106 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  fetchPnpmDeps,
+  pnpm_10,
+  pnpmConfigHook,
+  nodejs,
+  stdenv,
+  testers,
+}:
+let
+  version = "1.34.0";
+  websiteRev = "159c0ac611e85ec85ffe0a8c8bf2c4a0330bdb38";
+
+  src = fetchFromGitHub {
+    owner = "inngest";
+    repo = "inngest";
+    tag = "v${version}";
+    hash = "sha256-DMJEhgKj2glNtJmsLc3oyDZr5H/COFLrcogcgaYiLjU=";
+  };
+
+  website = fetchFromGitHub {
+    owner = "inngest";
+    repo = "website";
+    rev = websiteRev;
+    hash = "sha256-EkTIv8jgcqzurz2M7PC6Kfh6x2Zxu7UmIhpTjlj8o88=";
+  };
+
+  ui = stdenv.mkDerivation (finalAttrs: {
+    inherit version src;
+    pname = "inngest-ui";
+
+    nativeBuildInputs = [
+      nodejs
+      pnpm_10
+      pnpmConfigHook
+    ];
+
+    pnpmDeps = fetchPnpmDeps {
+      inherit (finalAttrs) pname version src;
+      pnpm = pnpm_10;
+      sourceRoot = "${finalAttrs.src.name}/ui";
+      fetcherVersion = 4;
+      hash = "sha256-bt/7cpN9EXf2CZFRAaybr7pgJyInV0fdUy7Rv/UcT/I=";
+    };
+    pnpmRoot = "ui";
+
+    buildPhase = ''
+      runHook preBuild
+      pnpm --filter dev-server-ui build
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/dist
+      cp -r ui/apps/dev-server-ui/dist/. $out/dist/
+      runHook postInstall
+    '';
+  });
+in
+buildGoModule (finalAttrs: {
+  inherit version src;
+  pname = "inngest";
+
+  __structuredAttrs = true;
+
+  vendorHash = null;
+
+  preBuild = ''
+    cp -r ${ui}/dist/. ./pkg/devserver/static/
+    cp -r ${website}/. ./internal/embeddocs/website/
+  '';
+
+  postInstall = ''
+    mv $out/bin/cmd $out/bin/inngest
+  '';
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/inngest/inngest/pkg/inngest/version.Version=${version}"
+  ];
+
+  env.CGO_ENABLED = 0;
+
+  subPackages = [ "cmd" ];
+
+  passthru = {
+    inherit ui website websiteRev;
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+    updateScript = ./update.sh;
+  };
+
+  meta = {
+    description = "CLI and dev server for Inngest durable workflows";
+    homepage = "https://github.com/inngest/inngest";
+    changelog = "https://github.com/inngest/inngest/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.sspl;
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+    maintainers = with lib.maintainers; [ kikos0 ];
+    mainProgram = "inngest";
+    platforms = lib.lists.remove "x86_64-darwin" lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/in/inngest/update.sh b/pkgs/by-name/in/inngest/update.sh
new file mode 100755
index 000000000000..6c2ff3314bb7
--- /dev/null
+++ b/pkgs/by-name/in/inngest/update.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i bash -p gh jq
+# shellcheck shell=bash
+set -euo pipefail
+
+nixpkgs="$(pwd)"
+cd "$(readlink -e "$(dirname "${BASH_SOURCE[0]}")")"
+
+nix_attr() { nix eval --json --impure --expr "(import $nixpkgs {}).$1" | jq -r; }
+
+update_hash() {
+  old_hash="$(nix_attr "$1.outputHash")"
+  new_hash="$(nix-build --impure --expr "let src = (import $nixpkgs {}).$1; in (src.overrideAttrs or (f: src // f src)) (_: { outputHash = \"\"; outputHashAlgo = \"sha256\"; })" 2>&1 | tr -s ' ' | grep -Po "got: \K.+$")" || true
+  sed -i "s|${old_hash}|${new_hash}|g" package.nix
+  echo "$1: $old_hash -> $new_hash"
+}
+
+latest=$(gh api repos/inngest/inngest/releases/latest --jq '.tag_name' | tr -d 'v')
+current=$(nix_attr inngest.version)
+
+if [[ "$current" == "$latest" ]]; then
+  echo "inngest is already up to date: $current"
+  exit 0
+fi
+
+echo "Updating inngest $current -> $latest"
+
+sed -i "s|version = \"${current}\"|version = \"${latest}\"|" package.nix
+update_hash inngest.src
+
+old_lock=$(gh api "repos/inngest/inngest/contents/ui/pnpm-lock.yaml?ref=v${current}" --jq '.sha')
+new_lock=$(gh api "repos/inngest/inngest/contents/ui/pnpm-lock.yaml?ref=v${latest}" --jq '.sha')
+if [[ "$old_lock" != "$new_lock" ]]; then
+  update_hash inngest.ui.pnpmDeps
+else
+  echo "pnpm lockfile unchanged, skipping"
+fi
+
+new_rev=$(gh api "repos/inngest/inngest/contents/internal/embeddocs/website?ref=v${latest}" --jq '.sha')
+old_rev=$(nix_attr inngest.websiteRev)
+if [[ "$old_rev" != "$new_rev" ]]; then
+  sed -i "s|${old_rev}|${new_rev}|" package.nix
+  update_hash inngest.website
+else
+  echo "website unchanged, skipping"
+fi

From 74f7586818932776de78d4afe9b8e72ce9530e49 Mon Sep 17 00:00:00 2001
From: Muhammad Talal Anwar <noreply@talal.ch>
Date: Wed, 1 Jul 2026 06:41:35 +0200
Subject: [PATCH 048/100] remnote: add NIXOS_OZONE_WL flags

---
 pkgs/by-name/re/remnote/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index fbfded978243..a5ec21433c24 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -2,6 +2,7 @@
   lib,
   fetchurl,
   appimageTools,
+  makeWrapper,
   writeScript,
 }:
 let
@@ -11,16 +12,21 @@ let
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
     hash = "sha256-3F1lC/3ek6k3x6qZ4WswJRe/QYEy3iTNMhMmLtR6i0U=";
   };
-  appimageContents = appimageTools.extractType2 { inherit pname version src; };
+  appimageContents = appimageTools.extract { inherit pname version src; };
 in
 appimageTools.wrapType2 {
   inherit pname version src;
 
+  nativeBuildInputs = [ makeWrapper ];
+
   extraInstallCommands = ''
     install -Dm444 ${appimageContents}/remnote.desktop -t $out/share/applications
     substituteInPlace $out/share/applications/remnote.desktop \
       --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=remnote %u'
     install -Dm444 ${appimageContents}/remnote.png -t $out/share/icons/hicolor/512x512/apps
+
+    wrapProgram $out/bin/remnote \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime=true --wayland-text-input-version=3}}"
   '';
 
   passthru.updateScript = writeScript "update.sh" ''

From d7a2ca0226934ea5c1a33a118c47ad7a1546027e Mon Sep 17 00:00:00 2001
From: Muhammad Talal Anwar <noreply@talal.ch>
Date: Tue, 30 Jun 2026 22:20:14 +0200
Subject: [PATCH 049/100] remnote: 1.26.11 -> 1.26.20

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

diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index a5ec21433c24..861fa3bea102 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -7,10 +7,10 @@
 }:
 let
   pname = "remnote";
-  version = "1.26.11";
+  version = "1.26.20";
   src = fetchurl {
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-3F1lC/3ek6k3x6qZ4WswJRe/QYEy3iTNMhMmLtR6i0U=";
+    hash = "sha256-3/gb/7LO18exAmFYzzfJM7lCbMPrVqCcD32LfkVIO5g=";
   };
   appimageContents = appimageTools.extract { inherit pname version src; };
 in

From 6e9a995c27dfae350ce8af6f13674fe803448884 Mon Sep 17 00:00:00 2001
From: Cathal Mullan <contact@cathal.dev>
Date: Wed, 1 Jul 2026 14:57:04 +0100
Subject: [PATCH 050/100] cedar: build cedar-language-server

---
 pkgs/by-name/ce/cedar/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ce/cedar/package.nix b/pkgs/by-name/ce/cedar/package.nix
index 252f7c957ea6..4d9aa40d3251 100644
--- a/pkgs/by-name/ce/cedar/package.nix
+++ b/pkgs/by-name/ce/cedar/package.nix
@@ -23,6 +23,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoBuildFlags = [
     "--bin"
     "cedar"
+    "--bin"
+    "cedar-language-server"
   ];
 
   cargoTestFlags = finalAttrs.cargoBuildFlags;

From eab74749df2886e642b18e29a6b85012a57884d1 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Thu, 2 Jul 2026 04:08:25 +0200
Subject: [PATCH 051/100] jujutsu: 0.42.0 -> 0.43.0

Changelog: https://github.com/jj-vcs/jj/releases/tag/v0.43.0
Diff: https://github.com/jj-vcs/jj/compare/v0.42.0...v0.43.0
---
 pkgs/by-name/ju/jujutsu/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index 83a1d28b59e5..c8da060e028f 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jujutsu";
-  version = "0.42.0";
+  version = "0.43.0";
 
   src = fetchFromGitHub {
     owner = "jj-vcs";
     repo = "jj";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wAefhpNP4ErCTTjZADpvTDk2of/XKP/MoXl6fpG7/fA=";
+    hash = "sha256-XgBq2ZN34iWlwKVgW7Syr46KUdt7pJuSDd/J6QWJwwQ=";
   };
 
-  cargoHash = "sha256-b7/5vkO6GNX8qzJr4NcxtLZVLDc6NOMrOU4dE6LOFoE=";
+  cargoHash = "sha256-bEvpTd+FAHrD+CZN7+AuCuThyJ5LtufQR7OrGpjrWK0=";
 
   nativeBuildInputs = [
     installShellFiles

From eb5b810d4e818b2cbbf789a034ca09497cb0fb98 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Thu, 2 Jul 2026 14:03:31 +0700
Subject: [PATCH 052/100] python3Packages.showit: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/showit/default.nix b/pkgs/development/python-modules/showit/default.nix
index b62246952537..863a524e4d48 100644
--- a/pkgs/development/python-modules/showit/default.nix
+++ b/pkgs/development/python-modules/showit/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   numpy,
   matplotlib,
   pytest,
@@ -10,7 +11,7 @@
 buildPythonPackage {
   pname = "showit";
   version = "1.1.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "freeman-lab";
@@ -19,7 +20,9 @@ buildPythonPackage {
     sha256 = "0xd8isrlwwxlgji90lly1sq4l2a37rqvhsmyhv7bd3aj1dyjmdr6";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     numpy
     matplotlib
   ];

From 4ad5fc1a04f1307c10ae2cbfe3d1032d2dfdf0b5 Mon Sep 17 00:00:00 2001
From: yvnth <yvnth@users.noreply.github.com>
Date: Thu, 2 Jul 2026 18:58:34 +0530
Subject: [PATCH 053/100] tombi: 1.1.6 -> 1.1.7

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

diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix
index 8fc30b2a8e1d..a5ff79c98f2b 100644
--- a/pkgs/by-name/to/tombi/package.nix
+++ b/pkgs/by-name/to/tombi/package.nix
@@ -9,7 +9,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tombi";
-  version = "1.1.6";
+  version = "1.1.7";
 
   __structuredAttrs = true;
 
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "tombi-toml";
     repo = "tombi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-h8P93ZgrTh5xgsvIDrbJPF1C4JJiovRht2oGLtWnyio=";
+    hash = "sha256-Pm+OMtVd0zSPiE56N5WjpF8mM5pft+jVEQJufqiTkG8=";
   };
 
   # Tests relies on the presence of network

From 9e2ac93267979f156d71f7415d846c900316947f Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 2 Jul 2026 09:35:53 -0400
Subject: [PATCH 054/100] autosuspend: 10.1.0 -> 11.3.0

Changelog: https://github.com/languitar/autosuspend/releases/tag/v11.3.0
---
 nixos/modules/services/misc/autosuspend.nix | 2 +-
 pkgs/by-name/au/autosuspend/package.nix     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/autosuspend.nix b/nixos/modules/services/misc/autosuspend.nix
index 9bbc9b2e7af8..8ac8ce96be31 100644
--- a/nixos/modules/services/misc/autosuspend.nix
+++ b/nixos/modules/services/misc/autosuspend.nix
@@ -240,7 +240,7 @@ in
       after = [ "network.target" ];
       path = flatten (attrValues (filterAttrs (n: _: hasCheck n) dependenciesForChecks));
       serviceConfig = {
-        ExecStart = "${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} daemon";
+        ExecStart = "${autosuspend}/bin/autosuspend --logging ${autosuspend}/etc/autosuspend-logging.conf daemon --config ${autosuspend-conf}";
       };
     };
   };
diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix
index 3ba6de8a854c..b9b487b9cf01 100644
--- a/pkgs/by-name/au/autosuspend/package.nix
+++ b/pkgs/by-name/au/autosuspend/package.nix
@@ -11,7 +11,7 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "autosuspend";
-  version = "10.1.0";
+  version = "11.3.0";
   pyproject = true;
 
   outputs = [
@@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     owner = "languitar";
     repo = "autosuspend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4mByuJ75hd5TEoKxVglAHlYXZSlbAldMwnIianSw8O4=";
+    hash = "sha256-KG1Cv3Fmdf3VDdZR+k0SeA97g6R+oI6+NgtaWHWPVUQ=";
   };
 
   postPatch = ''

From e8595bd3254a89becb1a125dc8aac5955512f216 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 2 Jul 2026 09:39:21 -0400
Subject: [PATCH 055/100] autosuspend: add adamcstephens to maintainers

---
 nixos/modules/services/misc/autosuspend.nix | 5 ++++-
 pkgs/by-name/au/autosuspend/package.nix     | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/autosuspend.nix b/nixos/modules/services/misc/autosuspend.nix
index 8ac8ce96be31..29380a35347f 100644
--- a/nixos/modules/services/misc/autosuspend.nix
+++ b/nixos/modules/services/misc/autosuspend.nix
@@ -246,6 +246,9 @@ in
   };
 
   meta = {
-    maintainers = with maintainers; [ xlambein ];
+    maintainers = with maintainers; [
+      xlambein
+      adamcstephens
+    ];
   };
 }
diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix
index b9b487b9cf01..12f264b4f860 100644
--- a/pkgs/by-name/au/autosuspend/package.nix
+++ b/pkgs/by-name/au/autosuspend/package.nix
@@ -100,6 +100,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     maintainers = with lib.maintainers; [
       bzizou
       anthonyroussel
+      adamcstephens
     ];
     mainProgram = "autosuspend";
     platforms = lib.platforms.linux;

From ae1ab2b890ed3fe2119d70d70ab34c6c5255789f Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 2 Jul 2026 09:56:41 -0400
Subject: [PATCH 056/100] node-red: 5.0.0 -> 5.0.1

Changelog: https://github.com/node-red/node-red/blob/5.0.1/CHANGELOG.md
---
 pkgs/by-name/no/node-red/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/no/node-red/package.nix b/pkgs/by-name/no/node-red/package.nix
index 12a368265b5b..0ba8a6735936 100644
--- a/pkgs/by-name/no/node-red/package.nix
+++ b/pkgs/by-name/no/node-red/package.nix
@@ -9,16 +9,16 @@
 
 buildNpmPackage rec {
   pname = "node-red";
-  version = "5.0.0";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "node-red";
     repo = "node-red";
     tag = version;
-    hash = "sha256-CKYIlBTZsnkgbhWs1Bg04r8JIubCmVgDEUbvCXvaNck=";
+    hash = "sha256-OVIlooa1JlkSfX1VC5J9GFxrMGsEmDFZ9BTOXUAClNQ=";
   };
 
-  npmDepsHash = "sha256-bm9C2MWV3BlyxXrBBy/ZyGkWSyh1w9b8/IJI1W74O00=";
+  npmDepsHash = "sha256-3dsnxLSa5Rz+AjL+c2olyXYyALupgjJp58puagZ4NHg=";
 
   postPatch =
     let

From 8a8831a1bfc9f1f8d7605e2043f44b98e37c40fa Mon Sep 17 00:00:00 2001
From: "Burfeind, Jan-Niklas" <jan-niklas.burfeind@sennheiser.com>
Date: Thu, 2 Jul 2026 15:56:57 +0200
Subject: [PATCH 057/100] enscript: Modernize package

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

diff --git a/pkgs/by-name/en/enscript/package.nix b/pkgs/by-name/en/enscript/package.nix
index 2ef594bf8e3f..8ff18c3e8f07 100644
--- a/pkgs/by-name/en/enscript/package.nix
+++ b/pkgs/by-name/en/enscript/package.nix
@@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   meta = {
     description = "Converter from ASCII to PostScript, HTML, or RTF";
 

From 5fd02eef582521a7d45c8c13b29702a2f47b7357 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 2 Jul 2026 09:58:49 -0400
Subject: [PATCH 058/100] node-red: add adamcstephens as maintainer

---
 pkgs/by-name/no/node-red/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/no/node-red/package.nix b/pkgs/by-name/no/node-red/package.nix
index 0ba8a6735936..8d18811ae6c6 100644
--- a/pkgs/by-name/no/node-red/package.nix
+++ b/pkgs/by-name/no/node-red/package.nix
@@ -44,6 +44,9 @@ buildNpmPackage rec {
     homepage = "https://nodered.org/";
     license = lib.licenses.asl20;
     mainProgram = "node-red";
-    maintainers = with lib.maintainers; [ matthewcroughan ];
+    maintainers = with lib.maintainers; [
+      adamcstephens
+      matthewcroughan
+    ];
   };
 }

From dbc7e7e673f48f8053d265dd09da87e31a500e81 Mon Sep 17 00:00:00 2001
From: "Burfeind, Jan-Niklas" <jan-niklas.burfeind@sennheiser.com>
Date: Thu, 2 Jul 2026 15:57:22 +0200
Subject: [PATCH 059/100] enscript: Adopt by aiyion

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

diff --git a/pkgs/by-name/en/enscript/package.nix b/pkgs/by-name/en/enscript/package.nix
index 8ff18c3e8f07..4520c612c322 100644
--- a/pkgs/by-name/en/enscript/package.nix
+++ b/pkgs/by-name/en/enscript/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     homepage = "https://www.gnu.org/software/enscript/";
 
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ aiyion ];
     platforms = lib.platforms.all;
     mainProgram = "enscript";
   };

From 48c4af4e54127046c7e70306a7240a5a36370b42 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Thu, 2 Jul 2026 14:08:14 +0700
Subject: [PATCH 060/100] python3Packages.showit: modernize

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

diff --git a/pkgs/development/python-modules/showit/default.nix b/pkgs/development/python-modules/showit/default.nix
index 863a524e4d48..5d22ce607c53 100644
--- a/pkgs/development/python-modules/showit/default.nix
+++ b/pkgs/development/python-modules/showit/default.nix
@@ -5,7 +5,7 @@
   setuptools,
   numpy,
   matplotlib,
-  pytest,
+  pytestCheckHook,
 }:
 
 buildPythonPackage {
@@ -13,11 +13,13 @@ buildPythonPackage {
   version = "1.1.4";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "freeman-lab";
     repo = "showit";
     rev = "ef76425797c71fbe3795b4302c49ab5be6b0bacb"; # no tags in repo
-    sha256 = "0xd8isrlwwxlgji90lly1sq4l2a37rqvhsmyhv7bd3aj1dyjmdr6";
+    hash = "sha256-JrcqfQtSjbbOhr5quHE+QwlKsA6eUpCifLRzTrOOqHU=";
   };
 
   build-system = [ setuptools ];
@@ -27,11 +29,9 @@ buildPythonPackage {
     matplotlib
   ];
 
-  nativeCheckInputs = [ pytest ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
-  checkPhase = ''
-    pytest test
-  '';
+  pythonImportsCheck = [ "showit" ];
 
   meta = {
     description = "Simple and sensible display of images";

From d98fb29ac6cc823dd997dc2e7b2bd60acbf5f79b Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 2 Jul 2026 10:09:42 -0400
Subject: [PATCH 061/100] pi-coding-agent: 0.80.2 -> 0.80.3

Changelog: https://github.com/earendil-works/pi/blob/main/packages/coding-agent/CHANGELOG.md
---
 pkgs/by-name/pi/pi-coding-agent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix
index 351efea2e9f7..f103318e24d8 100644
--- a/pkgs/by-name/pi/pi-coding-agent/package.nix
+++ b/pkgs/by-name/pi/pi-coding-agent/package.nix
@@ -12,16 +12,16 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "pi-coding-agent";
-  version = "0.80.2";
+  version = "0.80.3";
 
   src = fetchFromGitHub {
     owner = "earendil-works";
     repo = "pi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aKtgPc3rwHEp856jP3N7nImph0CSG+gsWq9OVci3hmE=";
+    hash = "sha256-wQTrWKsb2HCGwzSAFEk8NWSDpqxSY/lv1/R6ghcmbaA=";
   };
 
-  npmDepsHash = "sha256-1EGs8lX8XoAnRtS+pw4lBRm24U/vtVB2loVRmZyd4Z8=";
+  npmDepsHash = "sha256-geh8LH88OZybFXkR/jDeTdew6TNMdFM6jhCSYKn//dU=";
 
   npmWorkspace = "packages/coding-agent";
 

From 048bc6317223bf51f16f594be422a58548a223d9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jul 2026 14:06:59 +0000
Subject: [PATCH 062/100] python3Packages.executorch: drop torchtune from test
 dependencies

---
 .../python-modules/executorch/default.nix            | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/executorch/default.nix b/pkgs/development/python-modules/executorch/default.nix
index aa3ec5c2ea43..2e1ff5ab5194 100644
--- a/pkgs/development/python-modules/executorch/default.nix
+++ b/pkgs/development/python-modules/executorch/default.nix
@@ -44,7 +44,6 @@
   pytest-rerunfailures,
   pytestCheckHook,
   torchaudio,
-  torchtune,
   transformers,
   writableTmpDirAsHomeHook,
   yaspin,
@@ -192,7 +191,6 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
     pytest-rerunfailures
     pytestCheckHook
     torchaudio
-    torchtune
     transformers
     writableTmpDirAsHomeHook
     yaspin
@@ -205,6 +203,16 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
 
     # Try to download models from HuggingFace hub
     "extension/llm/tokenizers/test/test_hf_tokenizer.py"
+
+    # Required unmaintained and removed `torchtune`
+    "examples/models/llama3_2_vision/preprocess/test_preprocess.py"
+    "examples/models/llama3_2_vision/text_decoder/test/test_text_decoder.py"
+    "examples/models/llama3_2_vision/vision_encoder/test/test_vision_encoder.py"
+    "exir/tests/test_memory_format_ops_pass.py"
+    "extension/llm/modules/test/test_attention.py"
+    "extension/llm/modules/test/test_kv_cache.py"
+    "extension/llm/modules/test/test_position_embeddings.py"
+    "extension/llm/modules/test/test_turboquant_kv_cache.py"
   ];
 
   disabledTests = [

From 58e6eeaaefd1d8007d512c479c2093ba1e9790be Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jul 2026 14:07:15 +0000
Subject: [PATCH 063/100] python3Packages.torchtune: drop (unmaintained)

https://github.com/meta-pytorch/torchtune/commit/bd2a0fc7c31430972728494fa01aaeeb0ebf1ba1
---
 .../python-modules/torchtune/default.nix      | 229 ------------------
 .../rocm-modules/release-attrPaths.json       |   1 -
 pkgs/top-level/python-aliases.nix             |   1 +
 pkgs/top-level/python-packages.nix            |   2 -
 4 files changed, 1 insertion(+), 232 deletions(-)
 delete mode 100644 pkgs/development/python-modules/torchtune/default.nix

diff --git a/pkgs/development/python-modules/torchtune/default.nix b/pkgs/development/python-modules/torchtune/default.nix
deleted file mode 100644
index b6ec79556151..000000000000
--- a/pkgs/development/python-modules/torchtune/default.nix
+++ /dev/null
@@ -1,229 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  setuptools,
-
-  # dependencies
-  blobfile,
-  datasets,
-  huggingface-hub,
-  kagglehub,
-  numpy,
-  omegaconf,
-  pillow,
-  psutil,
-  safetensors,
-  sentencepiece,
-  tiktoken,
-  tokenizers,
-  torch,
-  torchdata,
-  tqdm,
-  torchao,
-  torchvision,
-
-  # tests
-  comet-ml,
-  expecttest,
-  mlflow,
-  pytest-integration,
-  pytest-mock,
-  pytestCheckHook,
-  tensorboard,
-  writableTmpDirAsHomeHook,
-
-  # passthru
-  nix-update-script,
-}:
-
-buildPythonPackage (finalAttrs: {
-  pname = "torchtune";
-  version = "0.6.1-unstable-2026-04-23";
-  pyproject = true;
-  __structuredAttrs = true;
-
-  src = fetchFromGitHub {
-    owner = "meta-pytorch";
-    repo = "torchtune";
-    rev = "bd2a0fc7c31430972728494fa01aaeeb0ebf1ba1";
-    hash = "sha256-6jE8+ZCm46qyoSOCkBjxsXNvtVEOUP6v3NEmMh+ocl8=";
-  };
-
-  postPatch = ''
-    substituteInPlace \
-      tests/torchtune/modules/low_precision/test_nf4_dispatch_registration.py \
-      torchtune/modules/low_precision/_register_nf4_dispatch_ops.py \
-      torchtune/modules/low_precision/nf4_linear.py \
-      torchtune/modules/peft/dora.py \
-      torchtune/modules/peft/lora.py \
-      --replace-fail \
-        "from torchao.quantization import to_nf4" \
-        "from torchao.dtypes import to_nf4" \
-
-    substituteInPlace \
-      tests/torchtune/models/llama2/test_lora_llama2.py \
-      tests/torchtune/models/phi3/test_lora_phi3.py \
-      tests/torchtune/modules/low_precision/test_nf4_linear.py \
-      tests/torchtune/training/test_distributed.py \
-      torchtune/modules/common_utils.py \
-      torchtune/training/_activation_offloading.py \
-      --replace-fail \
-        "from torchao.quantization import NF4Tensor" \
-        "from torchao.dtypes.nf4tensor import NF4Tensor"
-
-    substituteInPlace \
-      tests/torchtune/modules/peft/test_dora.py \
-      tests/torchtune/modules/peft/test_lora.py \
-      torchtune/training/_distributed.py \
-      --replace-fail \
-        "from torchao.quantization import NF4Tensor, to_nf4" \
-        "from torchao.dtypes.nf4tensor import NF4Tensor, to_nf4"
-
-    substituteInPlace \
-      torchtune/modules/low_precision/nf4_linear.py \
-      torchtune/modules/peft/dora.py \
-      torchtune/modules/peft/lora.py \
-      --replace-fail \
-        "from torchao.quantization.quantize_.workflows.nf4.nf4_tensor import linear_nf4" \
-        "from torchao.dtypes.nf4tensor import linear_nf4"
-
-    substituteInPlace torchtune/modules/low_precision/_register_nf4_dispatch_ops.py \
-      --replace-fail \
-        "from torchao.quantization.quantize_.workflows.nf4.nf4_tensor import implements as nf4_tensor_impl" \
-        "from torchao.dtypes.nf4tensor import implements as nf4_tensor_impl"
-  '';
-
-  build-system = [
-    setuptools
-  ];
-
-  pythonRelaxDeps = [
-    "pyarrow"
-  ];
-  dependencies = [
-    blobfile
-    datasets
-    huggingface-hub
-    kagglehub
-    numpy
-    omegaconf
-    pillow
-    psutil
-    safetensors
-    sentencepiece
-    tiktoken
-    tokenizers
-    torch
-    torchdata
-    tqdm
-
-    # Not explicitly listed as requirements, but effectively imported at runtime
-    torchao
-    torchvision
-  ];
-
-  pythonImportsCheck = [ "torchtune" ];
-
-  nativeCheckInputs = [
-    comet-ml
-    expecttest
-    mlflow
-    pytest-integration
-    pytest-mock
-    pytestCheckHook
-    tensorboard
-    writableTmpDirAsHomeHook
-  ];
-
-  # Exclude `regression` which depends on a specific llama model and `recipies` which are sample code
-  enabledTestPaths = [ "tests/torchtune" ];
-
-  disabledTests = [
-    # AssertionError (tensors are not equal)
-    "test_stop_tokens"
-    "test_stop_tokens_batched"
-    "test_stop_tokens_batched_uneven_stopping"
-    "test_stop_tokens_batched_uneven_stopping_left_padded"
-
-    # RuntimeError: not allowed to set torch.backends.cudnn flags after disable_global_flags;
-    # please use flags() context manager instead
-    "test_deterministic_false"
-    "test_deterministic_true"
-
-    # TypeError: exceptions must be derived from Warning, not <class 'NoneType'>
-    "test_deprecated"
-
-    # Flaky
-    # AssertionError: (numbers slightly different than expected))
-    "test_forward"
-    "test_forward_kv_cache"
-    "test_forward_with_2d_pos_ids"
-    "test_forward_with_curr_pos"
-    "test_forward_with_packed_pos"
-    "test_local_kv_cache"
-
-    # TypeError: exceptions must be derived from Warning, not <class 'NoneType'>
-    "test_deprecate_parameter"
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
-    # RuntimeError: Error in dlopen:
-    # /tmp/yae2xK/mha/data/aotinductor/model/ckk2zlroqn6hgq5vvpy7bcjikztqmwqkek3njxe2gvvwp244hjny.wrapper.so:
-    # cannot enable executable stack as shared object requires: Invalid argument
-    "test_attention_aoti"
-    "test_tile_positional_embedding_aoti"
-    "test_tiled_token_positional_embedding_aoti"
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-    # Fatal Python error: Segmentation fault
-    "test_forward_gqa"
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # tests/torchtune/training/test_distributed.py
-    "test_init_from_env_no_dup"
-    "test_init_from_env_dup"
-  ];
-
-  disabledTestPaths = [
-    # MLFlowLogger uses the deprecated mlflow filesystem store, which throws an
-    # error since mlflow 3.13. See https://github.com/NixOS/nixpkgs/pull/532943
-    "tests/torchtune/training/test_metric_logging.py::TestMLFlowLogger"
-
-    # TypeError: HfHubHTTPError.__init__() missing 1 required keyword-only argument: 'response'
-    "tests/torchtune/_cli/test_download.py::TestTuneDownloadCommand::test_download_calls_snapshot"
-    "tests/torchtune/_cli/test_download.py::TestTuneDownloadCommand::test_gated_repo_error_no_token"
-    "tests/torchtune/_cli/test_download.py::TestTuneDownloadCommand::test_gated_repo_error_with_token"
-
-    # NameError: name 'TypeVar' is not defined
-    "tests/torchtune/rlhf/loss/test_dpo_loss.py"
-    "tests/torchtune/rlhf/loss/test_ppo_loss.py"
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # fail due to floating-point precision differences
-    "tests/torchtune/models/flux/test_flux_autoencoder.py::TestFluxAutoencoder::test_encode"
-    "tests/torchtune/modules/peft/test_dora.py::TestDoRALinear::test_qdora_parity[True-dtype1]"
-    "tests/torchtune/modules/peft/test_lora.py::TestLoRALinear::test_qlora_parity[True-dtype1]"
-    "tests/torchtune/modules/test_common_utils.py::TestLocalKVCache::test_local_kv_cache[llama_decoder_model]"
-
-    # hangs
-    "tests/torchtune/utils"
-  ];
-
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version=branch" ];
-  };
-
-  meta = {
-    description = "PyTorch native post-training library";
-    homepage = "https://github.com/meta-pytorch/torchtune";
-    # changelog = "https://github.com/meta-pytorch/torchtune/releases/tag/${finalAttrs.src.tag}";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [
-      GaetanLepage
-      sarahec
-    ];
-  };
-})
diff --git a/pkgs/development/rocm-modules/release-attrPaths.json b/pkgs/development/rocm-modules/release-attrPaths.json
index dfa15e06096a..e57aa6df25b8 100644
--- a/pkgs/development/rocm-modules/release-attrPaths.json
+++ b/pkgs/development/rocm-modules/release-attrPaths.json
@@ -561,7 +561,6 @@
     "python3Packages.torchsummary",
     "python3Packages.torchtitan",
     "python3Packages.torchtnt",
-    "python3Packages.torchtune",
     "python3Packages.torchvision",
     "python3Packages.tracerite",
     "python3Packages.trainer",
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 46fca33385ef..4e45cd9f244a 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -632,6 +632,7 @@ mapAliases {
   threadpool = throw "'threadpool' has been removed, since it is obsolete"; # Added 2026-01-09
   tikzplotlib = throw "tikzplotlib was removed because it is incompatible with recent versions of matplotlib and webcolors"; # added 2025-11-11
   torchtnt-nightly = throw "'torchtnt-nightly' was only needed as a test dependency for 'torcheval', but these tests are no longer run"; # added 2025-11-12
+  torchtrune = throw "'torchtune' weas removed because it is unmaintained"; # added 2026-07-02
   torrent_parser = throw "'torrent_parser' has been renamed to/replaced by 'torrent-parser'"; # Converted to throw 2025-10-29
   tracing = throw "'tracing' has been removed because its source code has been removed"; # Added 2025-12-17
   treeo = throw "treeo has been removed because it has been marked as broken since 2023."; # Added 2025-10-11
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ea463c91d272..8085f85f449f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20183,8 +20183,6 @@ self: super: with self; {
 
   torchtnt = callPackage ../development/python-modules/torchtnt { };
 
-  torchtune = callPackage ../development/python-modules/torchtune { };
-
   torchvision = callPackage ../development/python-modules/torchvision { };
 
   torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { };

From 162a408ae91ab0b7004b299bd3f651f4b7e611fa Mon Sep 17 00:00:00 2001
From: Tyce Herrman <Tyce.Herrman@pm.me>
Date: Thu, 2 Jul 2026 10:32:52 -0400
Subject: [PATCH 064/100] maintainers: add tyceherrman

Assisted-by: OpenAI Codex (GPT-5)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9793aafd94f5..f4175a18c31c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28847,6 +28847,12 @@
     github = "TyberiusPrime";
     githubId = 1257580;
   };
+  tyceherrman = {
+    email = "Tyce.Herrman@pm.me";
+    github = "TyceHerrman";
+    githubId = 22066434;
+    name = "Tyce Herrman";
+  };
   tye-exe = {
     name = "Tye";
     email = "nixpkgs-fr@tye-home.xyz";

From 00f9c93035a8929680df336d0dd128396644d483 Mon Sep 17 00:00:00 2001
From: Tyce Herrman <Tyce.Herrman@pm.me>
Date: Thu, 2 Jul 2026 10:33:03 -0400
Subject: [PATCH 065/100] oxvg: init at 0.0.5

Assisted-by: OpenAI Codex (GPT-5)
---
 pkgs/by-name/ox/oxvg/package.nix | 33 ++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 pkgs/by-name/ox/oxvg/package.nix

diff --git a/pkgs/by-name/ox/oxvg/package.nix b/pkgs/by-name/ox/oxvg/package.nix
new file mode 100644
index 000000000000..b3b9a54df0cc
--- /dev/null
+++ b/pkgs/by-name/ox/oxvg/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  fetchCrate,
+  nix-update-script,
+  rustPlatform,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "oxvg";
+  version = "0.0.5";
+  __structuredAttrs = true;
+
+  src = fetchCrate {
+    inherit (finalAttrs) pname version;
+    hash = "sha256-I52L0cbj7BYdHVVhJEdhT28DRTg/f7eWpN0qGxfSdhQ=";
+  };
+
+  cargoHash = "sha256-+dfM2/SjUTwNAoKC7cjw2Ba1RNp6BwmbR1TxXtp9W4E=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Vector image toolchain";
+    homepage = "https://github.com/noahbald/oxvg";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tyceherrman ];
+    mainProgram = "oxvg";
+  };
+})

From 02709853357944fea7679fd27cf46ee149a766f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 14:58:34 +0000
Subject: [PATCH 066/100] fastdds: 3.6.1 -> 3.6.2

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

diff --git a/pkgs/by-name/fa/fastdds/package.nix b/pkgs/by-name/fa/fastdds/package.nix
index d441c4cc9a12..8c6e351de170 100644
--- a/pkgs/by-name/fa/fastdds/package.nix
+++ b/pkgs/by-name/fa/fastdds/package.nix
@@ -15,14 +15,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastdds";
-  version = "3.6.1";
+  version = "3.6.2";
 
   src = fetchFromGitHub {
     owner = "eProsima";
     repo = "Fast-DDS";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-C9MKfQJ+8XsiSIYaB43j6xmoIyRH7h7sgEyzj1gml/8=";
+    hash = "sha256-17AxZwYPBhl+AyehWvNYP/if124GcmNfWJOD/yB+tgk=";
   };
 
   nativeBuildInputs = [

From 04bb933edfd72b0acf7a92364e08a33e5a82e758 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 15:10:11 +0000
Subject: [PATCH 067/100] python3Packages.pyannote-audio: 4.0.5 -> 4.0.7

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

diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix
index 28ea6c86ced6..1c407c1e4d3b 100644
--- a/pkgs/development/python-modules/pyannote-audio/default.nix
+++ b/pkgs/development/python-modules/pyannote-audio/default.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyannote-audio";
-  version = "4.0.5";
+  version = "4.0.7";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -53,7 +53,7 @@ buildPythonPackage (finalAttrs: {
     repo = "pyannote-audio";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-Wz4sJZhcc4KSwn6WeAZVDdOFL2Nc19BhoRovw8CwR38=";
+    hash = "sha256-SCByRbQ3WD4QmumrZp83nKJ52VQVoiKYFN9l9oDYqzs=";
   };
 
   build-system = [

From 45ce10c079831fa3fbdc68cd79a59aa54b1d998a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 15:40:57 +0000
Subject: [PATCH 068/100] psysh: 0.12.23 -> 0.12.24

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

diff --git a/pkgs/by-name/ps/psysh/package.nix b/pkgs/by-name/ps/psysh/package.nix
index 92baaaa1ebae..d8bc6f22820d 100644
--- a/pkgs/by-name/ps/psysh/package.nix
+++ b/pkgs/by-name/ps/psysh/package.nix
@@ -6,13 +6,13 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
   pname = "psysh";
-  version = "0.12.23";
+  version = "0.12.24";
 
   src = fetchFromGitHub {
     owner = "bobthecow";
     repo = "psysh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9vc0gmALM/0npHVa2cxGbc/kuiyd691qX+4XVcSFepY=";
+    hash = "sha256-UajpFQD0M6bpOXPgHl15/QvqcSrwVD6i9i8zc5qNk0k=";
     forceFetchGit = true;
     postFetch = ''
       cp $out/build/composer.json $out/
@@ -20,7 +20,7 @@ php.buildComposerProject2 (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-vCPkyOHz/IwzKNWzCP/ceVJS3VGd/KJgVzcwfObhigI=";
+  vendorHash = "sha256-2lALLfk3TNkF2QIlswIYcGp1sEYWdqQpSeuvyTBKsfE=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From bfe091d105fdb4f95cbeda4a26521615c6c45642 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Thu, 2 Jul 2026 11:02:43 -0500
Subject: [PATCH 069/100] hyprland: Enable separateDebugInfo

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

diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix
index 3171d7b726d6..d7034ce9cb8e 100644
--- a/pkgs/by-name/hy/hyprland/package.nix
+++ b/pkgs/by-name/hy/hyprland/package.nix
@@ -185,6 +185,7 @@ customStdenv.mkDerivation (finalAttrs: {
   cmakeBuildType = if debug then "Debug" else "RelWithDebInfo";
 
   dontStrip = debug;
+  separateDebugInfo = !debug;
   strictDeps = true;
 
   cmakeFlags = mapAttrsToList cmakeBool {

From d0ebef36dba75768f81edd10fde3116265d08cd0 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Thu, 2 Jul 2026 11:03:04 -0500
Subject: [PATCH 070/100] aquamarine: Enable separateDebugInfo

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

diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix
index 85cf20cc708b..da592a7b4325 100644
--- a/pkgs/by-name/aq/aquamarine/package.nix
+++ b/pkgs/by-name/aq/aquamarine/package.nix
@@ -63,6 +63,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeBuildType = "RelWithDebInfo";
+  separateDebugInfo = true;
 
   passthru.updateScript = nix-update-script { };
 

From 8df445308194ca6a3a978709184df030cbb41474 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Thu, 2 Jul 2026 11:03:49 -0500
Subject: [PATCH 071/100] hyprutils: Enable separateDebugInfo

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

diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix
index 99329345a7b8..f3556668cf4b 100644
--- a/pkgs/by-name/hy/hyprutils/package.nix
+++ b/pkgs/by-name/hy/hyprutils/package.nix
@@ -34,6 +34,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeBuildType = "RelWithDebInfo";
+  separateDebugInfo = true;
 
   passthru.updateScript = nix-update-script { };
 

From 05f71f7de4f48871f3845733a8d558fe08fe6805 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Thu, 2 Jul 2026 11:03:49 -0500
Subject: [PATCH 072/100] hyprcursor: Enable separateDebugInfo

---
 pkgs/by-name/hy/hyprcursor/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/hy/hyprcursor/package.nix b/pkgs/by-name/hy/hyprcursor/package.nix
index a0dca3c3415b..e5d88a861a59 100644
--- a/pkgs/by-name/hy/hyprcursor/package.nix
+++ b/pkgs/by-name/hy/hyprcursor/package.nix
@@ -43,6 +43,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
     "lib"
   ];
 
+  cmakeBuildType = "RelWithDebInfo";
+  separateDebugInfo = true;
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From fb1ea5c439c943d8561b25293a75c298bc73fc9d Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Thu, 2 Jul 2026 11:03:50 -0500
Subject: [PATCH 073/100] hyprgraphics: Enable separateDebugInfo

---
 pkgs/by-name/hy/hyprgraphics/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix
index 3ef60dbbd679..f86e13d8b3fb 100644
--- a/pkgs/by-name/hy/hyprgraphics/package.nix
+++ b/pkgs/by-name/hy/hyprgraphics/package.nix
@@ -59,6 +59,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
+  cmakeBuildType = "RelWithDebInfo";
+  separateDebugInfo = true;
+
   passthru = {
     updateScript = nix-update-script { };
   };

From 2baaf742c5937818e96dd8531bfd9844cf55f681 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Thu, 2 Jul 2026 11:03:50 -0500
Subject: [PATCH 074/100] hyprland-qtutils: Enable separateDebugInfo

---
 pkgs/by-name/hy/hyprland-qtutils/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/hy/hyprland-qtutils/package.nix b/pkgs/by-name/hy/hyprland-qtutils/package.nix
index 59242eeb582b..d4dc6b4bb4db 100644
--- a/pkgs/by-name/hy/hyprland-qtutils/package.nix
+++ b/pkgs/by-name/hy/hyprland-qtutils/package.nix
@@ -51,6 +51,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
     qtWrapperArgs+=(--prefix PATH : "${makeBinPath [ pciutils ]}")
   '';
 
+  cmakeBuildType = "RelWithDebInfo";
+  separateDebugInfo = true;
+
   meta = {
     description = "Hyprland QT/qml utility apps";
     homepage = "https://github.com/hyprwm/hyprland-qtutils";

From 335e15a79cad4617e78047d37116348c23518e71 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Thu, 2 Jul 2026 11:03:50 -0500
Subject: [PATCH 075/100] hyprlang: Enable separateDebugInfo

---
 pkgs/by-name/hy/hyprlang/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix
index 54ba47a80171..86aaf9d5cc68 100644
--- a/pkgs/by-name/hy/hyprlang/package.nix
+++ b/pkgs/by-name/hy/hyprlang/package.nix
@@ -34,6 +34,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
+  cmakeBuildType = "RelWithDebInfo";
+  separateDebugInfo = true;
+
   meta = {
     homepage = "https://github.com/hyprwm/hyprlang";
     description = "Official implementation library for the hypr config language";

From c74c7bf9e49db3d9ef948fce50a3a4c37c2ed4f4 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Thu, 2 Jul 2026 11:03:51 -0500
Subject: [PATCH 076/100] hyprlock: Enable separateDebugInfo

---
 pkgs/by-name/hy/hyprlock/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix
index a61f6f439476..f8d8ec9e07cc 100644
--- a/pkgs/by-name/hy/hyprlock/package.nix
+++ b/pkgs/by-name/hy/hyprlock/package.nix
@@ -72,6 +72,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
     ln -s $out/share/hypr/hyprlock.conf $out/etc/xdg/hypr/hyprlock.conf
   '';
 
+  cmakeBuildType = "RelWithDebInfo";
+  separateDebugInfo = true;
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 3be1d06f6d7f0a5dec618f98384f08430a968ee3 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Thu, 2 Jul 2026 11:03:51 -0500
Subject: [PATCH 077/100] hyprwire: Enable separateDebugInfo

---
 pkgs/by-name/hy/hyprwire/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/hy/hyprwire/package.nix b/pkgs/by-name/hy/hyprwire/package.nix
index 917ec60083d6..c90a2f0c1e62 100644
--- a/pkgs/by-name/hy/hyprwire/package.nix
+++ b/pkgs/by-name/hy/hyprwire/package.nix
@@ -31,6 +31,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
     pugixml
   ];
 
+  cmakeBuildType = "RelWithDebInfo";
+  separateDebugInfo = true;
+
   meta = {
     inherit (finalAttrs.src.meta) homepage;
     description = "A fast and consistent wire protocol for IPC ";

From dec8c3ab78b4c4e9449a0301a783e50a12238397 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Thu, 2 Jul 2026 17:11:10 +0200
Subject: [PATCH 078/100] lux-cli: 0.33.3 -> 0.35.0

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

diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix
index dbdd23cfebca..c3c4bc014f3a 100644
--- a/pkgs/by-name/lu/lux-cli/package.nix
+++ b/pkgs/by-name/lu/lux-cli/package.nix
@@ -18,18 +18,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lux-cli";
 
-  version = "0.33.3";
+  version = "0.35.0";
 
   src = fetchFromGitHub {
     owner = "lumen-oss";
     repo = "lux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-N6BnLRI4I9PvpjSmtadtCdn5BLQIc4lsZXs9w3UQxu0=";
+    hash = "sha256-CHLtA9K7w10G1OM3PaXDRiYCB94OpE27lLbHD45IWRQ=";
   };
 
   buildAndTestSubdir = "lux-cli";
 
-  cargoHash = "sha256-m9vl624Vkpu0bJUtHEaEKYwdQAVJJ088X7l69C6kcP0=";
+  cargoHash = "sha256-FzprOAtLv3zak7qnmpB/r6MGVtU5x5hyjpUFVUQccvA=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From cffd6449c85b3b0b8b4c338749f0c4f79aaba2cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 17:20:44 +0000
Subject: [PATCH 079/100] vscode-extensions.github.codespaces: 1.18.13 ->
 1.18.14

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 7feb84d3a0be..28283ec4725f 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1950,8 +1950,8 @@ let
         mktplcRef = {
           publisher = "github";
           name = "codespaces";
-          version = "1.18.13";
-          hash = "sha256-tvs35GA3bZ4jExiAe0NeHx/vQV/+2zio2Q0813/MAMU=";
+          version = "1.18.14";
+          hash = "sha256-i/J5inu6iJ3CPgoBf+pMFuM33Ex/0KqhfzfRl/BIe7Y=";
         };
 
         meta = {

From 8ab40bfc59d08686666524b3ea89129e5e31f1e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 17:34:52 +0000
Subject: [PATCH 080/100] terraform-providers.hashicorp_google: 7.37.0 ->
 7.39.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a5b7e0386ac7..29b4d81234c6 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -580,13 +580,13 @@
     "vendorHash": "sha256-sPQR+LDZRMXygLUd9xj6/bI+8DhAPKbkytlTzmrEOBU="
   },
   "hashicorp_google": {
-    "hash": "sha256-/O0K2qf1kk8kfRl/FQ3eNAs96Z7Te4yg6boVHdYtLJo=",
+    "hash": "sha256-TQFMOZZbMabLfTDPON1OMd+DgyssfprzqMbc9/u7cbQ=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google",
     "owner": "hashicorp",
     "repo": "terraform-provider-google",
-    "rev": "v7.37.0",
+    "rev": "v7.39.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Ub+Dvddw5jcSy2hR72OSsy4EgHphhCW1kekPyrQGc9E="
+    "vendorHash": "sha256-ayt8FR4684ZV5kd6exMw0AEgkMJLW5huvTYZqcr3q/s="
   },
   "hashicorp_google-beta": {
     "hash": "sha256-LbNsD7R+TP9trNaMZq+OTyGlQPR6EZoSdUx3uo+3xUo=",

From cb300c3c71cfbaa3ce4df26f01d9cace9773c31c Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Thu, 2 Jul 2026 19:47:08 +0200
Subject: [PATCH 081/100] treewide: follow some GitHub redirects for
 `fetchFromGitHub`

generated using https://git.kybe.xyz/2kybe3/nixpkgs-github-redirect

continuation of: #526007
---
 pkgs/by-name/au/aube/package.nix                     | 6 +++---
 pkgs/by-name/bu/burn-central-cli/package.nix         | 6 +++---
 pkgs/by-name/cc/ccusage/package.nix                  | 6 +++---
 pkgs/by-name/ce/cel-go/package.nix                   | 8 ++++----
 pkgs/by-name/cj/cjose/package.nix                    | 6 +++---
 pkgs/by-name/cl/clarity-city/package.nix             | 4 ++--
 pkgs/by-name/cl/classicube/package.nix               | 2 +-
 pkgs/by-name/cl/clematis/package.nix                 | 4 ++--
 pkgs/by-name/cn/cnquery/package.nix                  | 4 ++--
 pkgs/by-name/co/cocogitto/package.nix                | 2 +-
 pkgs/by-name/co/cointop/package.nix                  | 2 +-
 pkgs/by-name/co/construct/package.nix                | 4 ++--
 pkgs/by-name/co/cortex-tools/package.nix             | 8 ++++----
 pkgs/by-name/co/cosmic-applibrary/package.nix        | 4 ++--
 pkgs/by-name/co/coze/package.nix                     | 4 ++--
 pkgs/by-name/cp/cpuset/package.nix                   | 2 +-
 pkgs/by-name/cr/credhub-cli/package.nix              | 4 ++--
 pkgs/by-name/cr/crlfsuite/package.nix                | 4 ++--
 pkgs/by-name/ct/ctodo/package.nix                    | 2 +-
 pkgs/by-name/cu/cuetsy/package.nix                   | 4 ++--
 pkgs/by-name/cu/cups-printers/package.nix            | 2 +-
 pkgs/by-name/da/dapper/package.nix                   | 4 ++--
 pkgs/by-name/dd/ddosify/package.nix                  | 6 +++---
 pkgs/by-name/de/dehydrated/package.nix               | 2 +-
 pkgs/by-name/de/desmume/package.nix                  | 4 ++--
 pkgs/by-name/di/digitalbitbox/package.nix            | 2 +-
 pkgs/by-name/di/discord-rpc/package.nix              | 4 ++--
 pkgs/by-name/di/discord-sh/package.nix               | 4 ++--
 pkgs/by-name/di/disktui/package.nix                  | 4 ++--
 pkgs/by-name/dj/djlint/package.nix                   | 4 ++--
 pkgs/by-name/dj/djv/package.nix                      | 2 +-
 pkgs/by-name/dm/dmrconfig/package.nix                | 4 ++--
 pkgs/by-name/do/dogedns/package.nix                  | 4 ++--
 pkgs/by-name/do/doom-bcc/package.nix                 | 4 ++--
 pkgs/by-name/dr/dracut/package.nix                   | 2 +-
 pkgs/by-name/dr/droidcam/package.nix                 | 6 +++---
 pkgs/by-name/dr/drone/package.nix                    | 4 ++--
 pkgs/development/python-modules/deepdiff/default.nix | 6 +++---
 pkgs/development/python-modules/dodgy/default.nix    | 4 ++--
 pkgs/development/python-modules/dvc/default.nix      | 4 ++--
 40 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/pkgs/by-name/au/aube/package.nix b/pkgs/by-name/au/aube/package.nix
index 5a0aae0299f2..4a27586e5777 100644
--- a/pkgs/by-name/au/aube/package.nix
+++ b/pkgs/by-name/au/aube/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "1.9.1";
 
   src = fetchFromGitHub {
-    owner = "endevco";
+    owner = "jdx";
     repo = "aube";
     tag = "v${finalAttrs.version}";
     hash = "sha256-uwOEou6DH+bePNupYKmTc82xQV9T08bDmSPG9RU9yBk=";
@@ -40,8 +40,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Fast Node.js package manager";
-    homepage = "https://github.com/endevco/aube";
-    changelog = "https://github.com/endevco/aube/blob/v${finalAttrs.version}/CHANGELOG.md";
+    homepage = "https://github.com/jdx/aube";
+    changelog = "https://github.com/jdx/aube/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ chillcicada ];
     mainProgram = "aube";
diff --git a/pkgs/by-name/bu/burn-central-cli/package.nix b/pkgs/by-name/bu/burn-central-cli/package.nix
index 0d0f2dc810f7..03cf302a4dfa 100644
--- a/pkgs/by-name/bu/burn-central-cli/package.nix
+++ b/pkgs/by-name/bu/burn-central-cli/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "tracel-ai";
-    repo = "burn-central-cli";
+    repo = "tracel-cli";
     tag = "v${finalAttrs.version}";
     hash = "sha256-1QXlN1cq5MKZAPgGx5mnf8Jy7o4CnKJDKi0sSith6n0=";
   };
@@ -45,8 +45,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       with Burn Central, the centralized platform for experiment tracking,
       model sharing, and deployment for Burn users.
     '';
-    homepage = "https://github.com/tracel-ai/burn-central-cli";
-    changelog = "https://github.com/tracel-ai/burn-central-cli/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/tracel-ai/tracel-cli";
+    changelog = "https://github.com/tracel-ai/tracel-cli/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [
       mit
       asl20
diff --git a/pkgs/by-name/cc/ccusage/package.nix b/pkgs/by-name/cc/ccusage/package.nix
index 4f2f8c24ef6c..cad32ecb86ea 100644
--- a/pkgs/by-name/cc/ccusage/package.nix
+++ b/pkgs/by-name/cc/ccusage/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "20.0.6";
 
   src = fetchFromGitHub {
-    owner = "ryoppippi";
+    owner = "ccusage";
     repo = "ccusage";
     tag = "v${finalAttrs.version}";
     hash = "sha256-uf/FlPprxx4jh74YwjmYMtoIHpTkKrWTLetbNoYiFv4=";
@@ -98,8 +98,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Analyze coding agent CLI token usage and costs from local data";
-    homepage = "https://github.com/ryoppippi/ccusage";
-    changelog = "https://github.com/ryoppippi/ccusage/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/ccusage/ccusage";
+    changelog = "https://github.com/ccusage/ccusage/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ thrix ];
     mainProgram = "ccusage";
diff --git a/pkgs/by-name/ce/cel-go/package.nix b/pkgs/by-name/ce/cel-go/package.nix
index 2b0c3085dd31..5d944d2d3b64 100644
--- a/pkgs/by-name/ce/cel-go/package.nix
+++ b/pkgs/by-name/ce/cel-go/package.nix
@@ -9,7 +9,7 @@ let
     version = "0.25.2";
 
     src = fetchFromGitHub {
-      owner = "google";
+      owner = "cel-expr";
       repo = "cel-spec";
       tag = "v${finalAttrs.version}";
       hash = "sha256-aNyBGUlpTqILCiQHo7BxaZShI6q9xgtRegywd+jQSlo=";
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
   version = "0.28.1";
 
   src = fetchFromGitHub {
-    owner = "google";
+    owner = "cel-expr";
     repo = "cel-go";
     tag = "v${finalAttrs.version}";
     hash = "sha256-fiFkoYVKdSdYkSMQxmC1SvEEGsalBasCl9tzsGSYwmw=";
@@ -68,9 +68,9 @@ buildGoModule (finalAttrs: {
   };
 
   meta = {
-    changelog = "https://github.com/google/cel-go/releases/tag/${finalAttrs.src.tag}";
+    changelog = "https://github.com/cel-expr/cel-go/releases/tag/${finalAttrs.src.tag}";
     description = "Fast, portable, non-Turing complete expression evaluation with gradual typing";
-    homepage = "https://github.com/google/cel-go";
+    homepage = "https://github.com/cel-expr/cel-go";
     license = lib.licenses.asl20;
     mainProgram = "cel-go";
     maintainers = with lib.maintainers; [ hythera ];
diff --git a/pkgs/by-name/cj/cjose/package.nix b/pkgs/by-name/cj/cjose/package.nix
index 59ceae11a2de..5b6a65c5a7af 100644
--- a/pkgs/by-name/cj/cjose/package.nix
+++ b/pkgs/by-name/cj/cjose/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "0.6.2.2";
 
   src = fetchFromGitHub {
-    owner = "zmartzone";
+    owner = "OpenIDC";
     repo = "cjose";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-vDvCxMpgCdteGvNxy2HCNRaxbhxOuTadL0nM2wkFHtk=";
@@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    homepage = "https://github.com/zmartzone/cjose";
-    changelog = "https://github.com/zmartzone/cjose/blob/${finalAttrs.version}/CHANGELOG.md";
+    homepage = "https://github.com/OpenIDC/cjose";
+    changelog = "https://github.com/OpenIDC/cjose/blob/${finalAttrs.version}/CHANGELOG.md";
     description = "C library for Javascript Object Signing and Encryption. This is a maintained fork of the original project";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ midchildan ];
diff --git a/pkgs/by-name/cl/clarity-city/package.nix b/pkgs/by-name/cl/clarity-city/package.nix
index f6c8edd2fca4..f6e9975102c4 100644
--- a/pkgs/by-name/cl/clarity-city/package.nix
+++ b/pkgs/by-name/cl/clarity-city/package.nix
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   version = "1.0.0";
 
   src = fetchFromGitHub {
-    owner = "vmware";
+    owner = "vmware-archive";
     repo = "clarity-city";
     rev = "v${finalAttrs.version}";
     hash = "sha256-1POSdd2ICnyNNmGadIujezNK8qvARD0kkLR4yWjs5kA=";
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Open source sans-serif typeface";
-    homepage = "https://github.com/vmware/clarity-city";
+    homepage = "https://github.com/vmware-archive/clarity-city";
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ sagikazarmark ];
diff --git a/pkgs/by-name/cl/classicube/package.nix b/pkgs/by-name/cl/classicube/package.nix
index 8caab86b7259..2c78585488b2 100644
--- a/pkgs/by-name/cl/classicube/package.nix
+++ b/pkgs/by-name/cl/classicube/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.3.8";
 
   src = fetchFromGitHub {
-    owner = "UnknownShadow200";
+    owner = "ClassiCube";
     repo = "ClassiCube";
     tag = finalAttrs.version;
     hash = "sha256-AF4cr3ZXCixwiihS+2ayrzVH5eYShkjlfF0myb2PbHM=";
diff --git a/pkgs/by-name/cl/clematis/package.nix b/pkgs/by-name/cl/clematis/package.nix
index 28632ce71a87..e0f63572cdac 100644
--- a/pkgs/by-name/cl/clematis/package.nix
+++ b/pkgs/by-name/cl/clematis/package.nix
@@ -9,7 +9,7 @@ buildGoModule {
   version = "2022-04-16";
 
   src = fetchFromGitHub {
-    owner = "TorchedSammy";
+    owner = "sammy-ette";
     repo = "clematis";
     rev = "cbe74da084b9d3f6893f53721c27cd0f3a45fe93";
     sha256 = "sha256-TjoXHbY0vUQ2rhwdCJ/s/taRd9/MG0P9HaEw2BOIy/s=";
@@ -19,7 +19,7 @@ buildGoModule {
 
   meta = {
     description = "Discord rich presence for MPRIS music players";
-    homepage = "https://github.com/TorchedSammy/Clematis";
+    homepage = "https://github.com/sammy-ette/clematis";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ misterio77 ];
diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix
index 0c42681763a2..1251430fe788 100644
--- a/pkgs/by-name/cn/cnquery/package.nix
+++ b/pkgs/by-name/cn/cnquery/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "mondoohq";
-    repo = "cnquery";
+    repo = "mql";
     tag = "v${version}";
     hash = "sha256-CTg2jfpCLTYuRx5R+9Si0Ig1NT1ZGXMFbcPPa8CbMKY=";
   };
@@ -32,7 +32,7 @@ buildGoModule rec {
       accounts, Kubernetes, containers, services, VMs, APIs, and more.
     '';
     homepage = "https://mondoo.com/cnquery";
-    changelog = "https://github.com/mondoohq/cnquery/releases/tag/v${version}";
+    changelog = "https://github.com/mondoohq/mql/releases/tag/v${version}";
     license = lib.licenses.bsl11;
     maintainers = with lib.maintainers; [ mariuskimmina ];
   };
diff --git a/pkgs/by-name/co/cocogitto/package.nix b/pkgs/by-name/co/cocogitto/package.nix
index d27f7bfada91..c28b37b44f0d 100644
--- a/pkgs/by-name/co/cocogitto/package.nix
+++ b/pkgs/by-name/co/cocogitto/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "7.0.0";
 
   src = fetchFromGitHub {
-    owner = "oknozor";
+    owner = "cocogitto";
     repo = "cocogitto";
     tag = finalAttrs.version;
     hash = "sha256-Z+SXB6bDxyR+Bt3Pz6uF9+sZLjbiFNYeECVFZbx40h8=";
diff --git a/pkgs/by-name/co/cointop/package.nix b/pkgs/by-name/co/cointop/package.nix
index 243819c06b76..c0078b7bc622 100644
--- a/pkgs/by-name/co/cointop/package.nix
+++ b/pkgs/by-name/co/cointop/package.nix
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
   version = "1.6.10";
 
   src = fetchFromGitHub {
-    owner = "miguelmota";
+    owner = "cointop-sh";
     repo = "cointop";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-NAw1uoBL/FnNLJ86L9aBCOY65aJn1DDGK0Cd0IO2kr0=";
diff --git a/pkgs/by-name/co/construct/package.nix b/pkgs/by-name/co/construct/package.nix
index 90b475994a17..d73419f3ff40 100644
--- a/pkgs/by-name/co/construct/package.nix
+++ b/pkgs/by-name/co/construct/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "0.1.0";
 
   src = fetchFromGitHub {
-    owner = "Thomas-de-Bock";
+    owner = "Thomas-995";
     repo = "construct";
     rev = finalAttrs.version;
     hash = "sha256-ENso0y7yEaXzGXzZOnlZ1L7+j/qayJL+f55/NYLz2ew=";
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Abstraction over x86 NASM Assembly";
     longDescription = "Construct adds features such as while loops, if statements, scoped macros and function-call syntax to NASM Assembly.";
-    homepage = "https://github.com/Thomas-de-Bock/construct";
+    homepage = "https://github.com/Thomas-995/construct";
     maintainers = with lib.maintainers; [ rucadi ];
     platforms = lib.platforms.all;
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/co/cortex-tools/package.nix b/pkgs/by-name/co/cortex-tools/package.nix
index 3578775f00cd..84ae824e5c51 100644
--- a/pkgs/by-name/co/cortex-tools/package.nix
+++ b/pkgs/by-name/co/cortex-tools/package.nix
@@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
   version = "0.11.3";
 
   src = fetchFromGitHub {
-    owner = "grafana";
+    owner = "grafana-cold-storage";
     repo = "cortex-tools";
     tag = "v${finalAttrs.version}";
     hash = "sha256-+GWUC+lnCn5Nw2WytSvW/UsIMmMelCCsnKdBCHuue24=";
@@ -31,7 +31,7 @@ buildGoModule (finalAttrs: {
   env.CGO_ENABLED = 0;
 
   ldflags = [
-    "-X github.com/grafana/cortex-tools/pkg/version.Version=${finalAttrs.src.tag}"
+    "-X github.com/grafana-cold-storage/cortex-tools/pkg/version.Version=${finalAttrs.src.tag}"
     "-s"
     "-w"
   ];
@@ -60,7 +60,7 @@ buildGoModule (finalAttrs: {
   versionCheckProgramArg = "version";
 
   meta = {
-    changelog = "https://github.com/grafana/cortex-tools/releases/tag/${finalAttrs.src.tag}";
+    changelog = "https://github.com/grafana-cold-storage/cortex-tools/releases/tag/${finalAttrs.src.tag}";
     description = "Tools used for interacting with Cortex, a Prometheus-compatible server";
     longDescription = ''
       Tools used for interacting with Cortex, a horizontally scalable, highly available, multi-tenant, long term Prometheus server:
@@ -70,7 +70,7 @@ buildGoModule (finalAttrs: {
       - logtool: Tool which parses Cortex query-frontend logs and formats them for easy analysis.
       - e2ealerting: Tool that helps measure how long an alert takes from scrape of sample to Alertmanager notification delivery.
     '';
-    homepage = "https://github.com/grafana/cortex-tools";
+    homepage = "https://github.com/grafana-cold-storage/cortex-tools";
     license = lib.licenses.asl20;
     platforms = lib.platforms.linux ++ lib.platforms.windows ++ lib.platforms.darwin;
     maintainers = with lib.maintainers; [ videl ];
diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix
index 87e9e75cb8cb..b11295c763e4 100644
--- a/pkgs/by-name/co/cosmic-applibrary/package.nix
+++ b/pkgs/by-name/co/cosmic-applibrary/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
-    repo = "cosmic-applibrary";
+    repo = "cosmic-app-library";
     tag = "epoch-${finalAttrs.version}";
     hash = "sha256-TZncRQer4lXunUwdQ2xDP3DmF5B7UmfhSQvEwVodc98=";
   };
@@ -62,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   meta = {
-    homepage = "https://github.com/pop-os/cosmic-applibrary";
+    homepage = "https://github.com/pop-os/cosmic-app-library";
     description = "Application Template for the COSMIC Desktop Environment";
     license = lib.licenses.gpl3Only;
     teams = [ lib.teams.cosmic ];
diff --git a/pkgs/by-name/co/coze/package.nix b/pkgs/by-name/co/coze/package.nix
index e542ab01e109..07ebefa970c2 100644
--- a/pkgs/by-name/co/coze/package.nix
+++ b/pkgs/by-name/co/coze/package.nix
@@ -10,7 +10,7 @@ buildGoModule (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "Cyphrme";
-    repo = "Coze_cli";
+    repo = "CozeCLI";
     rev = "v${finalAttrs.version}";
     hash = "sha256-/Cznx5Q0a9vVrC4oAoBmAkejT1505AQzzCW/wi3itv4=";
   };
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "CLI client for Coze, a cryptographic JSON messaging specification";
     mainProgram = "coze";
-    homepage = "https://github.com/Cyphrme/coze_cli";
+    homepage = "https://github.com/Cyphrme/CozeCLI";
     license = with lib.licenses; [ bsd3 ];
     maintainers = with lib.maintainers; [ qbit ];
   };
diff --git a/pkgs/by-name/cp/cpuset/package.nix b/pkgs/by-name/cp/cpuset/package.nix
index 723ba6eaeebd..e75d31737568 100644
--- a/pkgs/by-name/cp/cpuset/package.nix
+++ b/pkgs/by-name/cp/cpuset/package.nix
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "lpechacek";
+    owner = "SUSE";
     repo = "cpuset";
     rev = "v${finalAttrs.version}";
     hash = "sha256-fW0SXNI10pb6FTn/2TOqxP9qlys0KL/H9m//NjslUaY=";
diff --git a/pkgs/by-name/cr/credhub-cli/package.nix b/pkgs/by-name/cr/credhub-cli/package.nix
index 5850b41757ce..819049cf63d9 100644
--- a/pkgs/by-name/cr/credhub-cli/package.nix
+++ b/pkgs/by-name/cr/credhub-cli/package.nix
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
   version = "2.9.54";
 
   src = fetchFromGitHub {
-    owner = "cloudfoundry-incubator";
+    owner = "cloudfoundry";
     repo = "credhub-cli";
     rev = finalAttrs.version;
     sha256 = "sha256-qp7Oj207uu2P/Jt9O5tZM0ra9fMx+DfuHPaKr5z+ef0=";
@@ -40,7 +40,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Provides a command line interface to interact with CredHub servers";
-    homepage = "https://github.com/cloudfoundry-incubator/credhub-cli";
+    homepage = "https://github.com/cloudfoundry/credhub-cli";
     maintainers = with lib.maintainers; [ ris ];
     license = lib.licenses.asl20;
   };
diff --git a/pkgs/by-name/cr/crlfsuite/package.nix b/pkgs/by-name/cr/crlfsuite/package.nix
index 56081ef05d6d..9092df9eeec1 100644
--- a/pkgs/by-name/cr/crlfsuite/package.nix
+++ b/pkgs/by-name/cr/crlfsuite/package.nix
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "Nefcore";
+    owner = "Raghavd3v";
     repo = "CRLFsuite";
     tag = "v${finalAttrs.version}";
     sha256 = "sha256-mK20PbVGhTEjhY5L6coCzSMIrG/PHHmNq30ZoJEs6uI=";
@@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   meta = {
     description = "CRLF injection (HTTP Response Splitting) scanner";
     mainProgram = "crlfsuite";
-    homepage = "https://github.com/Nefcore/CRLFsuite";
+    homepage = "https://github.com/Raghavd3v/CRLFsuite";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       fab
diff --git a/pkgs/by-name/ct/ctodo/package.nix b/pkgs/by-name/ct/ctodo/package.nix
index c2c93ba6e22b..d957f8b4427e 100644
--- a/pkgs/by-name/ct/ctodo/package.nix
+++ b/pkgs/by-name/ct/ctodo/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.3";
 
   src = fetchFromGitHub {
-    owner = "Acolarh";
+    owner = "nielssp";
     repo = "ctodo";
     rev = "v${finalAttrs.version}";
     sha256 = "0mqy5b35cbdwfpbs91ilsgz3wc4cky38xfz9pnr4q88q1vybigna";
diff --git a/pkgs/by-name/cu/cuetsy/package.nix b/pkgs/by-name/cu/cuetsy/package.nix
index 0ed00d3b0edc..7de01e25da17 100644
--- a/pkgs/by-name/cu/cuetsy/package.nix
+++ b/pkgs/by-name/cu/cuetsy/package.nix
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
   version = "0.1.11";
 
   src = fetchFromGitHub {
-    owner = "grafana";
+    owner = "grafana-cold-storage";
     repo = "cuetsy";
     rev = "v${finalAttrs.version}";
     hash = "sha256-dirzVR4j5K1+EHbeRi4rHwRxkyveySoM7qJzvOlGp+0=";
@@ -19,7 +19,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Experimental CUE->TypeScript exporter";
-    homepage = "https://github.com/grafana/cuetsy";
+    homepage = "https://github.com/grafana-cold-storage/cuetsy";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ bryanhonof ];
     mainProgram = "cuetsy";
diff --git a/pkgs/by-name/cu/cups-printers/package.nix b/pkgs/by-name/cu/cups-printers/package.nix
index 7378b14fe30b..fd1fca6dee9d 100644
--- a/pkgs/by-name/cu/cups-printers/package.nix
+++ b/pkgs/by-name/cu/cups-printers/package.nix
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "audiusGmbH";
+    owner = "audius";
     repo = "cups-printers";
     tag = finalAttrs.version;
     hash = "sha256-Fne7V9dEZwdV6OsQPg2gzrz/wloAOOuwlx3CqXOyWBc=";
diff --git a/pkgs/by-name/da/dapper/package.nix b/pkgs/by-name/da/dapper/package.nix
index 6adeb5bef253..0260b5efbed1 100644
--- a/pkgs/by-name/da/dapper/package.nix
+++ b/pkgs/by-name/da/dapper/package.nix
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
   version = "0.6.0";
 
   src = fetchFromGitHub {
-    owner = "rancher";
+    owner = "rancher-archives";
     repo = "dapper";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-V+lHnOmIWjI1qmoJ7+pp+cGmJAtSeY+r2I9zykswQzM=";
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Docker build wrapper";
     mainProgram = "dapper";
-    homepage = "https://github.com/rancher/dapper";
+    homepage = "https://github.com/rancher-archives/dapper";
     license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ kuznero ];
diff --git a/pkgs/by-name/dd/ddosify/package.nix b/pkgs/by-name/dd/ddosify/package.nix
index 36ee53796959..34be4e31705e 100644
--- a/pkgs/by-name/dd/ddosify/package.nix
+++ b/pkgs/by-name/dd/ddosify/package.nix
@@ -10,8 +10,8 @@ buildGoModule (finalAttrs: {
   version = "2.6.0";
 
   src = fetchFromGitHub {
-    owner = "ddosify";
-    repo = "ddosify";
+    owner = "getanteon";
+    repo = "anteon";
     tag = "selfhosted-${finalAttrs.version}";
     hash = "sha256-EPbpBCSaUVVhxGlj7gRqwHLuj5p6563iiARqkEjA6Rk=";
   };
@@ -41,7 +41,7 @@ buildGoModule (finalAttrs: {
     description = "High-performance load testing tool, written in Golang";
     mainProgram = "ddosify";
     homepage = "https://ddosify.com/";
-    changelog = "https://github.com/ddosify/ddosify/releases/tag/selfhosted-${finalAttrs.version}";
+    changelog = "https://github.com/getanteon/anteon/releases/tag/selfhosted-${finalAttrs.version}";
     license = lib.licenses.agpl3Plus;
     maintainers = [ ];
   };
diff --git a/pkgs/by-name/de/dehydrated/package.nix b/pkgs/by-name/de/dehydrated/package.nix
index 18f95593a879..0313de24a7ff 100644
--- a/pkgs/by-name/de/dehydrated/package.nix
+++ b/pkgs/by-name/de/dehydrated/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "0.7.2";
 
   src = fetchFromGitHub {
-    owner = "lukas2511";
+    owner = "dehydrated-io";
     repo = "dehydrated";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-xDDYqP6oxJt0NPgHtHV1xQKUxVc8JQxWekXwxezggtE=";
diff --git a/pkgs/by-name/de/desmume/package.nix b/pkgs/by-name/de/desmume/package.nix
index cc6b654542e4..11292e32d42f 100644
--- a/pkgs/by-name/de/desmume/package.nix
+++ b/pkgs/by-name/de/desmume/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "0.9.13";
 
   src = fetchFromGitHub {
-    owner = "TASVideos";
+    owner = "TASEmulators";
     repo = "desmume";
     rev = "release_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
     hash = "sha256-vmjKXa/iXLTwtqnG+ZUvOnOQPZROeMpfM5J3Jh/Ynfo=";
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    homepage = "https://www.github.com/TASVideos/desmume/";
+    homepage = "https://www.github.com/TASEmulators/desmume/";
     description = "Open-source Nintendo DS emulator";
     longDescription = ''
       DeSmuME is a freeware emulator for the NDS roms & Nintendo DS Lite games
diff --git a/pkgs/by-name/di/digitalbitbox/package.nix b/pkgs/by-name/di/digitalbitbox/package.nix
index 737916a5f516..775e7c56adc6 100644
--- a/pkgs/by-name/di/digitalbitbox/package.nix
+++ b/pkgs/by-name/di/digitalbitbox/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "3.0.0";
 
   src = fetchFromGitHub {
-    owner = "digitalbitbox";
+    owner = "BitBoxSwiss";
     repo = "dbb-app";
     tag = "v${finalAttrs.version}";
     hash = "sha256-ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA=";
diff --git a/pkgs/by-name/di/discord-rpc/package.nix b/pkgs/by-name/di/discord-rpc/package.nix
index 3948a05be270..66be4bb9cbe7 100644
--- a/pkgs/by-name/di/discord-rpc/package.nix
+++ b/pkgs/by-name/di/discord-rpc/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "3.4.0";
 
   src = fetchFromGitHub {
-    owner = "discordapp";
+    owner = "discord";
     repo = "discord-rpc";
     rev = "v${finalAttrs.version}";
     sha256 = "04cxhqdv5r92lrpnhxf8702a8iackdf3sfk1050z7pijbijiql2a";
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Official library to interface with the Discord client";
-    homepage = "https://github.com/discordapp/discord-rpc";
+    homepage = "https://github.com/discord/discord-rpc";
     license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/di/discord-sh/package.nix b/pkgs/by-name/di/discord-sh/package.nix
index 263bb33eb0d2..464f25e1b3f4 100644
--- a/pkgs/by-name/di/discord-sh/package.nix
+++ b/pkgs/by-name/di/discord-sh/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   version = "2.0.1";
 
   src = fetchFromGitHub {
-    owner = "ChaoticWeg";
+    owner = "fieu";
     repo = "discord.sh";
     rev = "v${version}";
     sha256 = "sha256-z57uMbH6PI68aTMAjA8UIPEefV8sQRR4cS0eK6Ypxuk=";
@@ -61,7 +61,7 @@ stdenvNoCC.mkDerivation rec {
   meta = {
     description = "Write-only command-line Discord webhook integration written in 100% Bash script";
     mainProgram = "discord.sh";
-    homepage = "https://github.com/ChaoticWeg/discord.sh";
+    homepage = "https://github.com/fieu/discord.sh";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ matthewcroughan ];
diff --git a/pkgs/by-name/di/disktui/package.nix b/pkgs/by-name/di/disktui/package.nix
index a96d1833ab43..0f32fdea0598 100644
--- a/pkgs/by-name/di/disktui/package.nix
+++ b/pkgs/by-name/di/disktui/package.nix
@@ -7,7 +7,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "disktui";
   version = "1.3.0";
   src = fetchFromGitHub {
-    owner = "Maciejonos";
+    owner = "mkbula";
     repo = "disktui";
     tag = "v${finalAttrs.version}";
     hash = "sha256-C0skZF7fP7Qx5o+q9bUitgnBB9tBh1J4JdGyn8oQ/Rc=";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "TUI for disk management on Linux";
-    homepage = "https://github.com/Maciejonos/disktui";
+    homepage = "https://github.com/mkbula/disktui";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ Inarizxc ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/dj/djlint/package.nix b/pkgs/by-name/dj/djlint/package.nix
index a5998c3952f6..f3d76c74eeae 100644
--- a/pkgs/by-name/dj/djlint/package.nix
+++ b/pkgs/by-name/dj/djlint/package.nix
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "Riverside-Healthcare";
+    owner = "djlint";
     repo = "djlint";
     tag = "v${finalAttrs.version}";
     hash = "sha256-1DXBDVe8Ae8joJOYwwlBZB8MVubDPVhh+TiJBpL2u2M=";
@@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   meta = {
     description = "HTML Template Linter and Formatter. Django - Jinja - Nunjucks - Handlebars - GoLang";
     mainProgram = "djlint";
-    homepage = "https://github.com/Riverside-Healthcare/djlint";
+    homepage = "https://github.com/djlint/djLint";
     license = lib.licenses.gpl3Only;
     changelog = "https://github.com/djlint/djLint/blob/v${finalAttrs.version}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ traxys ];
diff --git a/pkgs/by-name/dj/djv/package.nix b/pkgs/by-name/dj/djv/package.nix
index e7f2da7adcc9..b06440dd5527 100644
--- a/pkgs/by-name/dj/djv/package.nix
+++ b/pkgs/by-name/dj/djv/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "3.1.1";
 
   src = fetchFromGitHub {
-    owner = "darbyjohnston";
+    owner = "grizzlypeak3d";
     repo = "djv";
     tag = finalAttrs.version;
     hash = "sha256-/SakJ23mi/dz8eUt2UtcgfLtFZiCHy1ME+jWdNS8+Fw=";
diff --git a/pkgs/by-name/dm/dmrconfig/package.nix b/pkgs/by-name/dm/dmrconfig/package.nix
index f3153fb3748d..80fc8a537dbf 100644
--- a/pkgs/by-name/dm/dmrconfig/package.nix
+++ b/pkgs/by-name/dm/dmrconfig/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.1";
 
   src = fetchFromGitHub {
-    owner = "sergev";
+    owner = "OpenRTX";
     repo = "dmrconfig";
     rev = finalAttrs.version;
     sha256 = "1qwix75z749628w583fwp7m7kxbj0k3g159sxb7vgqxbadqqz1ab";
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     longDescription = ''
       DMRconfig is a utility for programming digital radios via USB programming cable.
     '';
-    homepage = "https://github.com/sergev/dmrconfig";
+    homepage = "https://github.com/OpenRTX/dmrconfig";
     license = lib.licenses.asl20;
     maintainers = [ ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/do/dogedns/package.nix b/pkgs/by-name/do/dogedns/package.nix
index 83433158a336..99f53b0c586e 100644
--- a/pkgs/by-name/do/dogedns/package.nix
+++ b/pkgs/by-name/do/dogedns/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "Dj-Codeman";
-    repo = "doge";
+    repo = "dog_community";
     rev = "v${finalAttrs.version}";
     hash = "sha256-SeC/GZ1AeEqRzxWc4oJ6JOvXfn3/LRcQz9uWXXqdTqU=";
   };
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Reviving a command-line DNS client";
-    homepage = "https://github.com/Dj-Codeman/doge";
+    homepage = "https://github.com/Dj-Codeman/dog_community";
     license = lib.licenses.eupl12;
     mainProgram = "doge";
     maintainers = with lib.maintainers; [ aktaboot ];
diff --git a/pkgs/by-name/do/doom-bcc/package.nix b/pkgs/by-name/do/doom-bcc/package.nix
index 192ed2889445..b7f95cea620d 100644
--- a/pkgs/by-name/do/doom-bcc/package.nix
+++ b/pkgs/by-name/do/doom-bcc/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   version = "unstable-2018-01-04";
 
   src = fetchFromGitHub {
-    owner = "wormt";
+    owner = "positively-charged";
     repo = "bcc";
     rev = "d58b44d9f18b28fd732c27113e5607a454506d19";
     sha256 = "1m83ip40ln61qrvb1fbgaqbld2xip9n3k817lwkk1936pml9zcrq";
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Compiler for Doom/Hexen scripts (ACS, BCS)";
     mainProgram = "bcc";
-    homepage = "https://github.com/wormt/bcc";
+    homepage = "https://github.com/positively-charged/bcc";
     license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/by-name/dr/dracut/package.nix b/pkgs/by-name/dr/dracut/package.nix
index bc901a594a59..7a6de9a45785 100644
--- a/pkgs/by-name/dr/dracut/package.nix
+++ b/pkgs/by-name/dr/dracut/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "dracut-ng";
-    repo = "dracut-ng";
+    repo = "dracut";
     tag = finalAttrs.version;
     hash = "sha256-2jdS7/LGuLSBBXv1R/o8yjgwdXl2l2wNbZWxq01wSb0";
   };
diff --git a/pkgs/by-name/dr/droidcam/package.nix b/pkgs/by-name/dr/droidcam/package.nix
index c3a9a211284d..f99fa0692e9d 100644
--- a/pkgs/by-name/dr/droidcam/package.nix
+++ b/pkgs/by-name/dr/droidcam/package.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.1.5";
 
   src = fetchFromGitHub {
-    owner = "aramg";
-    repo = "droidcam";
+    owner = "dev47apps";
+    repo = "droidcam-linux-client";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-22lRmtXumjR/83Fg1edBisM1GjNZvNUvPs1Yg7Na1xw=";
   };
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Linux client for DroidCam app";
-    homepage = "https://github.com/aramg/droidcam";
+    homepage = "https://github.com/dev47apps/droidcam-linux-client";
     license = lib.licenses.gpl2Only;
     maintainers = [ lib.maintainers.suhr ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/dr/drone/package.nix b/pkgs/by-name/dr/drone/package.nix
index 8441cc9548a4..e3156c5938c6 100644
--- a/pkgs/by-name/dr/drone/package.nix
+++ b/pkgs/by-name/dr/drone/package.nix
@@ -11,7 +11,7 @@ buildGoModule (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "harness";
-    repo = "drone";
+    repo = "harness";
     tag = "v${finalAttrs.version}";
     hash = "sha256-jKM+jET6dsMe5+QRDKIHA40OOHb/nZmli3owaDB7IvU=";
   };
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Continuous Integration platform built on container technology";
     mainProgram = "drone-server";
-    homepage = "https://github.com/harness/drone";
+    homepage = "https://github.com/harness/harness";
     maintainers = with lib.maintainers; [
       vdemeester
       techknowlogick
diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix
index aafd8d198b00..da8e89629e0f 100644
--- a/pkgs/development/python-modules/deepdiff/default.nix
+++ b/pkgs/development/python-modules/deepdiff/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "seperman";
+    owner = "qlustered";
     repo = "deepdiff";
     tag = version;
     hash = "sha256-/XRPP8O2ykoXwOZ2ou/7Yoa1x7t45dCx6G3aq30o3Wc=";
@@ -89,8 +89,8 @@ buildPythonPackage rec {
   meta = {
     description = "Deep Difference and Search of any Python object/data";
     mainProgram = "deep";
-    homepage = "https://github.com/seperman/deepdiff";
-    changelog = "https://github.com/seperman/deepdiff/blob/${src.tag}/CHANGELOG.md";
+    homepage = "https://github.com/qlustered/deepdiff";
+    changelog = "https://github.com/qlustered/deepdiff/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       mic92
diff --git a/pkgs/development/python-modules/dodgy/default.nix b/pkgs/development/python-modules/dodgy/default.nix
index eb19da5fb5ee..882a9e7ef95f 100644
--- a/pkgs/development/python-modules/dodgy/default.nix
+++ b/pkgs/development/python-modules/dodgy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "landscapeio";
+    owner = "prospector-dev";
     repo = "dodgy";
     rev = version;
     sha256 = "0ywwjpz0p6ls3hp1lndjr9ql6s5lkj7dgpll1h87w04kwan70j0x";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Looks at Python code to search for things which look \"dodgy\" such as passwords or diffs";
     mainProgram = "dodgy";
-    homepage = "https://github.com/landscapeio/dodgy";
+    homepage = "https://github.com/prospector-dev/dodgy";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ kamadorueda ];
   };
diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix
index bce6cec11566..6c636518882c 100644
--- a/pkgs/development/python-modules/dvc/default.nix
+++ b/pkgs/development/python-modules/dvc/default.nix
@@ -68,7 +68,7 @@ buildPythonPackage (finalAttrs: {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "iterative";
+    owner = "treeverse";
     repo = "dvc";
     tag = finalAttrs.version;
     hash = "sha256-KzHaR7o3PUHMBrtSDWXvH7/YMPxSafPSGUnS9018XKg=";
@@ -162,7 +162,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Version Control System for Machine Learning Projects";
     homepage = "https://dvc.org";
-    changelog = "https://github.com/iterative/dvc/releases/tag/${finalAttrs.src.tag}";
+    changelog = "https://github.com/treeverse/dvc/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       cmcdragonkai

From 22400349c0f611575356e9fb48a738c205581ce8 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Thu, 2 Jul 2026 20:06:30 +0200
Subject: [PATCH 082/100] m1n1: expose rustPlatform

So that the rustc with softfloat core lib can be easily accessed for development purposes
---
 pkgs/by-name/m1/m1n1/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/m1/m1n1/package.nix b/pkgs/by-name/m1/m1n1/package.nix
index 9d03cb8f5057..f33b78f9ac64 100644
--- a/pkgs/by-name/m1/m1n1/package.nix
+++ b/pkgs/by-name/m1/m1n1/package.nix
@@ -102,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = nix-update-script { };
+    inherit rustPlatform;
   };
 
   meta = {

From dcfe551ba991df55a846bc2414d0139710e2bec0 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Thu, 2 Jul 2026 13:08:17 -0500
Subject: [PATCH 083/100] xdg-desktop-portal-hyprland: Enable separateDebugInfo

---
 .../hyprwm/xdg-desktop-portal-hyprland/default.nix               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
index c0da66554a81..a0bca1830c90 100644
--- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
@@ -68,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeBuildType = if debug then "Debug" else "RelWithDebInfo";
 
   dontStrip = debug;
+  separateDebugInfo = !debug;
 
   dontWrapQtApps = true;
 

From 235b0a649a3392bd5615e8c68e76ccc0160d6919 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Thu, 2 Jul 2026 13:09:33 -0500
Subject: [PATCH 084/100] hyprpicker: Don't strip debug builds and add
 separateDebugInfo otherwise

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

diff --git a/pkgs/by-name/hy/hyprpicker/package.nix b/pkgs/by-name/hy/hyprpicker/package.nix
index 006aa5d9472b..c427bd3cfb20 100644
--- a/pkgs/by-name/hy/hyprpicker/package.nix
+++ b/pkgs/by-name/hy/hyprpicker/package.nix
@@ -29,7 +29,10 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ABumeksE8Bvtdb6g4vJ2jA9BLlYHnXU86VAuKJhBPoY=";
   };
 
-  cmakeBuildType = if debug then "Debug" else "Release";
+  cmakeBuildType = if debug then "Debug" else "RelWithDebInfo";
+
+  dontStrip = debug;
+  separateDebugInfo = !debug;
 
   nativeBuildInputs = [
     cmake

From ff659d853bfec43dc24e16b7b04031c6ae559f33 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Thu, 2 Jul 2026 13:10:13 -0500
Subject: [PATCH 085/100] hypridle: Enable separateDebugInfo

---
 pkgs/by-name/hy/hypridle/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix
index d09e81d9aac4..6ee8b3d9a6b0 100644
--- a/pkgs/by-name/hy/hypridle/package.nix
+++ b/pkgs/by-name/hy/hypridle/package.nix
@@ -45,6 +45,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
   ];
 
+  cmakeBuildType = "RelWithDebInfo";
+  separateDebugInfo = true;
+
   passthru = {
     updateScript = nix-update-script { };
   };

From 0b5763d605cd081f1001cd29e6dc3f45c0fc341e Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Thu, 2 Jul 2026 13:10:46 -0500
Subject: [PATCH 086/100] hyprpaper: Enable separateDebugInfo

---
 pkgs/by-name/hy/hyprpaper/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix
index 5ff9377d6f03..53b68a517dac 100644
--- a/pkgs/by-name/hy/hyprpaper/package.nix
+++ b/pkgs/by-name/hy/hyprpaper/package.nix
@@ -88,6 +88,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
 
+  cmakeBuildType = "RelWithDebInfo";
+  separateDebugInfo = true;
+
   meta = {
     inherit (finalAttrs.src.meta) homepage;
     description = "Blazing fast wayland wallpaper utility";

From 2970e07266cc964976e3210061af54e4e88fddbd Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Thu, 2 Jul 2026 13:11:23 -0500
Subject: [PATCH 087/100] hyprsunset: Enable separateDebugInfo

---
 pkgs/by-name/hy/hyprsunset/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/hy/hyprsunset/package.nix b/pkgs/by-name/hy/hyprsunset/package.nix
index 02716ad867d5..687450a0d4bc 100644
--- a/pkgs/by-name/hy/hyprsunset/package.nix
+++ b/pkgs/by-name/hy/hyprsunset/package.nix
@@ -46,6 +46,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
+  cmakeBuildType = "RelWithDebInfo";
+  separateDebugInfo = true;
+
   passthru = {
     updateScript = nix-update-script { };
   };

From 31c99738268a27c5f5663b4e522b860a7400e521 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 2 Jul 2026 14:32:08 -0400
Subject: [PATCH 088/100] beam27Packages.erlang: 27.3.4.13 -> 27.3.4.14

Changelog: https://github.com/erlang/otp/releases/tag/OTP-27.3.4.14
---
 pkgs/development/interpreters/erlang/27.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix
index 0cd3bf547172..99ad45446ea0 100644
--- a/pkgs/development/interpreters/erlang/27.nix
+++ b/pkgs/development/interpreters/erlang/27.nix
@@ -1,6 +1,6 @@
 genericBuilder:
 
 genericBuilder {
-  version = "27.3.4.13";
-  hash = "sha256-2WF+EWq1S9IaDuUuG8IR09LjYvEq81E88oq6yFazkkM=";
+  version = "27.3.4.14";
+  hash = "sha256-vnD6+KAD2Hm21w+/RB9MxrCbxdFTd2YbE79dd4M5t4U=";
 }

From 71d10c2425df4d9798e2ad69c066e38b71eb5e8a Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 2 Jul 2026 14:32:34 -0400
Subject: [PATCH 089/100] beam28Packages.erlang: 28.5.0.2 -> 28.5.0.3

Changelog: https://github.com/erlang/otp/releases/tag/OTP-28.5.0.3
---
 pkgs/development/interpreters/erlang/28.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/28.nix b/pkgs/development/interpreters/erlang/28.nix
index 3901f643f41a..a407d86a72c2 100644
--- a/pkgs/development/interpreters/erlang/28.nix
+++ b/pkgs/development/interpreters/erlang/28.nix
@@ -1,6 +1,6 @@
 genericBuilder:
 
 genericBuilder {
-  version = "28.5.0.2";
-  hash = "sha256-H25iMB+CvAd8yXv8jydBOCYfMm0LEwN1otRearNthYI=";
+  version = "28.5.0.3";
+  hash = "sha256-OCKR5lryM/jnFFB3hMpud4gQAzPISfK1d0spVXvj358=";
 }

From 7416acd0d55d9408c7d3180bdd84022fe8fa5ff2 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 2 Jul 2026 14:33:00 -0400
Subject: [PATCH 090/100] beam29Packages.erlang: 29.0.2 -> 29.0.3

Changelog: https://github.com/erlang/otp/releases/tag/OTP-29.0.3
---
 pkgs/development/interpreters/erlang/29.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/29.nix b/pkgs/development/interpreters/erlang/29.nix
index 550183d18a9a..31df81123606 100644
--- a/pkgs/development/interpreters/erlang/29.nix
+++ b/pkgs/development/interpreters/erlang/29.nix
@@ -1,6 +1,6 @@
 genericBuilder:
 
 genericBuilder {
-  version = "29.0.2";
-  hash = "sha256-6tpe+jCOC1V2SOPMH1J8DHVXQqR4pqEjIiAcSitn8Hc=";
+  version = "29.0.3";
+  hash = "sha256-clRU+zrmp8wgCm3rEVUP9y3MmvLzsJGW4RL8qWDZz8A=";
 }

From 669ae94b3827a3344ac119149358a41cfa6c3051 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 18:46:24 +0000
Subject: [PATCH 091/100] python3Packages.tesla-fleet-api: 1.4.7 -> 1.5.1

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

diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix
index 68369780e2fd..beef86aafa30 100644
--- a/pkgs/development/python-modules/tesla-fleet-api/default.nix
+++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "tesla-fleet-api";
-  version = "1.4.7";
+  version = "1.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Teslemetry";
     repo = "python-tesla-fleet-api";
     tag = "v${version}";
-    hash = "sha256-704vqQwT50j/F1Mk8VMJ9VSOUfu+pHmxYQySs4UlFls=";
+    hash = "sha256-QQSm856y4/bL61noJ2ebPsZSAAKW3Md6/zQ+FFydri4=";
   };
 
   build-system = [ setuptools ];

From 021f28c292411f9a3ea3af45226c1c5bddce14ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 18:55:18 +0000
Subject: [PATCH 092/100] malwoverview: 8.0.4 -> 8.0.5

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

diff --git a/pkgs/by-name/ma/malwoverview/package.nix b/pkgs/by-name/ma/malwoverview/package.nix
index 29658ffc0e6f..72d1499c537a 100644
--- a/pkgs/by-name/ma/malwoverview/package.nix
+++ b/pkgs/by-name/ma/malwoverview/package.nix
@@ -6,7 +6,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "malwoverview";
-  version = "8.0.4";
+  version = "8.0.5";
   pyproject = true;
 
   __structuredAttrs = true;
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "alexandreborges";
     repo = "malwoverview";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zx4jW8EbEfbdhOqlFJjb/bO5NrHRRaCwT9LePdLz7x0=";
+    hash = "sha256-BIuz7QitSM7xOSwiIsitIdYXaBoENhzrOLVfyVcoy3M=";
   };
 
   build-system = with python3Packages; [

From e8a749404b74343c22c5c94a570939b48b7c0dee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 19:05:14 +0000
Subject: [PATCH 093/100] shairport-sync-airplay2: 5.0.4 -> 5.1

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

diff --git a/pkgs/by-name/sh/shairport-sync/package.nix b/pkgs/by-name/sh/shairport-sync/package.nix
index 6e13b8d54a4c..49df1c0c9b35 100644
--- a/pkgs/by-name/sh/shairport-sync/package.nix
+++ b/pkgs/by-name/sh/shairport-sync/package.nix
@@ -56,13 +56,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shairport-sync";
-  version = "5.0.4";
+  version = "5.1";
 
   src = fetchFromGitHub {
     repo = "shairport-sync";
     owner = "mikebrady";
     tag = finalAttrs.version;
-    hash = "sha256-7/QB0lvpjZnGXo4vjKSYogjhi66S/QRRpypsqEMLGj0=";
+    hash = "sha256-az6HxelISTebeKkhK7MIh7px39eCHucSuZb8qBDzptk=";
   };
 
   nativeBuildInputs = [

From 2aceefaa883b224f8a5986089e060973687b248c Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Thu, 2 Jul 2026 22:15:36 +0200
Subject: [PATCH 094/100] phpPackages.composer: 2.10.1 -> 2.10.2

---
 pkgs/development/php-packages/composer/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix
index 152da49f3037..1cb71c9ee229 100644
--- a/pkgs/development/php-packages/composer/default.nix
+++ b/pkgs/development/php-packages/composer/default.nix
@@ -13,14 +13,14 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
   pname = "composer";
-  version = "2.10.1";
+  version = "2.10.2";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "composer";
     repo = "composer";
     tag = finalAttrs.version;
-    hash = "sha256-0EeELI4jCSgG6S5sR6tQbwgcqdhe0JTcObvE5x49v1A=";
+    hash = "sha256-LKC4ogBHArE1wceY5hClVC2H9J8Hx98hlaV8GZEdt8c=";
   };
 
   nativeBuildInputs = [
@@ -34,7 +34,7 @@ php.buildComposerProject2 (finalAttrs: {
     inherit (finalAttrs.passthru) pharHash;
   };
 
-  vendorHash = "sha256-58l07Gt0j4g412rJfsRNSIAQ6Yd3ADpiQ9LXN+pHKNg=";
+  vendorHash = "sha256-0reKbGJEFJTQ2XnfsGij7nWICURLEHWJxjsYzanHpgs=";
 
   postInstall = ''
     wrapProgram $out/bin/composer \
@@ -56,7 +56,7 @@ php.buildComposerProject2 (finalAttrs: {
   # use together with the version from this package to keep the
   # bootstrap phar file up-to-date together with the end user composer
   # package.
-  passthru.pharHash = "sha256-NFucapjaXDDcvUsNmfyHEL8K6Yo4mO6hj3sq2d7JPwY=";
+  passthru.pharHash = "sha256-XucSX4owo00kbO/cC8hbing7KPKuyWiZQRhRI1DSgCc=";
 
   meta = {
     changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}";

From f81690e6bfa65dd64b03150f29bf025a77aa6dde Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 2 Jul 2026 22:42:53 +0200
Subject: [PATCH 095/100] freecad: pick patch for coin3d 4.0.10

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

diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index 5e04316c6f8d..04ab6a12b975 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -6,6 +6,7 @@
   doxygen,
   eigen,
   fetchFromGitHub,
+  fetchpatch,
   fmt,
   gts,
   hdf5,
@@ -99,7 +100,15 @@ freecad-utils.makeCustomizable (
     ]
     ++ pythonDeps;
 
-    patches = [ ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch ];
+    patches = [
+      ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
+      (fetchpatch {
+        # https://github.com/FreeCAD/FreeCAD/pull/30899
+        # fix COIN3D_MICRO_VERSION regex for coin 4.0.10
+        url = "https://github.com/FreeCAD/FreeCAD/commit/e3e56059865849c6b1c85161f69183ad872414e3.patch";
+        hash = "sha256-qe0wn7DwvQT/pmrSCa44+orMetztpw8DZ+NhDJEYAMw=";
+      })
+    ];
 
     postPatch = ''
       substituteInPlace src/Mod/Fem/femmesh/gmshtools.py \

From ccc62b2d76d639c1e496a9aa474072deedcfa6d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 20:43:17 +0000
Subject: [PATCH 096/100] libretro.flycast: 0-unstable-2026-06-23 ->
 0-unstable-2026-06-26

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

diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix
index cf56b95d8026..9ab9835acaae 100644
--- a/pkgs/applications/emulators/libretro/cores/flycast.nix
+++ b/pkgs/applications/emulators/libretro/cores/flycast.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "flycast";
-  version = "0-unstable-2026-06-23";
+  version = "0-unstable-2026-06-26";
 
   src = fetchFromGitHub {
     owner = "flyinghead";
     repo = "flycast";
-    rev = "59ab660649d933f40cf281656ba949eb4c835d73";
-    hash = "sha256-Hwav4vHppInUUbiSch3J84P7HIYkQ+DM431fFdq1qEg=";
+    rev = "7ec978e8521f75427ad38eb8f8f4f3cabaa891d0";
+    hash = "sha256-3ChQnJP6xI/Wd3BOlkauTYCNQz1MjSHk0lDmjX+Iugg=";
     fetchSubmodules = true;
   };
 

From f8cbe1a7c205a39f085846af9fbbb0269e4d74a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 20:58:42 +0000
Subject: [PATCH 097/100] panache: 2.58.0 -> 2.60.0

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

diff --git a/pkgs/by-name/pa/panache/package.nix b/pkgs/by-name/pa/panache/package.nix
index 9cbc05d6eaf5..60bf3c5e1011 100644
--- a/pkgs/by-name/pa/panache/package.nix
+++ b/pkgs/by-name/pa/panache/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "panache";
-  version = "2.58.0";
+  version = "2.60.0";
 
   src = fetchFromGitHub {
     owner = "jolars";
     repo = "panache";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QLW+3xkAYPFVAXM2VwhZm175CksDG9HL9rCEkH7knlU=";
+    hash = "sha256-NQev+TDZf7NCtPD06ctlhApZYGvsR2PhSJR8gyU8aoo=";
   };
 
-  cargoHash = "sha256-OXkkaXWFFOBsZEWL88UWy1dqpwZazk9i8ZAH/tprag4=";
+  cargoHash = "sha256-Hu5pAR4aQadfxyuhGxR33U1uuu0LTKNMl6CwTuut5/0=";
 
   nativeBuildInputs = [
     installShellFiles

From 1c9a787ac4b4b3c29d51bf5e9fb5e9df64b948f3 Mon Sep 17 00:00:00 2001
From: PierreBorine <git@thecakeis.top>
Date: Fri, 3 Jul 2026 00:20:51 +0200
Subject: [PATCH 098/100] vimPlugins.gitportal-nvim: update, moved to codeberg

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 ++++++-------
 .../editors/vim/plugins/vim-plugin-names            |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 954963bff0d2..875b2dbdc240 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -6737,14 +6737,13 @@ final: prev: {
 
   gitportal-nvim = buildVimPlugin {
     pname = "gitportal.nvim";
-    version = "0-unstable-2025-12-21";
-    src = fetchFromGitHub {
-      owner = "trevorhauter";
-      repo = "gitportal.nvim";
-      rev = "0c3e1c1d518c9e42e61e8df35ea0c0582a278a65";
-      hash = "sha256-ag7t+G5TKRajLNc4ZrNuMufJSxqJQXPpWINZSFwEmx4=";
+    version = "0-unstable-2026-06-26";
+    src = fetchgit {
+      url = "https://codeberg.org/trevorhauter/gitportal.nvim";
+      rev = "ee5446aa17738a419e855e2e4c01cb65e378e4cb";
+      hash = "sha256-nt+4FjY+9IEBbUMNk0FpTwNfFu0/3k7DKeops+cGlxk=";
     };
-    meta.homepage = "https://github.com/trevorhauter/gitportal.nvim/";
+    meta.homepage = "https://codeberg.org/trevorhauter/gitportal.nvim";
     meta.license = getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 4f9d4e52d760..9ca852477c50 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -479,7 +479,7 @@ https://github.com/vim-scripts/gitignore.vim/,,
 https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim,,
 https://github.com/LionyxML/gitlineage.nvim/,,
 https://github.com/ruifm/gitlinker.nvim/,,
-https://github.com/trevorhauter/gitportal.nvim/,,
+https://codeberg.org/trevorhauter/gitportal.nvim/,,
 https://github.com/gregsexton/gitv/,,
 https://github.com/DNLHC/glance.nvim/,,
 https://github.com/ellisonleao/glow.nvim/,,

From 37b5aa645017f19911bbd5262a62224c0b2c5753 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 22:32:45 +0000
Subject: [PATCH 099/100] python3Packages.pycaption: 2.2.23 -> 2.2.26

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

diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix
index b74440c8f4c7..36dc8ff169b9 100644
--- a/pkgs/development/python-modules/pycaption/default.nix
+++ b/pkgs/development/python-modules/pycaption/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pycaption";
-  version = "2.2.23";
+  version = "2.2.26";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pbs";
     repo = "pycaption";
     tag = finalAttrs.version;
-    hash = "sha256-7U2TgjEgRYiDW0xkTRm4eyU3yHBqnfLqEw7/ZgdGJsI=";
+    hash = "sha256-6y8c/FT4POM1xKnH3+M4MkvCiysNqVLEb650G3F3NGw=";
   };
 
   build-system = [ setuptools ];

From 4276bb8c974d723a897b94451d50d777d7ebf652 Mon Sep 17 00:00:00 2001
From: Maraxi <Maraxi@users.noreply.github.com>
Date: Fri, 3 Jul 2026 01:00:37 +0200
Subject: [PATCH 100/100] delta: generate latest shell completions

As per documentation the shell completions provided in the source GitHub
might not be up-to-date.
https://dandavison.github.io/delta/tips-and-tricks/shell-completion.html
---
 pkgs/by-name/de/delta/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/de/delta/package.nix b/pkgs/by-name/de/delta/package.nix
index e5ef35dec03f..44182f77bff7 100644
--- a/pkgs/by-name/de/delta/package.nix
+++ b/pkgs/by-name/de/delta/package.nix
@@ -44,7 +44,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postInstall = ''
     installShellCompletion --cmd delta \
-      etc/completion/completion.{bash,fish,zsh}
+      --bash <($out/bin/delta --generate-completion bash) \
+      --fish <($out/bin/delta --generate-completion zsh) \
+      --zsh <($out/bin/delta --generate-completion fish)
   '';
 
   # test_env_parsing_with_pager_set_to_bat sets environment variables,