From dc778b11851fcb342ade64e91fdef74ff4adb757 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 5 May 2026 17:52:36 +0000
Subject: [PATCH 01/48] python3Packages.robot-descriptions: 1.22.0 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/robot-descriptions/default.nix b/pkgs/development/python-modules/robot-descriptions/default.nix
index 85d50a775e46..a4e76e813cab 100644
--- a/pkgs/development/python-modules/robot-descriptions/default.nix
+++ b/pkgs/development/python-modules/robot-descriptions/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "robot-descriptions";
-  version = "1.22.0";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "robot-descriptions";
     repo = "robot_descriptions.py";
     tag = "v${version}";
-    hash = "sha256-4O2mAkO/2xc9cAq55DMdyCzdEwMzAo5uStJwS3rQdws=";
+    hash = "sha256-PykMzWOwnjvay5zzddqD/07SdZ03GN80tRAa1CzrJzU=";
   };
 
   build-system = [

From 204daa866443f18e1e23cf59433acf29452f5e32 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Thu, 11 Jun 2026 18:54:58 +0200
Subject: [PATCH 02/48] openrsync: add update script

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/op/openrsync/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/op/openrsync/package.nix b/pkgs/by-name/op/openrsync/package.nix
index d9545aff3274..f741ecda5751 100644
--- a/pkgs/by-name/op/openrsync/package.nix
+++ b/pkgs/by-name/op/openrsync/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation {
@@ -18,6 +19,13 @@ stdenv.mkDerivation {
   # Uses oconfigure
   prefixKey = "PREFIX=";
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex=^VERSION_(\\d+)_(\\d+)_(\\d+.*)"
+      "--version=branch"
+    ];
+  };
+
   meta = {
     homepage = "https://www.openrsync.org/";
     description = "BSD-licensed implementation of rsync";

From 6df24e2bafcb61b580223e734bcefca694de959f Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Thu, 11 Jun 2026 19:34:58 +0200
Subject: [PATCH 03/48] openrsync: unstable-2025-01-27 ->
 0.5.0-unstable-2026-05-31

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/op/openrsync/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openrsync/package.nix b/pkgs/by-name/op/openrsync/package.nix
index f741ecda5751..a26b95a6b74b 100644
--- a/pkgs/by-name/op/openrsync/package.nix
+++ b/pkgs/by-name/op/openrsync/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation {
   pname = "openrsync";
-  version = "unstable-2025-01-27";
+  version = "0.5.0-unstable-2026-05-31";
 
   src = fetchFromGitHub {
     owner = "kristapsdz";
     repo = "openrsync";
-    rev = "a257c0f495af2b5ee6b41efc6724850a445f87ed";
-    hash = "sha256-pc1lo8d5FY8/1K2qUWzSlrSnA7jnRg4FQRyHqC8I38k=";
+    rev = "48070e68d73f67d6922b2ffc8c2dee9754e659c6";
+    hash = "sha256-9ApkHIak1/XQn1nMwdC0iiZEzZI2gHCOIj8P6bQPFyA=";
   };
 
   # Uses oconfigure

From 561f7bb9c92738f28b649a75998ef00d95e67a83 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Thu, 11 Jun 2026 19:40:25 +0200
Subject: [PATCH 04/48] openrsync: modernize

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/op/openrsync/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/openrsync/package.nix b/pkgs/by-name/op/openrsync/package.nix
index a26b95a6b74b..e456db092644 100644
--- a/pkgs/by-name/op/openrsync/package.nix
+++ b/pkgs/by-name/op/openrsync/package.nix
@@ -16,8 +16,12 @@ stdenv.mkDerivation {
     hash = "sha256-9ApkHIak1/XQn1nMwdC0iiZEzZI2gHCOIj8P6bQPFyA=";
   };
 
+  strictDeps = true;
+  __structuredAttrs = true;
+  enableParallelBuilding = true;
+
   # Uses oconfigure
-  prefixKey = "PREFIX=";
+  env.prefixKey = "PREFIX=";
 
   passthru.updateScript = nix-update-script {
     extraArgs = [

From d0169b96fbe8340d4f8d0b9cece6512a4565a779 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Thu, 18 Jun 2026 12:07:47 +0200
Subject: [PATCH 05/48] docs/readme: reword 'devmode' -> Live preview

---
 doc/README.md                                           | 6 ++++--
 nixos/doc/manual/contributing-to-this-manual.chapter.md | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/README.md b/doc/README.md
index 4fafb9f575b8..0f5b3d2b77d4 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -54,9 +54,11 @@ Make sure that your local files aren't added to Git history by adding the follow
 /**/.direnv
 ```
 
-#### `devmode`
+#### Live preview
 
-Use [`devmode`](../pkgs/by-name/de/devmode/README.md) for a live preview when editing the manual.
+Run [`devmode`](../pkgs/by-name/de/devmode/README.md) for a live preview while editing the manual: it rebuilds on every change and reloads the page in your browser automatically.
+
+Changes to the renderer 'pkgs/by-name/ni/nixos-render-docs' need a manual restart. Run: `devmode` again.
 
 ### Testing redirects
 
diff --git a/nixos/doc/manual/contributing-to-this-manual.chapter.md b/nixos/doc/manual/contributing-to-this-manual.chapter.md
index 19549c32f277..a98ce7fc9923 100644
--- a/nixos/doc/manual/contributing-to-this-manual.chapter.md
+++ b/nixos/doc/manual/contributing-to-this-manual.chapter.md
@@ -35,9 +35,11 @@ Make sure that your local files aren't added to Git history by adding the follow
 /**/.direnv
 ```
 
-### `devmode` {#sec-contributing-devmode}
+### Live preview {#sec-contributing-devmode}
 
-Use [`devmode`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/de/devmode/README.md) for a live preview when editing the manual.
+Run [`devmode`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/de/devmode/README.md) for a live preview while editing the manual: it rebuilds on every change and reloads the page in your browser automatically.
+
+Changes to the renderer 'pkgs/by-name/ni/nixos-render-docs' need a manual restart. Run: `devmode` again.
 
 ## Testing redirects {#sec-contributing-redirects}
 

From 50947728598f2dd65d4f96eb53c428da44e11565 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sun, 21 Jun 2026 06:01:58 +0000
Subject: [PATCH 06/48] drm_info: 2.8.0 -> 2.10.0

---
 pkgs/by-name/dr/drm_info/package.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dr/drm_info/package.nix b/pkgs/by-name/dr/drm_info/package.nix
index f2eaf49c6eb8..2c4d0deff321 100644
--- a/pkgs/by-name/dr/drm_info/package.nix
+++ b/pkgs/by-name/dr/drm_info/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitLab,
   libdrm,
+  libdisplay-info,
   json_c,
   pciutils,
   meson,
@@ -14,18 +15,23 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "drm_info";
-  version = "2.8.0";
+  version = "2.10.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "emersion";
     repo = "drm_info";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-LtZ7JJmVNWMjJL2F6k+tcBpJ2v2fd+HNWyHAOvIi7Ko=";
+    hash = "sha256-QKF0frDPelwHOzf3r0tzSo7i1WfGhcFGJfxf2bj1+OE=";
   };
 
   strictDeps = true;
 
+  postPatch = ''
+    substituteInPlace meson.build \
+      --replace-fail "'<2.4.134'" "'<2.4.133'"
+  '';
+
   depsBuildBuild = [
     pkg-config
   ];
@@ -39,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libdrm
+    libdisplay-info
     json_c
     pciutils
   ];

From 1b58f1e0924504a06526752660e9e03301f518af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Jun 2026 00:31:55 +0000
Subject: [PATCH 07/48] photoqt: 5.3 -> 5.4

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

diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix
index afb3330c9351..514d8260e860 100644
--- a/pkgs/by-name/ph/photoqt/package.nix
+++ b/pkgs/by-name/ph/photoqt/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "photoqt";
-  version = "5.3";
+  version = "5.4";
 
   src = fetchurl {
     url = "https://photoqt.org/downloads/source/photoqt-${finalAttrs.version}.tar.gz";
-    hash = "sha256-NuZET8uS7sxRXvpJGKiOulUvb/y5/O6LYXyr0RBln+4=";
+    hash = "sha256-Gifem+gVPmpF7uhiD2atejtFmOVuu7t2ZLKHMNS5yvY=";
   };
 
   nativeBuildInputs = [

From 96ffdab3729e3532081d34f8826e1cd519f7350d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 12:32:41 +0000
Subject: [PATCH 08/48] unrar: 7.2.6 -> 7.2.7

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

diff --git a/pkgs/by-name/un/unrar/package.nix b/pkgs/by-name/un/unrar/package.nix
index 5d4eebee8bd4..8023aefa4ae7 100644
--- a/pkgs/by-name/un/unrar/package.nix
+++ b/pkgs/by-name/un/unrar/package.nix
@@ -6,12 +6,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unrar";
-  version = "7.2.6";
+  version = "7.2.7";
 
   src = fetchzip {
     url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz";
     stripRoot = false;
-    hash = "sha256-rYW8ytF/eyhlgmQugbPXSyaQOPu+UmP6A6xmKh80iuE=";
+    hash = "sha256-X0MOIbsIL5iczClCLSj8UX0ofLHBu1Asap4EKKbLVnw=";
   };
 
   sourceRoot = finalAttrs.src.name;

From 4d44e65a92b9c6257a546be680bf10b0d39d6318 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Fri, 22 May 2026 20:53:02 +0200
Subject: [PATCH 09/48] astal.source: 0-unstable-2025-11-26 ->
 0-unstable-2026-06-21

---
 pkgs/development/libraries/astal/default.nix        |  3 +++
 .../libraries/astal/modules/brightness.nix          | 13 +++++++++++++
 pkgs/development/libraries/astal/modules/greet.nix  | 11 +++++++++--
 pkgs/development/libraries/astal/modules/mpris.nix  |  4 ++++
 pkgs/development/libraries/astal/modules/notifd.nix |  2 ++
 .../development/libraries/astal/modules/quarrel.nix |  5 +++++
 pkgs/development/libraries/astal/modules/river.nix  |  3 +++
 pkgs/development/libraries/astal/modules/wl.nix     |  9 +++++++++
 pkgs/development/libraries/astal/source.nix         |  6 +++---
 9 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/astal/modules/brightness.nix
 create mode 100644 pkgs/development/libraries/astal/modules/quarrel.nix
 create mode 100644 pkgs/development/libraries/astal/modules/wl.nix

diff --git a/pkgs/development/libraries/astal/default.nix b/pkgs/development/libraries/astal/default.nix
index 227ceb161438..208c9b6f68ec 100644
--- a/pkgs/development/libraries/astal/default.nix
+++ b/pkgs/development/libraries/astal/default.nix
@@ -9,6 +9,7 @@ self: {
   auth = self.callPackage ./modules/auth.nix { };
   battery = self.callPackage ./modules/battery.nix { };
   bluetooth = self.callPackage ./modules/bluetooth.nix { };
+  brightness = self.callPackage ./modules/brightness.nix { };
   cava = self.callPackage ./modules/cava.nix { };
   gjs = self.callPackage ./modules/gjs.nix { };
   greet = self.callPackage ./modules/greet.nix { };
@@ -18,7 +19,9 @@ self: {
   network = self.callPackage ./modules/network.nix { };
   notifd = self.callPackage ./modules/notifd.nix { };
   powerprofiles = self.callPackage ./modules/powerprofiles.nix { };
+  quarrel = self.callPackage ./modules/quarrel.nix { };
   river = self.callPackage ./modules/river.nix { };
   tray = self.callPackage ./modules/tray.nix { };
   wireplumber = self.callPackage ./modules/wireplumber.nix { inherit wireplumber; };
+  wl = self.callPackage ./modules/wl.nix { };
 }
diff --git a/pkgs/development/libraries/astal/modules/brightness.nix b/pkgs/development/libraries/astal/modules/brightness.nix
new file mode 100644
index 000000000000..412d881b30c9
--- /dev/null
+++ b/pkgs/development/libraries/astal/modules/brightness.nix
@@ -0,0 +1,13 @@
+{
+  buildAstalModule,
+  json-glib,
+  quarrel,
+}:
+buildAstalModule {
+  name = "brightness";
+  buildInputs = [
+    json-glib
+    quarrel
+  ];
+  meta.description = "Astal module for brightness devices";
+}
diff --git a/pkgs/development/libraries/astal/modules/greet.nix b/pkgs/development/libraries/astal/modules/greet.nix
index 20be11464cba..f01ef1c3968d 100644
--- a/pkgs/development/libraries/astal/modules/greet.nix
+++ b/pkgs/development/libraries/astal/modules/greet.nix
@@ -1,6 +1,13 @@
-{ buildAstalModule, json-glib }:
+{
+  buildAstalModule,
+  json-glib,
+  quarrel,
+}:
 buildAstalModule {
   name = "greet";
-  buildInputs = [ json-glib ];
+  buildInputs = [
+    json-glib
+    quarrel
+  ];
   meta.description = "Astal module for greetd using IPC";
 }
diff --git a/pkgs/development/libraries/astal/modules/mpris.nix b/pkgs/development/libraries/astal/modules/mpris.nix
index 02fa7c072265..db93f55052a9 100644
--- a/pkgs/development/libraries/astal/modules/mpris.nix
+++ b/pkgs/development/libraries/astal/modules/mpris.nix
@@ -2,12 +2,16 @@
   buildAstalModule,
   gvfs,
   json-glib,
+  libsoup_3,
+  quarrel,
 }:
 buildAstalModule {
   name = "mpris";
   buildInputs = [
     gvfs
     json-glib
+    libsoup_3
+    quarrel
   ];
   meta.description = "Astal module for mpris players";
 }
diff --git a/pkgs/development/libraries/astal/modules/notifd.nix b/pkgs/development/libraries/astal/modules/notifd.nix
index a40e5c54091d..d64ecd38b1d6 100644
--- a/pkgs/development/libraries/astal/modules/notifd.nix
+++ b/pkgs/development/libraries/astal/modules/notifd.nix
@@ -2,12 +2,14 @@
   buildAstalModule,
   json-glib,
   gdk-pixbuf,
+  quarrel,
 }:
 buildAstalModule {
   name = "notifd";
   buildInputs = [
     json-glib
     gdk-pixbuf
+    quarrel
   ];
   meta.description = "Astal module for notification daemon";
 }
diff --git a/pkgs/development/libraries/astal/modules/quarrel.nix b/pkgs/development/libraries/astal/modules/quarrel.nix
new file mode 100644
index 000000000000..ee96c6de22fb
--- /dev/null
+++ b/pkgs/development/libraries/astal/modules/quarrel.nix
@@ -0,0 +1,5 @@
+{ buildAstalModule }:
+buildAstalModule {
+  name = "quarrel";
+  meta.description = "Astal module for command line argument parsing";
+}
diff --git a/pkgs/development/libraries/astal/modules/river.nix b/pkgs/development/libraries/astal/modules/river.nix
index bed2492189fe..cdbc3e6fe513 100644
--- a/pkgs/development/libraries/astal/modules/river.nix
+++ b/pkgs/development/libraries/astal/modules/river.nix
@@ -3,6 +3,9 @@ buildAstalModule {
   name = "river";
   buildInputs = [ json-glib ];
   meta.description = "Astal module for River using IPC";
+  # needs https://codeberg.org/kotontrion/wl-vapi-gen,
+  # which has 11 commits and needs to be packaged
+  meta.broken = true;
 
   postUnpack = ''
     rm -rf $sourceRoot/subprojects
diff --git a/pkgs/development/libraries/astal/modules/wl.nix b/pkgs/development/libraries/astal/modules/wl.nix
new file mode 100644
index 000000000000..699e92e5f392
--- /dev/null
+++ b/pkgs/development/libraries/astal/modules/wl.nix
@@ -0,0 +1,9 @@
+{ buildAstalModule }:
+buildAstalModule {
+  name = "wl";
+  buildInputs = [ ];
+  meta.description = "Central wayland connection manager";
+  # needs https://codeberg.org/kotontrion/wl-vapi-gen,
+  # which has 11 commits and needs to be packaged
+  meta.broken = true;
+}
diff --git a/pkgs/development/libraries/astal/source.nix b/pkgs/development/libraries/astal/source.nix
index ecd718b786a5..7e51dc43b61e 100644
--- a/pkgs/development/libraries/astal/source.nix
+++ b/pkgs/development/libraries/astal/source.nix
@@ -7,15 +7,15 @@ let
   originalDrv = fetchFromGitHub {
     owner = "Aylur";
     repo = "astal";
-    rev = "7d1fac8a4b2a14954843a978d2ddde86168c75ef";
-    hash = "sha256-Jh4VtPcK2Ov+RTcV9FtyQRsxiJmXFQGfqX6jjM7/mgc=";
+    rev = "11842ae3045c1367fb3a62a2302dba0d9ccb4a33";
+    hash = "sha256-FGZHls4eQJ8y3pvf5h3b83PfXlve3vD/Gj3g1qoAK6o=";
   };
 in
 originalDrv.overrideAttrs (
   final: prev: {
     name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name
     pname = "astal-source";
-    version = "0-unstable-2025-11-26";
+    version = "0-unstable-2026-06-21";
 
     meta = prev.meta // {
       description = "Building blocks for creating custom desktop shells (source)";

From 2cfae8e16283d5dc6a5d6b232fd82a98130be0f9 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Fri, 22 May 2026 21:01:22 +0200
Subject: [PATCH 10/48] wl-vapi-gen: init at 1.1.0

---
 pkgs/by-name/wl/wl-vapi-gen/package.nix       | 42 +++++++++++++++++++
 .../libraries/astal/modules/river.nix         | 16 ++++---
 .../libraries/astal/modules/wl.nix            |  7 +---
 3 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/by-name/wl/wl-vapi-gen/package.nix

diff --git a/pkgs/by-name/wl/wl-vapi-gen/package.nix b/pkgs/by-name/wl/wl-vapi-gen/package.nix
new file mode 100644
index 000000000000..6b22008deb28
--- /dev/null
+++ b/pkgs/by-name/wl/wl-vapi-gen/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitea,
+  meson,
+  ninja,
+  python3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "wl-vapi-gen";
+  version = "1.1.0";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "kotontrion";
+    repo = "wl-vapi-gen";
+    tag = finalAttrs.version;
+    hash = "sha256-Wi6zDrabUjIXJuxRJ9oHYfKF1ULkim/5kHGb+pl0oc4=";
+  };
+
+  postPatch = ''
+    patchShebangs wl-vapi-gen.py
+  '';
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    python3
+  ];
+
+  meta = {
+    description = "Generate vala bindings for wayland protocols";
+    homepage = "https://codeberg.org/kotontrion/wl-vapi-gen";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.PerchunPak ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/development/libraries/astal/modules/river.nix b/pkgs/development/libraries/astal/modules/river.nix
index cdbc3e6fe513..ad45a5308f7b 100644
--- a/pkgs/development/libraries/astal/modules/river.nix
+++ b/pkgs/development/libraries/astal/modules/river.nix
@@ -1,11 +1,17 @@
-{ buildAstalModule, json-glib }:
+{
+  buildAstalModule,
+  json-glib,
+  wl,
+  wl-vapi-gen,
+}:
 buildAstalModule {
   name = "river";
-  buildInputs = [ json-glib ];
+  nativeBuildInputs = [ wl-vapi-gen ];
+  buildInputs = [
+    json-glib
+    wl
+  ];
   meta.description = "Astal module for River using IPC";
-  # needs https://codeberg.org/kotontrion/wl-vapi-gen,
-  # which has 11 commits and needs to be packaged
-  meta.broken = true;
 
   postUnpack = ''
     rm -rf $sourceRoot/subprojects
diff --git a/pkgs/development/libraries/astal/modules/wl.nix b/pkgs/development/libraries/astal/modules/wl.nix
index 699e92e5f392..ec6fb9f53bc5 100644
--- a/pkgs/development/libraries/astal/modules/wl.nix
+++ b/pkgs/development/libraries/astal/modules/wl.nix
@@ -1,9 +1,6 @@
-{ buildAstalModule }:
+{ buildAstalModule, wl-vapi-gen }:
 buildAstalModule {
   name = "wl";
-  buildInputs = [ ];
+  nativeBuildInputs = [ wl-vapi-gen ];
   meta.description = "Central wayland connection manager";
-  # needs https://codeberg.org/kotontrion/wl-vapi-gen,
-  # which has 11 commits and needs to be packaged
-  meta.broken = true;
 }

From f44715e133c21300e696f592783353e4b9c04433 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Mar 2026 04:40:35 +0000
Subject: [PATCH 11/48] libcava: 0.10.6 -> 0.10.7

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

diff --git a/pkgs/by-name/li/libcava/package.nix b/pkgs/by-name/li/libcava/package.nix
index 0067bd5e99df..985c4283fee2 100644
--- a/pkgs/by-name/li/libcava/package.nix
+++ b/pkgs/by-name/li/libcava/package.nix
@@ -8,13 +8,13 @@
 cava.overrideAttrs (old: rec {
   pname = "libcava";
   # fork may not be updated when we update upstream
-  version = "0.10.6";
+  version = "0.10.7";
 
   src = fetchFromGitHub {
     owner = "LukashonakV";
     repo = "cava";
     tag = version;
-    hash = "sha256-63be1wypMiqhPA6sjMebmFE6yKpTj/bUE53sMWun554=";
+    hash = "sha256-zkyj1vBzHtoypX4Bxdh1Vmwh967DKKxN751v79hzmgQ=";
   };
 
   nativeBuildInputs = old.nativeBuildInputs ++ [

From c6914f42d8400b68e24c9bdadc7d6c9dfe94d441 Mon Sep 17 00:00:00 2001
From: oliwia <oliwia@kanden.me>
Date: Thu, 2 Jul 2026 00:16:19 +0200
Subject: [PATCH 12/48] air-formatter: add shell completions

---
 pkgs/by-name/ai/air-formatter/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix
index 383a59b4a058..7ecf545ef2a3 100644
--- a/pkgs/by-name/ai/air-formatter/package.nix
+++ b/pkgs/by-name/ai/air-formatter/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   versionCheckHook,
   nix-update-script,
+  installShellFiles,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "air-formatter";
@@ -32,6 +33,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
+  nativeBuildInputs = [ installShellFiles ];
+  # TODO: Upstream also provides Elvish and PowerShell completions,
+  # but `installShellCompletion` only has support for Bash, Zsh and Fish at the moment.
+  postInstall = ''
+    installShellCompletion --cmd air-formatter \
+      --bash <($out/bin/air generate-shell-completion bash) \
+      --fish <($out/bin/air generate-shell-completion fish) \
+      --zsh  <($out/bin/air generate-shell-completion zsh)
+  '';
+
   meta = {
     description = "Extremely fast R code formatter";
     homepage = "https://posit-dev.github.io/air";

From d1d7a14e58080de93080642a86a8fa2f8f9e831d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 2 Jul 2026 12:14:42 +0300
Subject: [PATCH 13/48] vscode: fix vsce-sign integrity check

Extension updates fail with signature verification errors since
1.125, because auto-patchelf messes up the vsce-sign binary somehow.

Instead, just copy the original back into place after all the fixups,
and do the smallest amount of patchelfing possible.

(also it's dotnet, not node)
---
 pkgs/applications/editors/vscode/generic.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 752ff76bf682..652b2fab1896 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -308,11 +308,6 @@ stdenv.mkDerivation (
     dontConfigure = true;
     noDumpEnvVars = true;
 
-    stripExclude = lib.optional hasVsceSign [
-      # vsce-sign is a single executable application built with Node.js, and it becomes non-functional if stripped
-      "lib/vscode/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign"
-    ];
-
     installPhase = ''
       runHook preInstall
     ''
@@ -474,9 +469,11 @@ stdenv.mkDerivation (
           --add-needed ${libglvnd}/lib/libEGL.so.1 \
           $out/lib/${libraryName}/${executableName}
       ''
+      # restore original vsce-sign, which has integrity checks
       + (lib.optionalString hasVsceSign ''
+        cp -r ./resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign "$out/lib/vscode/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign"
         patchelf \
-          --add-needed ${lib.getLib openssl}/lib/libssl.so \
+          --add-needed ${lib.getLib openssl}/lib/libssl.so.3 \
           $out/lib/vscode/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign
       '')
     );

From c196cfc8dd5a507a880a1e1938e03939f2c0e836 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Thu, 2 Jul 2026 16:37:19 +0100
Subject: [PATCH 14/48] dawarich: 1.9.1 -> 1.9.2

---
 pkgs/by-name/da/dawarich/gemset.nix   | 12 ++++++------
 pkgs/by-name/da/dawarich/sources.json |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/da/dawarich/gemset.nix b/pkgs/by-name/da/dawarich/gemset.nix
index f8a4edb1f7e4..bea587dcbe93 100644
--- a/pkgs/by-name/da/dawarich/gemset.nix
+++ b/pkgs/by-name/da/dawarich/gemset.nix
@@ -598,10 +598,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1aymcakhzl83k77g2f2krz07bg1cbafbcd2ghvwr4lky3rz86mkb";
+      sha256 = "1c2i64xsd35vijnb50rxb70g508s0x674xi0qpyyb8jy7bncl4j4";
       type = "gem";
     };
-    version = "1.3.6";
+    version = "1.3.7";
   };
   connection_pool = {
     groups = [
@@ -993,10 +993,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1b930ag8nh99v8n9645ac1wcah9fx0mclbp323q4i1ly9acvkk3k";
+      sha256 = "0y7j6yzv07zggic6g0p2v1ivnvkzsbqjnfdl4215qqb6cxz290hq";
       type = "gem";
     };
-    version = "2.14.2";
+    version = "2.14.3";
   };
   faraday-follow_redirects = {
     dependencies = [ "faraday" ];
@@ -1756,10 +1756,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1s30b7h7qpyim30m8060xs415mbr3ci7i5hdg09chh1aqfx2qcbq";
+      sha256 = "1d9safb4dly6qmc2g06444l0zifby52yy6j1a5fa1g4j3ihm3jah";
       type = "gem";
     };
-    version = "1.19.3";
+    version = "1.19.4";
   };
   oauth2 = {
     dependencies = [
diff --git a/pkgs/by-name/da/dawarich/sources.json b/pkgs/by-name/da/dawarich/sources.json
index 0f15d6d74ff3..62bdfb27b777 100644
--- a/pkgs/by-name/da/dawarich/sources.json
+++ b/pkgs/by-name/da/dawarich/sources.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.9.1",
-  "hash": "sha256-ukpX2HOGNh14vbH/2UgjIU13PMBIA8Es2p7sBySAgVQ=",
+  "version": "1.9.2",
+  "hash": "sha256-vUJPMwzYZK/UAFiqnn0fkJH7GJjdBkewfYikK35Tbb4=",
   "npmHash": "sha256-sUDEqvqNrztedUGZRRkD2ythpBQQwpqJz/QleUvqz0Y="
 }

From c35813ffd77ec1a1fc44a8b8fcf85a30aae6e295 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jul 2026 07:51:55 +0000
Subject: [PATCH 15/48] libphonenumber: 9.0.33 -> 9.0.34

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

diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix
index 92e414182c4b..77d745e6a573 100644
--- a/pkgs/by-name/li/libphonenumber/package.nix
+++ b/pkgs/by-name/li/libphonenumber/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libphonenumber";
-  version = "9.0.33";
+  version = "9.0.34";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "libphonenumber";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YsTvJgHBLrIWDJH/SooYDu1ecZyFib7PAqdqcOhHc8Q=";
+    hash = "sha256-KWn58r2Dnh9DMwiESmrF/pN5LPuYe0G7z3TeM+Zp6ZA=";
   };
 
   patches = [

From 0a49e1513030e0e2b29b96dbe78f61af877c4434 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 01:17:38 +0000
Subject: [PATCH 16/48] cargo-tally: 1.0.74 -> 1.0.75

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

diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix
index 78bce4e915c5..202f67d8e835 100644
--- a/pkgs/by-name/ca/cargo-tally/package.nix
+++ b/pkgs/by-name/ca/cargo-tally/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-tally";
-  version = "1.0.74";
+  version = "1.0.75";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-JZtELsvxOx6FFQ+l8fbhPnR8Tt+sQWV4fGsoS8ue4QY=";
+    hash = "sha256-X3VJfzIXxwHPu31wYo79Ei6+S970UHlPPTADlB4CwjI=";
   };
 
-  cargoHash = "sha256-Vn5OSJNpwE3rjs+tYX784o1Khrcf4f21dvb8Yn/c9bY=";
+  cargoHash = "sha256-86V96i5DvydXu1mzxRP6hWW3TA25piubcGRYVJIi/x0=";
 
   meta = {
     description = "Graph the number of crates that depend on your crate over time";

From e967abd42f14160f21f67ca5e6ac99b0be4d2f9e Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 4 Jul 2026 12:58:38 +0800
Subject: [PATCH 17/48] unbound: add DNS-over-QUIC support

---
 pkgs/by-name/un/unbound/package.nix | 12 +++++++++++-
 pkgs/top-level/all-packages.nix     |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix
index 935818521103..b2b52eadbb27 100644
--- a/pkgs/by-name/un/unbound/package.nix
+++ b/pkgs/by-name/un/unbound/package.nix
@@ -31,6 +31,8 @@
   systemd ? null,
   # optionally support DNS-over-HTTPS as a server
   withDoH ? false,
+  # optionally support DNS-over-QUIC as a server
+  withDoQ ? false,
   withECS ? false,
   withDNSCrypt ? false,
   withDNSTAP ? false,
@@ -38,7 +40,7 @@
   withRedis ? false,
   # Avoid .lib depending on lib.getLib openssl
   # The build gets a little hacky, so in some cases we disable this approach.
-  withSlimLib ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP,
+  withSlimLib ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP && !withDoQ,
   # enable support for python plugins in unbound: note this is distinct from pyunbound
   # see https://unbound.docs.nlnetlabs.nl/en/latest/developer/python-modules.html
   withPythonModule ? false,
@@ -47,6 +49,7 @@
   withLto ? !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isMinGW,
   withMakeWrapper ? !stdenv.hostPlatform.isMinGW,
   libnghttp2,
+  ngtcp2,
 
   # for passthru.updateScript
   nix-update-script,
@@ -55,6 +58,9 @@
   versionCheckHook,
 }:
 
+assert lib.assertMsg (
+  !withDoQ || lib.versionAtLeast openssl.version "3.5.0"
+) "unbound: withDoQ requires OpenSSL with QUIC support (OpenSSL >= 3.5)";
 stdenv.mkDerivation (finalAttrs: {
   pname = "unbound";
   version = "1.25.1";
@@ -90,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals withSystemd [ systemd ]
   ++ lib.optionals withDoH [ libnghttp2 ]
+  ++ lib.optionals withDoQ [ ngtcp2 ]
   ++ lib.optionals withPythonModule [ python ];
 
   enableParallelBuilding = true;
@@ -120,6 +127,9 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withDoH [
     "--with-libnghttp2=${libnghttp2.dev}"
   ]
+  ++ lib.optionals withDoQ [
+    "--with-libngtcp2=${ngtcp2.dev}"
+  ]
   ++ lib.optionals withECS [
     "--enable-subnet"
   ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4e48cfb7c1c..a422a0b618c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3054,6 +3054,7 @@ with pkgs;
     withDynlibModule = true;
     withPythonModule = true;
     withDoH = true;
+    withDoQ = true;
     withECS = true;
     withDNSCrypt = true;
     withDNSTAP = true;

From ed374affd1167188e97835e643b5a18fe37ea5fe Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 4 Jul 2026 12:59:03 +0800
Subject: [PATCH 18/48] nixosTests.unbound: support doq

---
 nixos/tests/unbound.nix | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/unbound.nix b/nixos/tests/unbound.nix
index 1e656fc5fcf2..795f4c11c74f 100644
--- a/nixos/tests/unbound.nix
+++ b/nixos/tests/unbound.nix
@@ -7,6 +7,7 @@
     * running a recursive DNS resolver on the local machine, forwarding to a local DNS server via TCP/853 (DoT)
     * running a recursive DNS resolver on a machine in the network awaiting input from clients over TCP/53 & UDP/53
     * running a recursive DNS resolver on a machine in the network awaiting input from clients over TCP/853 (DoT)
+    * running a recursive DNS resolver on a machine in the network awaiting input from clients over UDP/853 (DoQ)
 
   In the below test setup we are trying to implement all of those use cases.
 
@@ -100,7 +101,7 @@ in
       };
 
     # The resolver that knows that forwards (only) to the authoritative server
-    # and listens on UDP/53, TCP/53 & TCP/853.
+    # and listens on UDP/53, TCP/53, TCP/853 & UDP/853.
     resolver =
       { lib, nodes, ... }:
       {
@@ -122,7 +123,10 @@ in
           853 # DNS over TLS
           443 # DNS over HTTPS
         ];
-        networking.firewall.allowedUDPPorts = [ 53 ];
+        networking.firewall.allowedUDPPorts = [
+          53 # regular DNS
+          853 # DNS over QUIC
+        ];
 
         services.unbound = {
           enable = true;
@@ -150,6 +154,8 @@ in
               ];
               tls-service-pem = "${cert}/cert.pem";
               tls-service-key = "${cert}/key.pem";
+              quic-port = 853;
+              quic-size = "8m";
             };
             forward-zone = [
               {
@@ -306,7 +312,7 @@ in
               assert expected == out, f"Expected `{expected}` but got `{out}`"
 
 
-      def test(machine, remotes, /, doh=False, zone=zone, records=records, args=[]):
+      def test(machine, remotes, /, doh=False, doq=False, zone=zone, records=records, args=[]):
           """
           Run queries for the given remotes on the given machine.
           """
@@ -331,6 +337,15 @@ in
                           expected,
                           ["+https"] + args,
                       )
+                  if doq:
+                      query(
+                          machine,
+                          remote,
+                          query_type,
+                          zone,
+                          expected,
+                          ["+quic"] + args,
+                      )
 
 
       client.start()
@@ -348,12 +363,12 @@ in
 
       # verify that the resolver is able to resolve on all the local protocols
       with subtest("test that the resolver resolves on all protocols and transports"):
-          test(resolver, ["::1", "127.0.0.1"], doh=True)
+          test(resolver, ["::1", "127.0.0.1"], doh=True, doq=True)
 
       resolver.wait_for_unit("multi-user.target")
 
       with subtest("client should be able to query the resolver"):
-          test(client, ["${(lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address}", "${(lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address}"], doh=True)
+          test(client, ["${(lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address}", "${(lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address}"], doh=True, doq=True)
 
       # discard the client we do not need anymore
       client.shutdown()

From a21fe8255337ec3e5ce52c99924fb5290abef2f4 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sat, 4 Jul 2026 09:34:44 +0200
Subject: [PATCH 19/48] nixpkgs-openjdk-updater: ignore new lint failure

---
 .../nixpkgs-openjdk-updater/pyproject.toml                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/nixpkgs-openjdk-updater/nixpkgs-openjdk-updater/pyproject.toml b/pkgs/by-name/ni/nixpkgs-openjdk-updater/nixpkgs-openjdk-updater/pyproject.toml
index 1fa811700b05..29f1f3623429 100644
--- a/pkgs/by-name/ni/nixpkgs-openjdk-updater/nixpkgs-openjdk-updater/pyproject.toml
+++ b/pkgs/by-name/ni/nixpkgs-openjdk-updater/nixpkgs-openjdk-updater/pyproject.toml
@@ -28,7 +28,7 @@ line-length = 80
 
 [tool.ruff.lint]
 select = ["ALL"]
-ignore = ["COM812", "D203", "D213", "ISC001", "T201"]
+ignore = ["COM812", "D203", "D213", "ISC001", "T201", "S607"]
 allowed-confusables = ["’"]
 
 [tool.ruff.format]

From d8a5ca07ff59392671e622edee3c3170dbb9ff82 Mon Sep 17 00:00:00 2001
From: tajo48 <tajo48@proton.me>
Date: Sat, 4 Jul 2026 13:03:57 +0200
Subject: [PATCH 20/48] zed-editor: update to 1.9.0

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

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index b75d09f0f2c6..2305ea36a071 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -98,7 +98,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "1.8.2";
+  version = "1.9.0";
 
   outputs = [
     "out"
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j8CwQnVBHvc//4O2N55+4AAAhcARNHGEcccUoSHK8d4=";
+    hash = "sha256-jD77wB/86DsZKO6Qh7pyszK4QgkzfgJthdQhbPVKeh0=";
   };
 
   postPatch = ''
@@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail 'builder.include(&glib_path_config);' 'builder.include("${lib.getLib glib}/lib/glib-2.0/include");'
   '';
 
-  cargoHash = "sha256-zTAIGL5cmswjRqaBgEN+aiyAXMMY9OYZ2bfd6sd1c4Y=";
+  cargoHash = "sha256-sISPA9qZriyN2po3LM5n/YCdosQBgNnA4n9tmq/UC7w=";
 
   __structuredAttrs = true;
 

From 134d5e3c67a388460fa5e0a1923687632381181b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 13:07:56 +0000
Subject: [PATCH 21/48] devin-cli: 2026.8.18 -> 3000.1.23

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

diff --git a/pkgs/by-name/de/devin-cli/package.nix b/pkgs/by-name/de/devin-cli/package.nix
index b32887274fbe..a0599a264759 100644
--- a/pkgs/by-name/de/devin-cli/package.nix
+++ b/pkgs/by-name/de/devin-cli/package.nix
@@ -7,29 +7,29 @@
 }:
 
 let
-  version = "2026.8.18";
+  version = "3000.1.23";
 
   throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-unknown-linux.tar.gz";
-      hash = "sha256-3Uu6IFkwhr9whHR5LBGrDJQovlskGf9cGC7F8QmaBmE=";
+      hash = "sha256-m7DOI/PY0ldm4kRmAxeEQXTiH/R2oT3R8igmtXYA40g=";
     };
 
     aarch64-linux = fetchurl {
       url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-unknown-linux.tar.gz";
-      hash = "sha256-En56i68uCcsP0jhxr5idyeMuO/p/SXsfZWDMUvW/GcY=";
+      hash = "sha256-oOZjPyr3sgaH54KBWQhODFwxrEnuhkTW/rVPwXUAeUY=";
     };
 
     aarch64-darwin = fetchurl {
       url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-apple-darwin.tar.gz";
-      hash = "sha256-n0GtTUnA9OYw4VmAQkGA4rcOGk9ifwYz+ouyJEkZpAo=";
+      hash = "sha256-x+g7kILZuWG2JX4tc+GdIE7XqpHIzWt6+xPQU/gzyeA=";
     };
 
     x86_64-darwin = fetchurl {
       url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-apple-darwin.tar.gz";
-      hash = "sha256-KZ7FeZjOIR+/vW7Tt3BOBQUsShXOglaRbxxGSR6R2Bg=";
+      hash = "sha256-LF1Mk53ds28Avvq+TtyvIu/BPYSHm9tBVjAlUXAyJVU=";
     };
   };
 in

From fe85315685845db6d76ed760c8c88efadc9820d3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Jul 2026 16:02:37 +0200
Subject: [PATCH 22/48] python3Packages.iamdata: 0.1.202607031 -> 0.1.202607041

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202607031...v0.1.202607041

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202607041
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 31e8d17f67dc..8462bb0f72dc 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202607031";
+  version = "0.1.202607041";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aXMdBBInT3JlWwlgjXyxodE9WVvdGNENMS8j6JtJjfk=";
+    hash = "sha256-X4RG1C5/ZPQCdekYfSWhsGTIzQkDsdVNThb0Dhnr8nY=";
   };
 
   __darwinAllowLocalNetworking = true;

From 75393e01daa043b08885c5abceba83f3925a2256 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Jul 2026 16:03:01 +0200
Subject: [PATCH 23/48] python3Packages.publicsuffixlist: 1.0.2.20260702 ->
 1.0.2.20260703

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20260703-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 1301d0977d1c..a22478e601ba 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "publicsuffixlist";
-  version = "1.0.2.20260702";
+  version = "1.0.2.20260703";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-DqicazZHXh8ZzxIpYC8NuvsuGIp4xfrsxk0/AbBLgNA=";
+    hash = "sha256-NTZ4oalz09w74HpiWHRJP95yartWAHc8baWeQPBnZ3Q=";
   };
 
   postPatch = ''

From 123ab7dd87d7044ee33438d67e642716a5bea392 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Jul 2026 16:09:50 +0200
Subject: [PATCH 24/48] python3Packages.pytenable: 26.5.1 -> 26.6.1

Diff: https://github.com/tenable/pyTenable/compare/26.5.1...26.6.1

Changelog: https://github.com/tenable/pyTenable/releases/tag/26.6.1
---
 pkgs/development/python-modules/pytenable/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix
index 4bf9d75941ab..f0a576c45d60 100644
--- a/pkgs/development/python-modules/pytenable/default.nix
+++ b/pkgs/development/python-modules/pytenable/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pytenable";
-  version = "26.5.1";
+  version = "26.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tenable";
     repo = "pyTenable";
     tag = finalAttrs.version;
-    hash = "sha256-o11Lq11btpIwzgZlPMcChHexNOZSFEFOsnaIv1n66uY=";
+    hash = "sha256-KRZbrJgIxdNAnlmP7Ww/JasoDJqJZkBkd0qXm9gfXp4=";
   };
 
   build-system = [ setuptools ];

From bf2ce402b65433c69e0e17562a714cb51b4ff49e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Jul 2026 16:12:56 +0200
Subject: [PATCH 25/48] trufflehog: 3.95.7 -> 3.95.8

Diff: https://github.com/trufflesecurity/trufflehog/compare/v3.95.7...v3.95.8

Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.95.8
---
 pkgs/by-name/tr/trufflehog/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix
index 89b622292c08..ecfeb8ddae8b 100644
--- a/pkgs/by-name/tr/trufflehog/package.nix
+++ b/pkgs/by-name/tr/trufflehog/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "trufflehog";
-  version = "3.95.7";
+  version = "3.95.8";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vCn3V19UOIZg54ppPRnPGEJOtmHO4zkmy7vzu94gscc=";
+    hash = "sha256-STrdxRwo3Q5dE9TmQRzMPtNPBatEWYffO3+cXsAzykI=";
   };
 
   vendorHash = "sha256-KVocEbpKYN/PE1Dnx4KO4V8AGEfYoNMKWZsAtXhLXv4=";

From c2e2997da05cbd9e96e9ceae9177f71850073497 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Jul 2026 16:13:44 +0200
Subject: [PATCH 26/48] maigret: 0.6.1 -> 0.6.2

Diff: https://github.com/soxoj/maigret/compare/v0.6.1...v0.6.2

Changelog: https://github.com/soxoj/maigret/blob/v0.6.2/CHANGELOG.md
---
 pkgs/by-name/ma/maigret/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/maigret/package.nix b/pkgs/by-name/ma/maigret/package.nix
index e81fc6e7b816..428650819675 100644
--- a/pkgs/by-name/ma/maigret/package.nix
+++ b/pkgs/by-name/ma/maigret/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "maigret";
-  version = "0.6.1";
+  version = "0.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "soxoj";
     repo = "maigret";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gojeqNZd0n5Qs7YVFBy6zDdjXR6KKdebcu8vfNs/AE8=";
+    hash = "sha256-KgSf0lM8euahWRYT+acuoH6C+NN08IzkVGzytfnvHEg=";
   };
 
   pythonRelaxDeps = true;

From f091e9bb47f7286a43d639ddd9b605557ffe8b9e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Jul 2026 16:16:35 +0200
Subject: [PATCH 27/48] python3Packages.env-canada: 0.16.0 -> 0.16.1

Diff: https://github.com/michaeldavie/env_canada/compare/v0.16.0...v0.16.1

Changelog: https://github.com/michaeldavie/env_canada/blob/v0.16.1/CHANGELOG.md
---
 pkgs/development/python-modules/env-canada/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix
index f87f56c944ee..ec3682b723f3 100644
--- a/pkgs/development/python-modules/env-canada/default.nix
+++ b/pkgs/development/python-modules/env-canada/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "env-canada";
-  version = "0.16.0";
+  version = "0.16.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "michaeldavie";
     repo = "env_canada";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-99kf2A8nkxWZmhgD/x3YipYpxAJej5RjBTGomS/U8EQ=";
+    hash = "sha256-QSMc7MLN83aNGr8EKbtE1NINZuO2sCuwHs64K1d5b50=";
   };
 
   build-system = [ setuptools ];

From 221463fbecd91a78ebc0f802bdaaaaabc7d68bd7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 14:17:21 +0000
Subject: [PATCH 28/48] gh-dash: 4.24.1 -> 4.25.0

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

diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix
index cef2c082b068..95c5aa9d7abc 100644
--- a/pkgs/by-name/gh/gh-dash/package.nix
+++ b/pkgs/by-name/gh/gh-dash/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gh-dash";
-  version = "4.24.1";
+  version = "4.25.0";
 
   src = fetchFromGitHub {
     owner = "dlvhdr";
     repo = "gh-dash";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-eNmOSYsmB+G0VgVn1ITo/mUyYSeXz43goG/VjYqmiQI=";
+    hash = "sha256-gdjP1jIYI84szuNhP7LgGRMXIPqrRwb8nRWB0BjQF+k=";
   };
 
-  vendorHash = "sha256-fXgj2q0HAGu9Jfdy7NJ6iE5hEKmt50HAEg/9Wds56g0=";
+  vendorHash = "sha256-Teu+8jiZE2gZ+0ErKsunhotY9W4Hjg6PAeFkFLgESIk=";
 
   ldflags = [
     "-s"

From f4e0ce20d6e338cccfa7f6f80678537daab03d18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 15:22:06 +0000
Subject: [PATCH 29/48] 
 vscode-extensions.ms-windows-ai-studio.windows-ai-studio: 1.6.1 -> 1.6.2

---
 .../ms-windows-ai-studio.windows-ai-studio/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
index 4629920fa872..f9bf09ec61d2 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "windows-ai-studio";
     publisher = "ms-windows-ai-studio";
-    version = "1.6.1";
-    hash = "sha256-9q3rK/7Q7XiaH9DZN8Yvar/WTdYdEdRXH02WK1tfk5k=";
+    version = "1.6.2";
+    hash = "sha256-irI7rcyCUc3jUhrEa449pDix3MhwMh18ezvri3bi0Gk=";
   };
 
   meta = {

From b0b5ca6f17b61a44e380dfafeb042f0dec8b3c60 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Jul 2026 17:29:22 +0200
Subject: [PATCH 30/48] python3Packages.yfinance: 1.3.0 -> 1.5.1

Diff: https://github.com/ranaroussi/yfinance/compare/1.3.0...1.5.1

Changelog: https://github.com/ranaroussi/yfinance/blob/1.5.1/CHANGELOG.rst
---
 pkgs/development/python-modules/yfinance/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix
index c0e9180ac754..803a4e2ba470 100644
--- a/pkgs/development/python-modules/yfinance/default.nix
+++ b/pkgs/development/python-modules/yfinance/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "yfinance";
-  version = "1.3.0";
+  version = "1.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ranaroussi";
     repo = "yfinance";
     tag = version;
-    hash = "sha256-z6O1din71ZAZQGm4TEEtrFyB/CZPGPFC+qnfpGrdXgc=";
+    hash = "sha256-5ynbdBys7uTcvsKQB44aoe8PmQgqP28wPtOATcv8I7g=";
   };
 
   build-system = [ setuptools ];

From 43c852abe810a1d1ca16d278fd59b4009bfd6f25 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Jul 2026 17:35:54 +0200
Subject: [PATCH 31/48] python3Packages.yfinance: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix
index 803a4e2ba470..d4257108c7b8 100644
--- a/pkgs/development/python-modules/yfinance/default.nix
+++ b/pkgs/development/python-modules/yfinance/default.nix
@@ -23,7 +23,7 @@
   websockets,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "yfinance";
   version = "1.5.1";
   pyproject = true;
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ranaroussi";
     repo = "yfinance";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-5ynbdBys7uTcvsKQB44aoe8PmQgqP28wPtOATcv8I7g=";
   };
 
@@ -62,9 +62,7 @@ buildPythonPackage rec {
       requests-cache
       requests-ratelimiter
     ];
-    repair = [
-      scipy
-    ];
+    repair = [ scipy ];
   };
 
   # Tests require internet access
@@ -75,8 +73,8 @@ buildPythonPackage rec {
   meta = {
     description = "Module to doiwnload Yahoo! Finance market data";
     homepage = "https://github.com/ranaroussi/yfinance";
-    changelog = "https://github.com/ranaroussi/yfinance/blob/${src.tag}/CHANGELOG.rst";
+    changelog = "https://github.com/ranaroussi/yfinance/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
     license = lib.licenses.asl20;
     maintainers = [ ];
   };
-}
+})

From 910bad259d846e2897ad75df11b80bd5c8062766 Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Sat, 4 Jul 2026 18:09:33 +0200
Subject: [PATCH 32/48] treewide: follow some GitHub redirects for
 `fetchFromGitHub`

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

continuation of: #538077
---
 pkgs/by-name/ef/effitask/package.nix                | 4 ++--
 pkgs/by-name/ek/eksctl/package.nix                  | 4 ++--
 pkgs/by-name/el/elfcat/package.nix                  | 4 ++--
 pkgs/by-name/em/embree/package.nix                  | 2 +-
 pkgs/by-name/em/emissary/package.nix                | 6 +++---
 pkgs/by-name/en/ente-auth/package.nix               | 8 ++++----
 pkgs/by-name/en/ente-cli/package.nix                | 6 +++---
 pkgs/by-name/en/ente-desktop/package.nix            | 4 ++--
 pkgs/by-name/en/ente-web/package.nix                | 6 +++---
 pkgs/by-name/es/esshader/package.nix                | 4 ++--
 pkgs/by-name/et/etherpad-lite/package.nix           | 4 ++--
 pkgs/by-name/ev/evcxr/package.nix                   | 4 ++--
 pkgs/by-name/ev/eventstore/package.nix              | 4 ++--
 pkgs/by-name/ex/expected-lite/package.nix           | 6 +++---
 pkgs/by-name/fa/faba-icon-theme/package.nix         | 2 +-
 pkgs/by-name/fc/fcitx5-tokyonight/package.nix       | 4 ++--
 pkgs/by-name/fc/fcppt/package.nix                   | 2 +-
 pkgs/by-name/fe/feather-tk/package.nix              | 6 +++---
 pkgs/by-name/fe/ferrishot/package.nix               | 6 +++---
 pkgs/by-name/fe/fet-sh/package.nix                  | 4 ++--
 pkgs/by-name/fi/findup/package.nix                  | 4 ++--
 pkgs/by-name/fl/flintlock/package.nix               | 2 +-
 pkgs/by-name/fl/fluxcd-operator-mcp/package.nix     | 2 +-
 pkgs/by-name/fl/fluxcd-operator/package.nix         | 2 +-
 pkgs/by-name/fl/flye/package.nix                    | 4 ++--
 pkgs/by-name/fo/fooyin/package.nix                  | 2 +-
 pkgs/by-name/fo/foxmarks/package.nix                | 6 +++---
 pkgs/by-name/fp/fprettify/package.nix               | 2 +-
 pkgs/by-name/fr/freebayes/package.nix               | 4 ++--
 pkgs/by-name/fr/frescobaldi/package.nix             | 2 +-
 pkgs/by-name/fs/fsql/package.nix                    | 4 ++--
 pkgs/by-name/fs/fsrx/package.nix                    | 4 ++--
 pkgs/by-name/fw/fwup/package.nix                    | 4 ++--
 pkgs/by-name/ga/galaxy-buds-client/package.nix      | 4 ++--
 pkgs/by-name/ge/gemget/package.nix                  | 4 ++--
 pkgs/by-name/gi/git-annex-remote-rclone/package.nix | 4 ++--
 pkgs/by-name/gi/git-bug-migration/package.nix       | 4 ++--
 pkgs/by-name/gi/git-graph/package.nix               | 4 ++--
 pkgs/by-name/gi/git-igitt/package.nix               | 4 ++--
 pkgs/by-name/gi/git-quick-stats/package.nix         | 4 ++--
 pkgs/by-name/gi/git-repo/package.nix                | 2 +-
 pkgs/by-name/gi/gitflow/package.nix                 | 4 ++--
 pkgs/by-name/gi/gitqlient/package.nix               | 4 ++--
 pkgs/by-name/gl/glabels-qt/package.nix              | 4 ++--
 pkgs/by-name/gl/glava/package.nix                   | 4 ++--
 pkgs/by-name/gm/gmap/package.nix                    | 6 +++---
 pkgs/by-name/gn/gnome-inform7/package.nix           | 4 ++--
 pkgs/by-name/gn/gnome-pomodoro/package.nix          | 4 ++--
 pkgs/by-name/go/go-autoconfig/package.nix           | 4 ++--
 pkgs/by-name/go/go-dnscollector/package.nix         | 4 ++--
 50 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/pkgs/by-name/ef/effitask/package.nix b/pkgs/by-name/ef/effitask/package.nix
index 363554688ae6..7fc694d37356 100644
--- a/pkgs/by-name/ef/effitask/package.nix
+++ b/pkgs/by-name/ef/effitask/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "1.4.2";
 
   src = fetchFromGitHub {
-    owner = "sanpii";
+    owner = "todotxt-rs";
     repo = "effitask";
     rev = finalAttrs.version;
     sha256 = "sha256-6BA/TCCqVh5rtgGkUgk8nIqUzozipC5rrkbXMDWYpdQ=";
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       Or use it as standalone program by defining some environment variables
       like described in the projects readme.
     '';
-    homepage = "https://github.com/sanpii/effitask";
+    homepage = "https://github.com/todotxt-rs/effitask";
     maintainers = with lib.maintainers; [ davidak ];
     license = with lib.licenses; [ mit ];
     mainProgram = "effitask";
diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix
index c8f79d529781..5c130c809433 100644
--- a/pkgs/by-name/ek/eksctl/package.nix
+++ b/pkgs/by-name/ek/eksctl/package.nix
@@ -11,7 +11,7 @@ buildGoModule (finalAttrs: {
   version = "0.226.0";
 
   src = fetchFromGitHub {
-    owner = "weaveworks";
+    owner = "eksctl-io";
     repo = "eksctl";
     rev = finalAttrs.version;
     hash = "sha256-XjiM4o4xJPY+ZFtvWi5K99tQaZwNxiCla/jUeQQo+5E=";
@@ -46,7 +46,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "CLI for Amazon EKS";
-    homepage = "https://github.com/weaveworks/eksctl";
+    homepage = "https://github.com/eksctl-io/eksctl";
     changelog = "https://github.com/eksctl-io/eksctl/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/el/elfcat/package.nix b/pkgs/by-name/el/elfcat/package.nix
index cb3dc8582637..28cad761edf5 100644
--- a/pkgs/by-name/el/elfcat/package.nix
+++ b/pkgs/by-name/el/elfcat/package.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.1.10";
 
   src = fetchFromGitHub {
-    owner = "ruslashev";
+    owner = "rbakbashev";
     repo = "elfcat";
     rev = finalAttrs.version;
     sha256 = "sha256-8jyOYV455APlf8F6HmgyvgfNGddMzrcGhj7yFQT6qvg=";
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "ELF visualizer, generates HTML files from ELF binaries";
-    homepage = "https://github.com/ruslashev/elfcat";
+    homepage = "https://github.com/rbakbashev/elfcat";
     license = lib.licenses.zlib;
     maintainers = with lib.maintainers; [ moni ];
     mainProgram = "elfcat";
diff --git a/pkgs/by-name/em/embree/package.nix b/pkgs/by-name/em/embree/package.nix
index 3ae3f3ad15f0..7fe937c20fbe 100644
--- a/pkgs/by-name/em/embree/package.nix
+++ b/pkgs/by-name/em/embree/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "4.4.1";
 
   src = fetchFromGitHub {
-    owner = "embree";
+    owner = "RenderKit";
     repo = "embree";
     tag = "v${finalAttrs.version}";
     hash = "sha256-ZJItp33XUmaTk5s4AbM/uzWGxSdGh5scdZAZDBYy28M=";
diff --git a/pkgs/by-name/em/emissary/package.nix b/pkgs/by-name/em/emissary/package.nix
index 8f4293038f95..adc4a39eacf3 100644
--- a/pkgs/by-name/em/emissary/package.nix
+++ b/pkgs/by-name/em/emissary/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.3.1";
 
   src = fetchFromGitHub {
-    owner = "altonen";
+    owner = "eepnet";
     repo = "emissary";
     tag = "v${finalAttrs.version}";
     hash = "sha256-fLhvMzdxXAuEB99NgIfTLxYezIIZVaC8Z6snK9UUEl0=";
@@ -30,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __darwinAllowLocalNetworking = true;
 
   meta = {
-    changelog = "https://github.com/altonen/emissary/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/eepnet/emissary/releases/tag/${finalAttrs.version}";
     description = "Rust implementation of the I2P protocol stack";
     homepage = "https://altonen.github.io/emissary/";
-    license = lib.licenses.mit; # https://github.com/altonen/emissary/blob/master/LICENSE (found an apache2 as well but thats for https://github.com/altonen/emissary/commit/c4a1c849ebfceba892adce53f512f1f099721de2)
+    license = lib.licenses.mit; # https://github.com/eepnet/emissary/blob/master/LICENSE (found an apache2 as well but thats for https://github.com/eepnet/emissary/commit/c4a1c849ebfceba892adce53f512f1f099721de2)
     mainProgram = "emissary-cli";
     maintainers = [ lib.maintainers.N4CH723HR3R ];
   };
diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index ceee123b2076..8e401dad5ba9 100644
--- a/pkgs/by-name/en/ente-auth/package.nix
+++ b/pkgs/by-name/en/ente-auth/package.nix
@@ -20,7 +20,7 @@ flutter.buildFlutterApplication rec {
   version = "4.4.17";
 
   src = fetchFromGitHub {
-    owner = "ente-io";
+    owner = "ente";
     repo = "ente";
     sparseCheckout = [ "mobile" ];
     tag = "auth-v${version}";
@@ -94,8 +94,8 @@ flutter.buildFlutterApplication rec {
     "--dart-define=app.flavor=independent"
   ];
 
-  # Based on https://github.com/ente-io/ente/blob/main/auth/linux/packaging/rpm/make_config.yaml
-  # and https://github.com/ente-io/ente/blob/main/auth/linux/packaging/enteauth.appdata.xml
+  # Based on https://github.com/ente/ente/blob/main/auth/linux/packaging/rpm/make_config.yaml
+  # and https://github.com/ente/ente/blob/main/auth/linux/packaging/enteauth.appdata.xml
   desktopItems = [
     (makeDesktopItem {
       name = desktopId;
@@ -138,7 +138,7 @@ flutter.buildFlutterApplication rec {
       Ente's 2FA app. An end-to-end encrypted, cross platform and free app for storing your 2FA codes with cloud backups. Works offline. You can even use it without signing up for an account if you don't want the cloud backups or multi-device sync.
     '';
     homepage = "https://ente.io/auth/";
-    changelog = "https://github.com/ente-io/ente/releases/tag/auth-v${version}";
+    changelog = "https://github.com/ente/ente/releases/tag/auth-v${version}";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
       niklaskorz
diff --git a/pkgs/by-name/en/ente-cli/package.nix b/pkgs/by-name/en/ente-cli/package.nix
index a4e5a7994861..44fcafa74a91 100644
--- a/pkgs/by-name/en/ente-cli/package.nix
+++ b/pkgs/by-name/en/ente-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
   version = "0.2.3";
 
   src = fetchFromGitHub {
-    owner = "ente-io";
+    owner = "ente";
     repo = "ente";
     tag = "cli-v${finalAttrs.version}";
     hash = "sha256-qKMFoNtD5gH0Y+asD0LR5d3mxGpr2qVWXIUzJTSezeI=";
@@ -83,8 +83,8 @@ buildGoModule (finalAttrs: {
     longDescription = ''
       The Ente CLI is a Command Line Utility for exporting data from Ente. It also does a few more things, for example, you can use it to decrypting the export from Ente Auth.
     '';
-    homepage = "https://github.com/ente-io/ente/tree/main/cli#readme";
-    changelog = "https://github.com/ente-io/ente/releases/tag/cli-v${finalAttrs.version}";
+    homepage = "https://github.com/ente/ente/tree/main/cli#readme";
+    changelog = "https://github.com/ente/ente/releases/tag/cli-v${finalAttrs.version}";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ zi3m5f ];
     mainProgram = "ente";
diff --git a/pkgs/by-name/en/ente-desktop/package.nix b/pkgs/by-name/en/ente-desktop/package.nix
index d579610bf834..b53c3c24aa1a 100644
--- a/pkgs/by-name/en/ente-desktop/package.nix
+++ b/pkgs/by-name/en/ente-desktop/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.7.24";
 
   src = fetchFromGitHub {
-    owner = "ente-io";
+    owner = "ente";
     repo = "ente";
     fetchSubmodules = true;
     sparseCheckout = [
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   # The desktop item properties should be kept in sync with data from upstream:
-  # https://github.com/ente-io/ente/blob/main/desktop/electron-builder.yml
+  # https://github.com/ente/ente/blob/main/desktop/electron-builder.yml
   desktopItems = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     (makeDesktopItem {
       name = "ente-desktop";
diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix
index 7ba48dbf8d3f..726296c7641a 100644
--- a/pkgs/by-name/en/ente-web/package.nix
+++ b/pkgs/by-name/en/ente-web/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.3.36";
 
   src = fetchFromGitHub {
-    owner = "ente-io";
+    owner = "ente";
     repo = "ente";
     sparseCheckout = [
       "rust"
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     wasm-pack
   ];
 
-  # See: https://github.com/ente-io/ente/blob/main/web/apps/photos/.env
+  # See: https://github.com/ente/ente/blob/main/web/apps/photos/.env
   env = extraBuildEnv;
 
   postPatch =
@@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Ente application web frontends";
     homepage = "https://ente.io/";
-    changelog = "https://github.com/ente-io/ente/releases";
+    changelog = "https://github.com/ente/ente/releases";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
       pinpox
diff --git a/pkgs/by-name/es/esshader/package.nix b/pkgs/by-name/es/esshader/package.nix
index 731a0889482f..e155aa590528 100644
--- a/pkgs/by-name/es/esshader/package.nix
+++ b/pkgs/by-name/es/esshader/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   version = "0-unstable-2020-08-09";
 
   src = fetchFromGitHub {
-    owner = "cmcsun";
+    owner = "chrismcfee";
     repo = "esshader";
     rev = "506eb02f3de52d3d1f4d81ac9ee145655216dee5";
     sha256 = "sha256-euxJw7CqOwi6Ndzalps37kDr5oOIL3tZICCfmxsujfk=";
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Offline ShaderToy-compatible GLSL shader viewer using OpenGL ES 2.0";
-    homepage = "https://github.com/cmcsun/esshader";
+    homepage = "https://github.com/chrismcfee/esshader";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ astro ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/et/etherpad-lite/package.nix b/pkgs/by-name/et/etherpad-lite/package.nix
index b6736566c593..c11097e00aab 100644
--- a/pkgs/by-name/et/etherpad-lite/package.nix
+++ b/pkgs/by-name/et/etherpad-lite/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "ether";
-    repo = "etherpad-lite";
+    repo = "etherpad";
     tag = "v${finalAttrs.version}";
     hash = "sha256-8DCgbfp3ttpMTXS9SNkN1R63LZHaklsNHViRhmWVFuk=";
   };
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
       It provides full data export capabilities, and runs on your server, under your control.
     '';
     homepage = "https://etherpad.org/";
-    changelog = "https://github.com/ether/etherpad-lite/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/ether/etherpad/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     maintainers = with lib.maintainers; [
       erdnaxe
       f2k1de
diff --git a/pkgs/by-name/ev/evcxr/package.nix b/pkgs/by-name/ev/evcxr/package.nix
index 7df91febe656..2c78a9670cbc 100644
--- a/pkgs/by-name/ev/evcxr/package.nix
+++ b/pkgs/by-name/ev/evcxr/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.21.1";
 
   src = fetchFromGitHub {
-    owner = "google";
+    owner = "evcxr";
     repo = "evcxr";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-8dV+NNtU4HFerrgRyc1kO+MSsMTJJItTtJylEIN014g=";
@@ -91,7 +91,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Evaluation context for Rust";
-    homepage = "https://github.com/google/evcxr";
+    homepage = "https://github.com/evcxr/evcxr";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       protoben
diff --git a/pkgs/by-name/ev/eventstore/package.nix b/pkgs/by-name/ev/eventstore/package.nix
index 51452be3c28b..156cc0d5983d 100644
--- a/pkgs/by-name/ev/eventstore/package.nix
+++ b/pkgs/by-name/ev/eventstore/package.nix
@@ -19,8 +19,8 @@ buildDotnetModule rec {
   version = "24.10.6";
 
   src = fetchFromGitHub {
-    owner = "EventStore";
-    repo = "EventStore";
+    owner = "kurrent-io";
+    repo = "KurrentDB";
     tag = "v${version}";
     hash = "sha256-8/sagvMyJ1/onGMuJ28QLWI5M8dBDWyGOcZKUv3PJsQ=";
     leaveDotGit = true;
diff --git a/pkgs/by-name/ex/expected-lite/package.nix b/pkgs/by-name/ex/expected-lite/package.nix
index e0a3828f6a0e..75c6d2e63e55 100644
--- a/pkgs/by-name/ex/expected-lite/package.nix
+++ b/pkgs/by-name/ex/expected-lite/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "0.10.0";
 
   src = fetchFromGitHub {
-    owner = "martinmoene";
+    owner = "nonstd-lite";
     repo = "expected-lite";
     rev = "v${finalAttrs.version}";
     hash = "sha256-nxwdymBNbd+RuL8rKi2Fx2gC68TnJe7WnoN0O01lecQ=";
@@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
     description = ''
       Expected objects in C++11 and later in a single-file header-only library
     '';
-    homepage = "https://github.com/martinmoene/expected-lite";
-    changelog = "https://github.com/martinmoene/expected-lite/blob/${finalAttrs.src.rev}/CHANGES.txt";
+    homepage = "https://github.com/nonstd-lite/expected-lite";
+    changelog = "https://github.com/nonstd-lite/expected-lite/blob/${finalAttrs.src.rev}/CHANGES.txt";
     license = lib.licenses.boost;
     maintainers = with lib.maintainers; [ azahi ];
   };
diff --git a/pkgs/by-name/fa/faba-icon-theme/package.nix b/pkgs/by-name/fa/faba-icon-theme/package.nix
index 5029b4ed65c1..5e0091e8c078 100644
--- a/pkgs/by-name/fa/faba-icon-theme/package.nix
+++ b/pkgs/by-name/fa/faba-icon-theme/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
   version = "4.3";
 
   src = fetchFromGitHub {
-    owner = "moka-project";
+    owner = "snwh";
     repo = "faba-icon-theme";
     rev = "v${version}";
     sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n";
diff --git a/pkgs/by-name/fc/fcitx5-tokyonight/package.nix b/pkgs/by-name/fc/fcitx5-tokyonight/package.nix
index ad36f5b5146b..3f6d551a58da 100644
--- a/pkgs/by-name/fc/fcitx5-tokyonight/package.nix
+++ b/pkgs/by-name/fc/fcitx5-tokyonight/package.nix
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation {
   version = "0-unstable-2024-01-28";
 
   src = fetchFromGitHub {
-    owner = "ch3n9w";
+    owner = "ch4xer";
     repo = "fcitx5-Tokyonight";
     rev = "f7454ab387d6b071ee12ff7ee819f0c7030fdf2c";
     hash = "sha256-swOy0kDZUdqtC2sPSZEBLnHSs8dpQ/QfFMObI6BARfo=";
@@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation {
 
   meta = {
     description = "Fcitx5 theme based on Tokyo Night color";
-    homepage = "https://github.com/ch3n9w/fcitx5-Tokyonight";
+    homepage = "https://github.com/ch4xer/fcitx5-Tokyonight";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ Guanran928 ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/fc/fcppt/package.nix b/pkgs/by-name/fc/fcppt/package.nix
index df48ce23a374..4d94ebee34b1 100644
--- a/pkgs/by-name/fc/fcppt/package.nix
+++ b/pkgs/by-name/fc/fcppt/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "5.0.0";
 
   src = fetchFromGitHub {
-    owner = "freundlich";
+    owner = "cpreh";
     repo = "fcppt";
     rev = finalAttrs.version;
     hash = "sha256-8dBG6LdSngsutBboqb3WVVg3ylayoUYDOJV6p/ZFkoE=";
diff --git a/pkgs/by-name/fe/feather-tk/package.nix b/pkgs/by-name/fe/feather-tk/package.nix
index 01e3d32a0085..e91d5a8c87e6 100644
--- a/pkgs/by-name/fe/feather-tk/package.nix
+++ b/pkgs/by-name/fe/feather-tk/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "0.4.0";
 
   src = fetchFromGitHub {
-    owner = "darbyjohnston";
+    owner = "grizzlypeak3d";
     repo = "feather-tk";
     tag = finalAttrs.version;
     hash = "sha256-hcV99y14o3YFUtKDLEKaR7MxBB3pBdd3sferrYvtvYw=";
@@ -90,12 +90,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Lightweight toolkit for building cross-platform applications";
-    homepage = "https://github.com/darbyjohnston/feather-tk";
+    homepage = "https://github.com/grizzlypeak3d/feather-tk";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ liberodark ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     badPlatforms = [
-      # Broken on darwin with latest SDK, see https://github.com/darbyjohnston/feather-tk/issues/1
+      # Broken on darwin with latest SDK, see https://github.com/grizzlypeak3d/feather-tk/issues/1
       lib.systems.inspect.patterns.isDarwin
     ];
   };
diff --git a/pkgs/by-name/fe/ferrishot/package.nix b/pkgs/by-name/fe/ferrishot/package.nix
index 11aba642b5d7..24e2f8156e6e 100644
--- a/pkgs/by-name/fe/ferrishot/package.nix
+++ b/pkgs/by-name/fe/ferrishot/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "nik-rev";
-    repo = "ferrishot";
+    repo = "peashot";
     tag = "v${finalAttrs.version}";
     hash = "sha256-QnIHLkxqL/4s6jgIbGmzR5tqCjH7yJcfpx0AhdxqVKc=";
   };
@@ -60,8 +60,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Screenshot app written in Rust";
-    homepage = "https://github.com/nik-rev/ferrishot";
-    changelog = "https://github.com/nik-rev/ferrishot/blob/v${finalAttrs.version}/CHANGELOG.md";
+    homepage = "https://github.com/nik-rev/peashot";
+    changelog = "https://github.com/nik-rev/peashot/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
     mainProgram = "ferrishot";
diff --git a/pkgs/by-name/fe/fet-sh/package.nix b/pkgs/by-name/fe/fet-sh/package.nix
index b25c819b79f2..91c7dcd1e1e9 100644
--- a/pkgs/by-name/fe/fet-sh/package.nix
+++ b/pkgs/by-name/fe/fet-sh/package.nix
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
   version = "1.9";
 
   src = fetchFromGitHub {
-    owner = "6gk";
+    owner = "eepykate";
     repo = "fet.sh";
     rev = "v${version}";
     sha256 = "sha256-xhX2nVteC3T3IjQh++mYlm0btDJQbyQa6b8sGualV0E=";
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = {
     description = "Fetch written in posix shell without any external commands";
-    homepage = "https://github.com/6gk/fet.sh";
+    homepage = "https://github.com/eepykate/fet.sh";
     license = lib.licenses.isc;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ elkowar ];
diff --git a/pkgs/by-name/fi/findup/package.nix b/pkgs/by-name/fi/findup/package.nix
index 0f5fd7506215..b158d8385d74 100644
--- a/pkgs/by-name/fi/findup/package.nix
+++ b/pkgs/by-name/fi/findup/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.0.0";
 
   src = fetchFromGitHub {
-    owner = "booniepepper";
+    owner = "so-dang-cool";
     repo = "findup";
     tag = "v${finalAttrs.version}";
     hash = "sha256-6/rQ4xNfzJQwJgrpvFRuirqlx6fVn7sLXfVRFsG3fUw=";
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = {
-    homepage = "https://github.com/booniepepper/findup";
+    homepage = "https://github.com/so-dang-cool/findup";
     description = "Search parent directories for sentinel files";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ booniepepper ];
diff --git a/pkgs/by-name/fl/flintlock/package.nix b/pkgs/by-name/fl/flintlock/package.nix
index da890d978f6d..a7ec82cf2afb 100644
--- a/pkgs/by-name/fl/flintlock/package.nix
+++ b/pkgs/by-name/fl/flintlock/package.nix
@@ -14,7 +14,7 @@ buildGoModule (finalAttrs: {
   version = "0.8.1";
 
   src = fetchFromGitHub {
-    owner = "weaveworks";
+    owner = "liquidmetal-dev";
     repo = "flintlock";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-Kbk94sqj0aPsVonPsiu8kbjhIOURB1kX9Lt3NURL+jk=";
diff --git a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
index 09e787515f45..d47e5dfc5548 100644
--- a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
+++ b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
@@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "controlplaneio-fluxcd";
-    repo = "fluxcd-operator";
+    repo = "flux-operator";
     tag = "v${finalAttrs.version}";
     hash = "sha256-l+IJtFmVR3WZaFW4aaYjirTqj+X1FGLAVgbA21MHO1k=";
   };
diff --git a/pkgs/by-name/fl/fluxcd-operator/package.nix b/pkgs/by-name/fl/fluxcd-operator/package.nix
index 6e6cf8bcd6b3..532f254a30be 100644
--- a/pkgs/by-name/fl/fluxcd-operator/package.nix
+++ b/pkgs/by-name/fl/fluxcd-operator/package.nix
@@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "controlplaneio-fluxcd";
-    repo = "fluxcd-operator";
+    repo = "flux-operator";
     tag = "v${finalAttrs.version}";
     hash = "sha256-l+IJtFmVR3WZaFW4aaYjirTqj+X1FGLAVgbA21MHO1k=";
   };
diff --git a/pkgs/by-name/fl/flye/package.nix b/pkgs/by-name/fl/flye/package.nix
index 6e1800ff3110..facbf31db95f 100644
--- a/pkgs/by-name/fl/flye/package.nix
+++ b/pkgs/by-name/fl/flye/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "fenderglass";
+    owner = "mikolmogorov";
     repo = "flye";
     tag = finalAttrs.version;
     hash = "sha256-ZdrAxPKY3+HJ388tGCdpDcvW70mJ5wd4uOUkuufyqK8=";
@@ -56,7 +56,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   meta = {
     description = "De novo assembler for single molecule sequencing reads using repeat graphs";
-    homepage = "https://github.com/fenderglass/Flye";
+    homepage = "https://github.com/mikolmogorov/Flye";
     license = lib.licenses.bsd3;
     mainProgram = "flye";
     maintainers = with lib.maintainers; [ assistant ];
diff --git a/pkgs/by-name/fo/fooyin/package.nix b/pkgs/by-name/fo/fooyin/package.nix
index cdaf7c3925bd..282241d50064 100644
--- a/pkgs/by-name/fo/fooyin/package.nix
+++ b/pkgs/by-name/fo/fooyin/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "0.9.2";
 
   src = fetchFromGitHub {
-    owner = "ludouzi";
+    owner = "fooyin";
     repo = "fooyin";
     tag = "v" + finalAttrs.version;
     hash = "sha256-sQ1zsQ/6OHGPkofiKhusCrpW2XnO+PpMvH1M2OG5Huw=";
diff --git a/pkgs/by-name/fo/foxmarks/package.nix b/pkgs/by-name/fo/foxmarks/package.nix
index 75d8a217ef15..83bdf1a6a8f8 100644
--- a/pkgs/by-name/fo/foxmarks/package.nix
+++ b/pkgs/by-name/fo/foxmarks/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "2.1.1";
 
   src = fetchFromGitHub {
-    owner = "zer0-x";
+    owner = "zefr0x";
     repo = "foxmarks";
     rev = "v${finalAttrs.version}";
     hash = "sha256-6lJ9acVo444RMxc3wUakBz4zT74oNUpwoP69rdf2mmE=";
@@ -22,8 +22,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "CLI read-only interface for Mozilla Firefox's bookmarks";
-    homepage = "https://github.com/zer0-x/foxmarks";
-    changelog = "https://github.com/zer0-x/foxmarks/blob/v${finalAttrs.version}/CHANGELOG.md";
+    homepage = "https://github.com/zefr0x/foxmarks";
+    changelog = "https://github.com/zefr0x/foxmarks/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ loicreynier ];
   };
diff --git a/pkgs/by-name/fp/fprettify/package.nix b/pkgs/by-name/fp/fprettify/package.nix
index 71bae9aa8d1f..7eceee491925 100644
--- a/pkgs/by-name/fp/fprettify/package.nix
+++ b/pkgs/by-name/fp/fprettify/package.nix
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "pseewald";
+    owner = "fortran-lang";
     repo = "fprettify";
     rev = "v${finalAttrs.version}";
     sha256 = "17v52rylmsy3m3j5fcb972flazykz2rvczqfh8mxvikvd6454zyj";
diff --git a/pkgs/by-name/fr/freebayes/package.nix b/pkgs/by-name/fr/freebayes/package.nix
index dfcad223285a..0e1c820f06dd 100644
--- a/pkgs/by-name/fr/freebayes/package.nix
+++ b/pkgs/by-name/fr/freebayes/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub {
     name = "freebayes-${finalAttrs.version}-src";
-    owner = "ekg";
+    owner = "freebayes";
     repo = "freebayes";
     tag = "v${finalAttrs.version}";
     sha256 = "035nriknjqq8gvil81vvsmvqwi35v80q8h1cw24vd1gdyn1x7bys";
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Bayesian haplotype-based polymorphism discovery and genotyping";
     license = lib.licenses.mit;
-    homepage = "https://github.com/ekg/freebayes";
+    homepage = "https://github.com/freebayes/freebayes";
     maintainers = with lib.maintainers; [ jdagilliland ];
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/by-name/fr/frescobaldi/package.nix b/pkgs/by-name/fr/frescobaldi/package.nix
index e0c0cbaa91b9..b3a673bd85c8 100644
--- a/pkgs/by-name/fr/frescobaldi/package.nix
+++ b/pkgs/by-name/fr/frescobaldi/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "wbsoft";
+    owner = "frescobaldi";
     repo = "frescobaldi";
     tag = "v${version}";
     hash = "sha256-IgvjKj0+8oNbuZ91n4O16kGXBS7rS63HQUNQnJcOis8=";
diff --git a/pkgs/by-name/fs/fsql/package.nix b/pkgs/by-name/fs/fsql/package.nix
index bceca65e53f6..552bc13ea5d2 100644
--- a/pkgs/by-name/fs/fsql/package.nix
+++ b/pkgs/by-name/fs/fsql/package.nix
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
   version = "0.5.2";
 
   src = fetchFromGitHub {
-    owner = "kshvmdn";
+    owner = "kashav";
     repo = "fsql";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-U6TPszqsZvoz+9GIB0wNYMRJqIDLOp/BZO3/k8FC0Gs=";
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Search through your filesystem with SQL-esque queries";
-    homepage = "https://github.com/kshvmdn/fsql";
+    homepage = "https://github.com/kashav/fsql";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pSub ];
     mainProgram = "fsql";
diff --git a/pkgs/by-name/fs/fsrx/package.nix b/pkgs/by-name/fs/fsrx/package.nix
index ea6cf0f2a74f..840774ed52fd 100644
--- a/pkgs/by-name/fs/fsrx/package.nix
+++ b/pkgs/by-name/fs/fsrx/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "1.0.2";
 
   src = fetchFromGitHub {
-    owner = "thatvegandev";
+    owner = "jrnxf";
     repo = "fsrx";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-hzfpjunP20WCt3erYu7AO7A3nz+UMKdFzWUA5jASbVA=";
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Flow state reader in the terminal";
-    homepage = "https://github.com/thatvegandev/fsrx";
+    homepage = "https://github.com/jrnxf/fsrx";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ MoritzBoehme ];
     mainProgram = "fsrx";
diff --git a/pkgs/by-name/fw/fwup/package.nix b/pkgs/by-name/fw/fwup/package.nix
index 40207fd2677c..3ecaa0d8bf8e 100644
--- a/pkgs/by-name/fw/fwup/package.nix
+++ b/pkgs/by-name/fw/fwup/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.15.1";
 
   src = fetchFromGitHub {
-    owner = "fhunleth";
+    owner = "fwup-home";
     repo = "fwup";
     tag = "v${finalAttrs.version}";
     hash = "sha256-SIRDVlC/g+rq5m4Ind7dqPzjdCjAxRK/kAdXt6byL/8=";
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     changelog = "https://github.com/fwup-home/fwup/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "Configurable embedded Linux firmware update creator and runner";
-    homepage = "https://github.com/fhunleth/fwup";
+    homepage = "https://github.com/fwup-home/fwup";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.georgewhewell ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/ga/galaxy-buds-client/package.nix b/pkgs/by-name/ga/galaxy-buds-client/package.nix
index 666d47379a26..b1c06c92cd30 100644
--- a/pkgs/by-name/ga/galaxy-buds-client/package.nix
+++ b/pkgs/by-name/ga/galaxy-buds-client/package.nix
@@ -22,7 +22,7 @@ buildDotnetModule rec {
   version = "5.2.1";
 
   src = fetchFromGitHub {
-    owner = "ThePBone";
+    owner = "timschneeb";
     repo = "GalaxyBudsClient";
     tag = version;
     hash = "sha256-jPVrSkf6Bybwc5glkxId5VeWkwLBoTjOzM3CCgO6h9I=";
@@ -85,7 +85,7 @@ buildDotnetModule rec {
 
   meta = {
     description = "Unofficial Galaxy Buds Manager";
-    homepage = "https://github.com/ThePBone/GalaxyBudsClient";
+    homepage = "https://github.com/timschneeb/GalaxyBudsClient";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ icy-thought ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ge/gemget/package.nix b/pkgs/by-name/ge/gemget/package.nix
index 18ac03146fed..871f88e5cc1e 100644
--- a/pkgs/by-name/ge/gemget/package.nix
+++ b/pkgs/by-name/ge/gemget/package.nix
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
   version = "1.9.0";
 
   src = fetchFromGitHub {
-    owner = "makeworld-the-better-one";
+    owner = "makew0rld";
     repo = "gemget";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-P5+yRaf2HioKOclJMMm8bJ8/BtBbNEeYU57TceZVqQ8=";
@@ -19,7 +19,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Command line downloader for the Gemini protocol";
-    homepage = "https://github.com/makeworld-the-better-one/gemget";
+    homepage = "https://github.com/makew0rld/gemget";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ amfl ];
     mainProgram = "gemget";
diff --git a/pkgs/by-name/gi/git-annex-remote-rclone/package.nix b/pkgs/by-name/gi/git-annex-remote-rclone/package.nix
index fb9c6fcebb7d..a6f8b99fd3c9 100644
--- a/pkgs/by-name/gi/git-annex-remote-rclone/package.nix
+++ b/pkgs/by-name/gi/git-annex-remote-rclone/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   version = "0.8";
 
   src = fetchFromGitHub {
-    owner = "DanielDent";
+    owner = "git-annex-remote-rclone";
     repo = "git-annex-remote-rclone";
     rev = "v${version}";
     sha256 = "sha256-B6x67XXE4BHd3x7a8pQlqPPmpy0c62ziDAldB4QpqQ4=";
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://github.com/DanielDent/git-annex-remote-rclone";
+    homepage = "https://github.com/git-annex-remote-rclone/git-annex-remote-rclone";
     description = "Use rclone supported cloud storage providers with git-annex";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/gi/git-bug-migration/package.nix b/pkgs/by-name/gi/git-bug-migration/package.nix
index 62d838767ffc..2825f58d1e62 100644
--- a/pkgs/by-name/gi/git-bug-migration/package.nix
+++ b/pkgs/by-name/gi/git-bug-migration/package.nix
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
   version = "0.3.4";
 
   src = fetchFromGitHub {
-    owner = "MichaelMure";
+    owner = "git-bug";
     repo = "git-bug-migration";
     rev = "v${finalAttrs.version}";
     hash = "sha256-IOBgrU3C0ZHD2wx9LRVgKEJzDlUj6z2UXlHGU3tdTdQ=";
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Tool for upgrading repositories using git-bug to new versions";
-    homepage = "https://github.com/MichaelMure/git-bug-migration";
+    homepage = "https://github.com/git-bug/git-bug-migration";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       DeeUnderscore
diff --git a/pkgs/by-name/gi/git-graph/package.nix b/pkgs/by-name/gi/git-graph/package.nix
index e582b795899f..48a9acc8f009 100644
--- a/pkgs/by-name/gi/git-graph/package.nix
+++ b/pkgs/by-name/gi/git-graph/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.7.0";
 
   src = fetchFromGitHub {
-    owner = "mlange-42";
+    owner = "git-bahn";
     repo = "git-graph";
     tag = "v${finalAttrs.version}";
     hash = "sha256-9GFwxWYDnH3kKDWpxgh7ciSLB1Zr2zExxIrIrhycmZY=";
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Command line tool to show clear git graphs arranged for your branching model";
-    homepage = "https://github.com/mlange-42/git-graph";
+    homepage = "https://github.com/git-bahn/git-graph";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       cafkafk
diff --git a/pkgs/by-name/gi/git-igitt/package.nix b/pkgs/by-name/gi/git-igitt/package.nix
index 1ae12698e0d0..97a9dabda083 100644
--- a/pkgs/by-name/gi/git-igitt/package.nix
+++ b/pkgs/by-name/gi/git-igitt/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.1.21";
 
   src = fetchFromGitHub {
-    owner = "mlange-42";
+    owner = "git-bahn";
     repo = "git-igitt";
     rev = "v${finalAttrs.version}";
     hash = "sha256-5AVKBew+HShWFZwm4xRmRSL76N2c84Yi97jgcqsslxM=";
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Interactive, cross-platform Git terminal application with clear git graphs arranged for your branching model";
-    homepage = "https://github.com/mlange-42/git-igitt";
+    homepage = "https://github.com/git-bahn/git-igitt";
     license = lib.licenses.mit;
     sourceProvenance = [ lib.sourceTypes.fromSource ];
     maintainers = [ lib.maintainers.pinage404 ];
diff --git a/pkgs/by-name/gi/git-quick-stats/package.nix b/pkgs/by-name/gi/git-quick-stats/package.nix
index eebf32503476..2b9295f3f650 100644
--- a/pkgs/by-name/gi/git-quick-stats/package.nix
+++ b/pkgs/by-name/gi/git-quick-stats/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub {
     repo = "git-quick-stats";
-    owner = "arzzen";
+    owner = "git-quick-stats";
     rev = finalAttrs.version;
     sha256 = "sha256-YVvlrlNRDDci7fH9LW4NxZcIkakVgvKe9FhJ2gCfoXg=";
   };
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
   meta = {
-    homepage = "https://github.com/arzzen/git-quick-stats";
+    homepage = "https://github.com/git-quick-stats/git-quick-stats";
     description = "Simple and efficient way to access various statistics in git repository";
     platforms = lib.platforms.all;
     maintainers = [ lib.maintainers.kmein ];
diff --git a/pkgs/by-name/gi/git-repo/package.nix b/pkgs/by-name/gi/git-repo/package.nix
index 913ebe0ba977..1229c78825b1 100644
--- a/pkgs/by-name/gi/git-repo/package.nix
+++ b/pkgs/by-name/gi/git-repo/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.59";
 
   src = fetchFromGitHub {
-    owner = "android";
+    owner = "aosp-mirror";
     repo = "tools_repo";
     rev = "v${finalAttrs.version}";
     hash = "sha256-5ffk5B4ZA/Wy2bQNahFaXPFRSZdKz5t6TaGbN00mfxo=";
diff --git a/pkgs/by-name/gi/gitflow/package.nix b/pkgs/by-name/gi/gitflow/package.nix
index b2ebf7e011af..b409a66c666a 100644
--- a/pkgs/by-name/gi/gitflow/package.nix
+++ b/pkgs/by-name/gi/gitflow/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "petervanderdoes";
-    repo = "gitflow";
+    repo = "gitflow-avh";
     rev = finalAttrs.version;
     sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8=";
   };
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    homepage = "https://github.com/petervanderdoes/gitflow";
+    homepage = "https://github.com/petervanderdoes/gitflow-avh";
     description = "Extend git with the Gitflow branching model";
     mainProgram = "git-flow";
     longDescription = ''
diff --git a/pkgs/by-name/gi/gitqlient/package.nix b/pkgs/by-name/gi/gitqlient/package.nix
index a787c695cb05..468779b5c886 100644
--- a/pkgs/by-name/gi/gitqlient/package.nix
+++ b/pkgs/by-name/gi/gitqlient/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.6.3-unstable-2025-09-11"; # cmake does not install correctly on tagged release
 
   src = fetchFromGitHub {
-    owner = "francescmm";
+    owner = "francescmaestre";
     repo = "gitqlient";
     rev = "faa3e2c19205123944bb88427a569c6f1b4366a1";
     fetchSubmodules = true;
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # QCheckBox::stateChanged is deprecated
 
   meta = {
-    homepage = "https://github.com/francescmm/GitQlient";
+    homepage = "https://github.com/francescmaestre/GitQlient";
     description = "Multi-platform Git client written with Qt";
     license = lib.licenses.lgpl2Plus;
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/gl/glabels-qt/package.nix b/pkgs/by-name/gl/glabels-qt/package.nix
index a8aeff04dea0..da8c47a5c03c 100644
--- a/pkgs/by-name/gl/glabels-qt/package.nix
+++ b/pkgs/by-name/gl/glabels-qt/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   version = "unstable-2025-12-03";
 
   src = fetchFromGitHub {
-    owner = "jimevins";
+    owner = "j-evins";
     repo = "glabels-qt";
     tag = "3.99-master602";
     hash = "sha256-7MQufoU1GBvmZd8FRn331/PwmwQMuZeuFKQqViRI754=";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "GLabels Label Designer (Qt/C++)";
-    homepage = "https://github.com/jimevins/glabels-qt";
+    homepage = "https://github.com/j-evins/glabels-qt";
     license = lib.licenses.gpl3Only;
     maintainers = [ lib.maintainers.matthewcroughan ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/gl/glava/package.nix b/pkgs/by-name/gl/glava/package.nix
index 3c3e1f120c48..2e6d9e087899 100644
--- a/pkgs/by-name/gl/glava/package.nix
+++ b/pkgs/by-name/gl/glava/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.6.3";
 
   src = fetchFromGitHub {
-    owner = "wacossusca34";
+    owner = "jarcode-foss";
     repo = "glava";
     rev = "v${finalAttrs.version}";
     sha256 = "0kqkjxmpqkmgby05lsf6c6iwm45n33jk5qy6gi3zvjx4q4yzal1i";
@@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
       OpenGL audio spectrum visualizer
     '';
     mainProgram = "glava";
-    homepage = "https://github.com/wacossusca34/glava";
+    homepage = "https://github.com/jarcode-foss/glava";
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/gm/gmap/package.nix b/pkgs/by-name/gm/gmap/package.nix
index 70d096d88261..3bf9a926464a 100644
--- a/pkgs/by-name/gm/gmap/package.nix
+++ b/pkgs/by-name/gm/gmap/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.3.3";
 
   src = fetchFromGitHub {
-    owner = "seeyebe";
+    owner = "marawny";
     repo = "gmap";
     tag = finalAttrs.version;
     hash = "sha256-+klVySOgI/M57f98Cx3omkEBx/NcaWD4FuIW6cz1aN8=";
@@ -41,8 +41,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       Built for developers who live in the CLI and want quick,
       powerful insights.
     '';
-    homepage = "https://github.com/seeyebe/gmap";
-    changelog = "https://github.com/seeyebe/gmap/releases/tag/${finalAttrs.src.tag}";
+    homepage = "https://github.com/marawny/gmap";
+    changelog = "https://github.com/marawny/gmap/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ yiyu ];
     mainProgram = "gmap";
diff --git a/pkgs/by-name/gn/gnome-inform7/package.nix b/pkgs/by-name/gn/gnome-inform7/package.nix
index 3a3aaeccc1bc..053242e88679 100644
--- a/pkgs/by-name/gn/gnome-inform7/package.nix
+++ b/pkgs/by-name/gn/gnome-inform7/package.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
   version = "unstable-2021-04-06";
   src = fetchFromGitHub {
     owner = "ptomato";
-    repo = "gnome-inform7";
+    repo = "inform7-ide";
     # build from revision in the GTK3 branch as mainline requires webkit-1.0
     rev = "c37e045c159692aae2e4e79b917e5f96cfefa66a";
     sha256 = "Q4xoITs3AYXhvpWaABRAvJaUWTtUl8lYQ1k9zX7FrNw=";
@@ -143,7 +143,7 @@ stdenv.mkDerivation {
     longDescription = ''
       This version of Inform 7 for the Gnome platform was created by Philip Chimento, based on a design by Graham Nelson and Andrew Hunter.
     '';
-    homepage = "https://github.com/ptomato/gnome-inform7";
+    homepage = "https://github.com/ptomato/inform7-ide";
     license = lib.licenses.gpl3Only;
     maintainers = [ lib.maintainers.fitzgibbon ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/gn/gnome-pomodoro/package.nix b/pkgs/by-name/gn/gnome-pomodoro/package.nix
index 910f4e10025b..9ecc2e4d1e63 100644
--- a/pkgs/by-name/gn/gnome-pomodoro/package.nix
+++ b/pkgs/by-name/gn/gnome-pomodoro/package.nix
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
   version = "0.28.1";
 
   src = fetchFromGitHub {
-    owner = "gnome-pomodoro";
-    repo = "gnome-pomodoro";
+    owner = "focustimerhq";
+    repo = "FocusTimer";
     rev = version;
     hash = "sha256-1G0Sv6uR4rE+/TZqEM57mCdBaXoJNpC0cznY4pnPEa4=";
   };
diff --git a/pkgs/by-name/go/go-autoconfig/package.nix b/pkgs/by-name/go/go-autoconfig/package.nix
index 7bc04faedf45..4805c6addbd4 100644
--- a/pkgs/by-name/go/go-autoconfig/package.nix
+++ b/pkgs/by-name/go/go-autoconfig/package.nix
@@ -9,7 +9,7 @@ buildGoModule {
   version = "unstable-2022-08-03";
 
   src = fetchFromGitHub {
-    owner = "L11R";
+    owner = "savely-krasovsky";
     repo = "go-autoconfig";
     rev = "b1b182202da82cc881dccd715564853395d4f76a";
     sha256 = "sha256-Rbg6Ghp5NdcLSLSIhwwFFMKmZPWsboDyHCG6ePqSSZA=";
@@ -23,7 +23,7 @@ buildGoModule {
 
   meta = {
     description = "IMAP/SMTP autodiscover feature for Thunderbird, Apple Mail and Microsoft Outlook";
-    homepage = "https://github.com/L11R/go-autoconfig";
+    homepage = "https://github.com/savely-krasovsky/go-autoconfig";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ onny ];
     mainProgram = "go-autoconfig";
diff --git a/pkgs/by-name/go/go-dnscollector/package.nix b/pkgs/by-name/go/go-dnscollector/package.nix
index c44b26210ccc..15376daf0f01 100644
--- a/pkgs/by-name/go/go-dnscollector/package.nix
+++ b/pkgs/by-name/go/go-dnscollector/package.nix
@@ -10,7 +10,7 @@ buildGoModule (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "dmachard";
-    repo = "go-dnscollector";
+    repo = "DNS-collector";
     tag = "v${finalAttrs.version}";
     hash = "sha256-Gm5PXEEgw98NnsfKN8JxhyTqEL9KSA6L2CgRTRJirdY=";
   };
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Ingesting, pipelining, and enhancing your DNS logs with usage indicators, security analysis, and additional metadata";
-    homepage = "https://github.com/dmachard/go-dnscollector";
+    homepage = "https://github.com/dmachard/DNS-collector";
     changelog = "https://github.com/dmachard/DNS-collector/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ shift ];

From dfb964308f976c6dc13fc6a644a1d060d54d433c Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 4 Jul 2026 13:18:01 -0400
Subject: [PATCH 33/48] zoxide: 0.9.9 -> 0.10.0

Diff: https://github.com/ajeetdsouza/zoxide/compare/v0.9.9...v0.10.0

Changelog: https://github.com/ajeetdsouza/zoxide/blob/v0.10.0/CHANGELOG.md
---
 pkgs/by-name/zo/zoxide/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix
index 877ea5379d04..80f6457629a4 100644
--- a/pkgs/by-name/zo/zoxide/package.nix
+++ b/pkgs/by-name/zo/zoxide/package.nix
@@ -15,13 +15,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zoxide";
-  version = "0.9.9";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "ajeetdsouza";
     repo = "zoxide";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2scJ5/+A3ZSpIdce5GLYqxjc0so9sVsYiXNULmjMzLY=";
+    hash = "sha256-BLGjsmljY2UZSWmbRX+Xf5sIgSBrDviKGzXjyGmB+2w=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace '"fzf"' '"${fzf}/bin/fzf"'
   '';
 
-  cargoHash = "sha256-4BXZ5NnwY2izzJFkPkECKvpuyFWfZ2CguybDDk0GDU0=";
+  cargoHash = "sha256-5Be/eIMn3JurFIhoPK6B5L054lLPek9CR93zTJzJS6w=";
 
   passthru = {
     tests = {

From 516e7623c357e3e6cf7b30b734867d13fe070730 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 4 Jul 2026 13:30:52 -0400
Subject: [PATCH 34/48] nixpkgs-vet: 0.3.3 -> 0.3.4

Changelog: https://github.com/NixOS/nixpkgs-vet/blob/refs/tags/v0.3.4/CHANGELOG.md
---
 pkgs/by-name/ni/nixpkgs-vet/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nixpkgs-vet/package.nix b/pkgs/by-name/ni/nixpkgs-vet/package.nix
index cd48e79fae2a..73ba007b1018 100644
--- a/pkgs/by-name/ni/nixpkgs-vet/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-vet/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nixpkgs-vet";
-  version = "0.3.3";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "nixpkgs-vet";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vOKZ5Da6PMI39WlOS7CXDME3oCvJw64dQDEfaCsDL0A=";
+    hash = "sha256-+A4KmOIOC7glVOdW+jxSwQnrBHVej4QqwxTsOQin07U=";
   };
 
-  cargoHash = "sha256-9XQvmYO4bw57NoKsXTY281fMQE0vjV3pvoRlrUaRX3o=";
+  cargoHash = "sha256-bWmI79H6yQjxoWxcZ7GgqbxIc8fCLB1I4g9WF2IejVI=";
 
   doCheck = false;
 

From 0e3bfa61ddf40f436b34d41ff584357033ba98bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 17:41:11 +0000
Subject: [PATCH 35/48] terraform-providers.tencentcloudstack_tencentcloud:
 1.83.6 -> 1.83.7

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 067b3ac11152..5653a043d33c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1319,11 +1319,11 @@
     "vendorHash": "sha256-7ZoJg1HEVj5Nygr46lmBZeJDfZuU4F90yntrgkBVgGg="
   },
   "tencentcloudstack_tencentcloud": {
-    "hash": "sha256-p8AW+AzezOP6N3wzlLZOMoTbSwb/cil7cmXkdwheXtE=",
+    "hash": "sha256-tADmls3GAmR3S5wdasoHrBYOtZTVXDS2alZD6Mzfo4M=",
     "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
     "owner": "tencentcloudstack",
     "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.83.6",
+    "rev": "v1.83.7",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 6697fe1302f8fcecc495e0e6f6d3f05b7934fc1d Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 4 Jul 2026 13:55:15 -0400
Subject: [PATCH 36/48] claude-code: 2.1.199 -> 2.1.201

Changelog: https://github.com/anthropics/claude-code/blob/v2.1.201/CHANGELOG.md
---
 pkgs/by-name/cl/claude-code/manifest.json | 38 +++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json
index 0e61e0e3f62c..7632d291fb4a 100644
--- a/pkgs/by-name/cl/claude-code/manifest.json
+++ b/pkgs/by-name/cl/claude-code/manifest.json
@@ -1,47 +1,47 @@
 {
-  "version": "2.1.199",
-  "commit": "968b0c4118bde7c998acd97511e68daecacd8507",
-  "buildDate": "2026-07-02T01:58:04Z",
+  "version": "2.1.201",
+  "commit": "5bb45156ece6b12214696c88adec695b2dca1338",
+  "buildDate": "2026-07-03T20:01:44Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "e3cb61abc8a2ec7b98976cee1ffdde5a3fa755c9990bc8d688cd89290e0dcec0",
-      "size": 232155536
+      "checksum": "a0852d76afc47b30f5cb0b7625ec9a7714cb189f2eeef6c28c77e2be954fb7fd",
+      "size": 231708784
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "e64853ff3bc2ae6ed8115581c851e1176762d445d0b8b9e0dd37d0d560224a88",
-      "size": 240192080
+      "checksum": "1889287a92d25356ae8bd8d8e67b11456015516ee8ba4277a0c7074786c49bb6",
+      "size": 241100240
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "14851b5170b154b01baca09bba970172e70cdd768b5a012bf347ba0f594b4ad3",
-      "size": 247184112
+      "checksum": "86b2eab34d382c7b428fc2e9f4c97f04e46805e950582472a13eb7d48de60516",
+      "size": 248101616
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "b31dfd5e3dee23b51c42e0d8ddb405148978237d3aabc8cbbf77c5cf83367e27",
-      "size": 250383160
+      "checksum": "a34809a6839fdefff21b9347d7fb5b6b58e6a9cc208a5e62853f29c83eb107a3",
+      "size": 251300664
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "4115c07bc6dfa71affff595400599032b70b4ab25b7a2dae982341ef4da47b38",
-      "size": 240432312
+      "checksum": "5b4cde588b0196c8f88654ca9652c4703788f4d9fbab32a17ab3c444830085ae",
+      "size": 241349816
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "22c8b0861078cef1b572023e7eda4ce0dda7e12cc2e3060858eaa3de010bee21",
-      "size": 245068160
+      "checksum": "a0f81ec99ac65e8c5919e7aae54b8a496488e0f1311884fc9ffd05c7cbf6bd2f",
+      "size": 245985664
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "63de670613bb74594564a2125cb54e0e2e78192c5696e396adfae093b9132eec",
-      "size": 240716448
+      "checksum": "fb804ee019bfbb8d7e85abf965e528e53b5aa5a4e4ebc0f164139dc10a9e0320",
+      "size": 241591968
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "7e4900b1ce5588003e0ade6caa0aaef1e2b8efd903c5a86c671d0de258b7a4d4",
-      "size": 235182752
+      "checksum": "a3ad78a0b593dea94c3ee787b1f5b17a173a7679203a296acf9aae7ef4705d42",
+      "size": 236058784
     }
   }
 }

From 7b10c4fb196cef88d7cfc24bcdd7c06739dc2e28 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 4 Jul 2026 13:56:17 -0400
Subject: [PATCH 37/48] vscode-extensions.anthropic.claude-code: 2.1.199 ->
 2.1.201

---
 .../extensions/anthropic.claude-code/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 3e3bacae576e..57bb91f5d47b 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-n6UmUqfzOADzZzJMvY40gBCBKYgDtig41AD1aieA/kQ=";
+          hash = "sha256-/uvQIg773WUzalc9XFtBrocsGye3v5y1rvKyJVpXWS0=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-/T7H1itSllf1h6vPzXlwokBvNOVQjZjNuhmC/ocqmPI=";
+          hash = "sha256-zC0iYoAxmymxdqo2JgDcMOvUOA3pFbkx0s9C4F6E75k=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-qj9K/BlKbl5ZuowRMSVBXLknM6NeOxtIYynIcSE+K5A=";
+          hash = "sha256-mhZBWpV3Gl5TLieIEvrtDmtqQBKeiCcDCwOShQnp++Y=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-kXKnSZ6VQa/NPXroEbQT1pNwIy1eKnIDgOWX5WvA3JI=";
+          hash = "sha256-I570YO5mvXgzXG52NdoGjgVgHbyshm6fIkCIN0li9+4=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.199";
+      version = "2.1.201";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From 531f8c6fe4fa05fb0b3300c1172437b8d520e442 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 18:46:19 +0000
Subject: [PATCH 38/48] python3Packages.ggml-python: 0.0.44 -> 0.0.45

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

diff --git a/pkgs/development/python-modules/ggml-python/default.nix b/pkgs/development/python-modules/ggml-python/default.nix
index a1f6fbe59375..acb346e7486a 100644
--- a/pkgs/development/python-modules/ggml-python/default.nix
+++ b/pkgs/development/python-modules/ggml-python/default.nix
@@ -35,7 +35,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "ggml-python";
-  version = "0.0.44";
+  version = "0.0.45";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -45,7 +45,7 @@ buildPythonPackage (finalAttrs: {
     tag = "v${finalAttrs.version}";
     # ggml-python expects an older version of ggml than pkgs.ggml's
     fetchSubmodules = true;
-    hash = "sha256-Pjc91nKBAdmEg8TmirWdD1AcKlY+BCDAoHzL6mTE2SM=";
+    hash = "sha256-rPbYp6if9bCiQGfM7ZC84hkJKadE2mwC9N3elgVfQBc=";
   };
 
   build-system = [

From aa19ec523158b0c80c917f4ae5aa7bb9ce6bb19c Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon@is.currently.online>
Date: Mon, 4 May 2026 09:34:22 -0400
Subject: [PATCH 39/48] nixos-containers: fix dummyConfig localMacAddress
 default

In a13b423085 ("nixos-containers: allow hard-coding container veth MAC address &
add IPv6 SLAAC test case (#462775)") I had a typo in the `localMacAddress`
setting used for the dummy container config to generate the systemd service
template. I don't think this actually causes any breakage, but it's good to fix
for consistency's sake nonetheless.
---
 nixos/modules/virtualisation/nixos-containers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index dd9177a5bd21..ea904528caec 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -520,7 +520,7 @@ let
     hostAddress6 = null;
     localAddress = null;
     localAddress6 = null;
-    localmacAddress = null;
+    localMacAddress = null;
     tmpfs = null;
   };
 

From 6b81af202361de12d52f56ba6ba5e6f22c9beb48 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Mon, 29 Jun 2026 13:53:26 +0200
Subject: [PATCH 40/48] docs/readme: clarify future scope of source files in
 doc folder

---
 doc/README.md | 101 +++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 88 insertions(+), 13 deletions(-)

diff --git a/doc/README.md b/doc/README.md
index 4fafb9f575b8..adfa7233e1fb 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,21 +1,32 @@
-# Contributing to the Nixpkgs reference manual
+# Contributing to the Nixpkgs manual
 
-This directory houses the source files for the Nixpkgs reference manual.
+This directory houses the source files for the Nixpkgs manual.
 
-> [!IMPORTANT]
-> We are actively restructuring our documentation to follow the [Diátaxis framework](https://diataxis.fr/)
+> [!NOTE]
 >
-> Going forward, this directory should **only** contain [reference documentation](https://nix.dev/contributing/documentation/diataxis#reference).
-> For tutorials, guides and explanations, contribute to <https://nix.dev/> instead.
+> We are actively restructuring our documentation to be more beginner friendly.
 >
-> We are actively working to generate **all** reference documentation from the [doc-comments](https://github.com/NixOS/rfcs/blob/master/rfcs/0145-doc-strings.md) present in code.
-> This also provides the benefit of using `:doc` in the `nix repl` to view reference documentation locally on the fly.
 
-For documentation only relevant for contributors, use Markdown files next to the source and regular code comments.
+When writing new docs use **Progressive Disclosure**
 
-> [!TIP]
-> Feedback for improving support for parsing and rendering doc-comments is highly appreciated.
-> [Open an issue](https://github.com/NixOS/nixpkgs/issues/new?labels=6.topic%3A+documentation&title=Doc%3A+) to request bugfixes or new features.
+Start simple, pick up beginners.
+Use **examples** first to show how to get something done. Keep **Explanation** lean.
+
+Use our [styleguide](./styleguide.md) for more in depth guidance on writing good documentation.
+
+This directory contains **guides** and **reference** documentation for Nixpkgs.
+
+Borrowing from [Diátaxis framework](https://diataxis.fr/) what suits our needs:
+
+**Guides** are task-oriented. They can be tutorial-style walkthroughs or how-to sections.
+Explanations appear as prose after examples.
+
+**Reference** documentation is the specification of functions and attributes.
+
+We are actively working to generate **all** reference documentation from the [doc-comments](https://github.com/NixOS/rfcs/blob/master/rfcs/0145-doc-strings.md) present in code.
+This also provides the benefit of using `:doc` in the `nix repl` to view reference documentation locally on the fly.
+
+See [Document structure](#document-structure) for a structural template.
 
 Rendered documentation:
 - [Unstable (from master)](https://nixos.org/manual/nixpkgs/unstable/)
@@ -209,6 +220,62 @@ You, as the writer of documentation, are still in charge of its content.
 
 **For prose style, see the [documentation styleguide](./styleguide.md).**
 
+### Document structure
+
+Organize each chapter as guide sections first, then a single `## Reference` section.
+
+A well-structured chapter looks like this:
+
+````markdown
+# Foo {#foo}
+
+`foo` builds Foo projects from a `foo.toml`.
+
+## Package a Foo application {#foo-packaging}
+
+:::{.example #ex-foo-packaging}
+
+# Package the hello app
+
+```nix
+{ foo }:
+buildFooPackage {
+  pname = "hello";
+  version = "1.0";
+}
+```
+
+:::
+
+`buildFooPackage` needs `pname` and `version`.
+Keep explanation short, and place it after the example.
+
+## Reference {#foo-reference}
+
+### `buildFooPackage` {#foo-buildFooPackage}
+
+Builds a Foo application from source.
+
+#### Inputs {#foo-buildFooPackage-inputs}
+
+`pname` (String)
+: The program name.
+
+#### Examples {#foo-buildFooPackage-examples}
+
+See [](#ex-foo-packaging).
+````
+
+Examples live in one place: the guide owns them and the reference links to them.
+
+Guides introduce minimal working examples that are goal-oriented (typical usage).
+
+Reference may introduce additional examples that are unit-oriented. (minimal usage, edge-cases).
+If the guide example is already sufficient, just link to it from the reference.
+
+Follow this structure strictly; to deviate, ping @NixOS/documentation-team.
+
+
 ### One sentence per line
 
 Put each sentence in its own line.
@@ -284,7 +351,15 @@ Use the [admonition syntax](#admonitions) for callouts and examples.
 
 ### `callPackage`-compatible examples
 
-Provide at least one example per function.
+Provide at least one example per function, in its doc-comment.
+
+Keep each example at the level it documents:
+
+- A **reference example** might sometimes live in a doc-comment and show function call shape.
+- A **guide example** lives in a guide section and shows a complete task that may compose several functions.
+
+When the task is nothing more than the call itself, the guide example is enough.
+The reference example links to the guide example.
 
 Example code should be such that it can be passed to `pkgs.callPackage`.
 Instead of something like:

From 31dd67110e771ac993075e9f317ab8a11b79c41a Mon Sep 17 00:00:00 2001
From: Gautier DI FOLCO <foss@difolco.dev>
Date: Mon, 22 Jun 2026 23:11:20 +0200
Subject: [PATCH 41/48] snip: 0.15.0 -> 0.20.0

https://github.com/edouard-claude/snip/releases/tag/v0.20.0

Added git to nativeCheckInputs to satisfy TestRunCommandHelpAfterSeparator,
which shells out to `git --help`.

Assisted-by: Z.Ai/GLM-5.2
---
 pkgs/by-name/sn/snip/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sn/snip/package.nix b/pkgs/by-name/sn/snip/package.nix
index 563d66d02c57..6091c029014a 100644
--- a/pkgs/by-name/sn/snip/package.nix
+++ b/pkgs/by-name/sn/snip/package.nix
@@ -2,21 +2,24 @@
   lib,
   fetchFromGitHub,
   buildGoModule,
+  gitMinimal,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "snip";
-  version = "0.15.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "edouard-claude";
     repo = "snip";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pRYxTHNdR2NGiE+RdThcmz3zVP5rKVRbt+IEILIgavk=";
+    hash = "sha256-u6Jc9U4tb5Y/evtWR/Nw535xVh09ChcKN0Dm+l3bjvA=";
   };
 
   vendorHash = "sha256-2MxFZqjNuLzcuu+bsLyOyHIakCxh7j0FUx8LsjZRhrY=";
 
+  nativeCheckInputs = [ gitMinimal ];
+
   ldflags = [
     "-s"
     "-w"

From cc02ad6df4eb79b2b9ea6980e22b26d014e52366 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 4 Jul 2026 19:39:27 +0000
Subject: [PATCH 42/48] python3Packages.ai-edge-litert: use badPlatforms
 instead of broken to disable on darwin

---
 pkgs/development/python-modules/ai-edge-litert/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ai-edge-litert/default.nix b/pkgs/development/python-modules/ai-edge-litert/default.nix
index 2ff94fab2e96..54d02f69b2b5 100644
--- a/pkgs/development/python-modules/ai-edge-litert/default.nix
+++ b/pkgs/development/python-modules/ai-edge-litert/default.nix
@@ -84,7 +84,6 @@ buildPythonPackage {
   passthru.updateScript = ./update.py;
 
   meta = {
-    broken = stdenv.hostPlatform.isDarwin; # elftools.common.exceptions.ELFError: Magic number does not match
     changelog = "https://github.com/google-ai-edge/LiteRT/releases/tag/v${release.version}";
     description = "LiteRT is for mobile and embedded devices";
     downloadPage = "https://github.com/google-ai-edge/LiteRT";
@@ -93,5 +92,9 @@ buildPythonPackage {
     platforms = lib.attrNames platforms;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = with lib.maintainers; [ hexa ];
+    badPlatforms = [
+      # elftools.common.exceptions.ELFError: Magic number does not match
+      lib.systems.inspect.patterns.isDarwin
+    ];
   };
 }

From f6c3e9f7d1861bbb3589f0ecedfed5ecb7f04c3e Mon Sep 17 00:00:00 2001
From: lukas-sgx <lukas.soigneux@epitech.eu>
Date: Thu, 2 Jul 2026 21:08:25 +0000
Subject: [PATCH 43/48] nagstamon: 3.16.2 -> 3.18.2

Diff: https://github.com/HenriWahl/Nagstamon/compare/v3.16.2...v3.18.2

Changelog: https://github.com/HenriWahl/Nagstamon/releases/tag/v3.18.2
---
 pkgs/by-name/na/nagstamon/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/na/nagstamon/package.nix b/pkgs/by-name/na/nagstamon/package.nix
index 075bc3c814d6..64b3a880920c 100644
--- a/pkgs/by-name/na/nagstamon/package.nix
+++ b/pkgs/by-name/na/nagstamon/package.nix
@@ -7,14 +7,16 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "nagstamon";
-  version = "3.16.2";
+  version = "3.18.2";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "HenriWahl";
     repo = "Nagstamon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9w8ux+AeSg0vDhnk28/2eCE2zYLvAjD7mB0pJBMFs2I=";
+    hash = "sha256-ZA6gxV9zLKZ0g5v8CvnAuiYPhEDByz17kC54Idk9CYM=";
   };
 
   build-system = with python3Packages; [ setuptools ];
@@ -46,6 +48,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     requests
     requests-kerberos
     setuptools
+    tzlocal
   ];
 
   nativeCheckInputs = with python3Packages; [

From 1f61bf56b5e27ae8fdf082aa02ad431c15881f09 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 4 Jul 2026 19:43:40 +0000
Subject: [PATCH 44/48] python3Packages.ai-edge-litert: mark as broken

---
 pkgs/development/python-modules/ai-edge-litert/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/ai-edge-litert/default.nix b/pkgs/development/python-modules/ai-edge-litert/default.nix
index 54d02f69b2b5..9c63fedc29b2 100644
--- a/pkgs/development/python-modules/ai-edge-litert/default.nix
+++ b/pkgs/development/python-modules/ai-edge-litert/default.nix
@@ -96,5 +96,8 @@ buildPythonPackage {
       # elftools.common.exceptions.ELFError: Magic number does not match
       lib.systems.inspect.patterns.isDarwin
     ];
+    # Incompatible with the openvino currently shipped in nixpkgs:
+    #   auto-patchelf could not satisfy dependency libopenvino.so.2620
+    broken = true;
   };
 }

From 3d92a88d7df0941754e43595ab23f78ba30ac9e0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 4 Jul 2026 21:59:09 +0200
Subject: [PATCH 45/48] grav: 1.7.53 -> 1.7.53.2

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

diff --git a/pkgs/by-name/gr/grav/package.nix b/pkgs/by-name/gr/grav/package.nix
index 284a3f8a09a9..f8e2888e4cc2 100644
--- a/pkgs/by-name/gr/grav/package.nix
+++ b/pkgs/by-name/gr/grav/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "1.7.53";
+  version = "1.7.53.2";
 in
 stdenvNoCC.mkDerivation {
   pname = "grav";
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/getgrav/grav/releases/download/${version}/grav-admin-v${version}.zip";
-    hash = "sha256-Ug8sIEMwIoCUyHpxk5NaGHaJA7lThgbUuu+8NpmI9YI=";
+    hash = "sha256-6cQotHwIwWFR5phFQI9r79jpd+iYA1HpFBbYIzEVBsc=";
   };
 
   patches = [

From e80c403287da10bd26aa7e816c0472c548c3bc36 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 20:35:34 +0000
Subject: [PATCH 46/48] terraform-providers.yandex-cloud_yandex: 0.209.0 ->
 0.213.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 067b3ac11152..0bf5648339ea 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1508,12 +1508,12 @@
     "vendorHash": "sha256-8p6dJwGyTK+qtgplSLtIRKxnNAQAgHfs4z/EsBcg/iY="
   },
   "yandex-cloud_yandex": {
-    "hash": "sha256-/t4HHlZ/E4QM4vvJAUzn+uJIox3Duqxl0/3Hu4AGGak=",
+    "hash": "sha256-7IyFMqzkdZ2wd5KUo5eNXUr847f3VhyYKDxwMKYZ+j0=",
     "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
     "owner": "yandex-cloud",
     "repo": "terraform-provider-yandex",
-    "rev": "v0.209.0",
+    "rev": "v0.213.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-UKWLZp64nvohXqYHMhRB+nWfUKSYyGJBMpo1nk792XY="
+    "vendorHash": "sha256-JoOuqaiQFWWjnH/HjLxvznnyqQauxSef1KRQTMrhoGQ="
   }
 }

From 2241e00b81228d2ce7101589c2810de482cc6ab6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 22:19:33 +0000
Subject: [PATCH 47/48] beeper: 4.2.948 -> 4.2.957

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

diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix
index 043748aee6b2..23af3cace5f0 100644
--- a/pkgs/by-name/be/beeper/package.nix
+++ b/pkgs/by-name/be/beeper/package.nix
@@ -10,10 +10,10 @@
 }:
 let
   pname = "beeper";
-  version = "4.2.948";
+  version = "4.2.957";
   src = fetchurl {
     url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
-    hash = "sha256-MvfQSCV8b5aOeOSlTnRlOupzg+wmHhG0hGWznwCx0Yc=";
+    hash = "sha256-wUGUwWopQ8ox2+UP5hXIIF2XVLQmZyhfb712S8JjTGk=";
   };
   appimageContents = appimageTools.extract {
     inherit pname version src;

From 98c5f7cb28f7018df1c45278eba62069f9aae559 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 23:00:56 +0000
Subject: [PATCH 48/48] retroarch-assets: 1.22.0-unstable-2026-04-11 ->
 1.22.0-unstable-2026-06-27

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

diff --git a/pkgs/by-name/re/retroarch-assets/package.nix b/pkgs/by-name/re/retroarch-assets/package.nix
index 13c945338674..5ea32385bb9e 100644
--- a/pkgs/by-name/re/retroarch-assets/package.nix
+++ b/pkgs/by-name/re/retroarch-assets/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "retroarch-assets";
-  version = "1.22.0-unstable-2026-04-11";
+  version = "1.22.0-unstable-2026-06-27";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "retroarch-assets";
-    rev = "cd17f64cff4eaff187a0702d17520ccb9a760fe3";
-    hash = "sha256-v+zHGv7hMZ0Esq36hb+CvfnxEUtDjCAWwrRxmtLiiGY=";
+    rev = "a12a7be0898de32ab3eefb891e6778ff5130e5fb";
+    hash = "sha256-Mhp9+Mr/M79ZqIt9H6RrciOH+bE1cI5TLTjGzz4zKrw=";
   };
 
   makeFlags = [