From 1bd9fe3c16702a191d2ef65ba55f332480260f15 Mon Sep 17 00:00:00 2001
From: Jacob Birkett <jacob@birkett.dev>
Date: Tue, 24 Jun 2025 20:21:01 -0700
Subject: [PATCH 01/19] tidal-hifi: meta: platforms: only x86_64-linux is
 supported

`castlabs-electron` doesn't have a distribution for `aarch64-linux`.
See: <https://github.com/castlabs/electron-releases/issues/198>

Closes #419758
---
 pkgs/by-name/ti/tidal-hifi/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix
index c7314ecfa706..b2eac7071929 100644
--- a/pkgs/by-name/ti/tidal-hifi/package.nix
+++ b/pkgs/by-name/ti/tidal-hifi/package.nix
@@ -198,7 +198,9 @@ buildNpmPackage {
       qbit
       spikespaz
     ];
-    platforms = lib.platforms.linux;
+    # `castlabs-electron` doesn't have a distribution for `aarch64-linux`.
+    # See: <https://github.com/castlabs/electron-releases/issues/198>
+    platforms = [ "x86_64-linux" ];
     mainProgram = "tidal-hifi";
   };
 }

From 750c1642441a28a3e734d4623c2d226c55ce0998 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 27 Jul 2025 13:57:42 +0000
Subject: [PATCH 02/19] epsonscan2: move qt5 out of toplevel

---
 pkgs/by-name/ep/epsonscan2/package.nix | 7 +++----
 pkgs/top-level/all-packages.nix        | 4 ----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ep/epsonscan2/package.nix b/pkgs/by-name/ep/epsonscan2/package.nix
index db914a676625..5c491a50f523 100644
--- a/pkgs/by-name/ep/epsonscan2/package.nix
+++ b/pkgs/by-name/ep/epsonscan2/package.nix
@@ -15,8 +15,7 @@
   libtool,
   libusb1,
   makeDesktopItem,
-  qtbase,
-  wrapQtAppsHook,
+  qt5,
 
   withGui ? true,
   withNonFreePlugins ? false,
@@ -81,7 +80,7 @@ stdenv.mkDerivation {
   ]
   ++ lib.optionals withGui [
     imagemagick # to make icons
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ]
   ++ lib.optionals withNonFreePlugins [
     autoPatchelfHook
@@ -96,7 +95,7 @@ stdenv.mkDerivation {
   ]
   ++ lib.optionals withGui [
     copyDesktopItems
-    qtbase
+    qt5.qtbase
   ]
   ++ lib.optionals withNonFreePlugins [
     libtool.lib
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03782cbb11c6..5210f66fed48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15764,10 +15764,6 @@ with pkgs;
 
   cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { };
 
-  epsonscan2 = callPackage ../by-name/ep/epsonscan2/package.nix {
-    inherit (qt5) wrapQtAppsHook qtbase;
-  };
-
   foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix {
     withNonfreeDb = true;
   };

From 5b96e5ccd424e0b39f7c7079fd7fe5a09ccc3c31 Mon Sep 17 00:00:00 2001
From: "re:fi.64" <hello@refi64.dev>
Date: Tue, 29 Jul 2025 20:17:01 -0500
Subject: [PATCH 03/19] rego-query: init at 0.0.14

---
 pkgs/by-name/re/rego-query/package.nix | 41 ++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/re/rego-query/package.nix

diff --git a/pkgs/by-name/re/rego-query/package.nix b/pkgs/by-name/re/rego-query/package.nix
new file mode 100644
index 000000000000..d7a5f0cf5ab8
--- /dev/null
+++ b/pkgs/by-name/re/rego-query/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromSourcehut,
+  which,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "rego-query";
+  version = "0.0.14";
+
+  src = fetchFromSourcehut {
+    owner = "~charles";
+    repo = "rq";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-SZnbjPiXW6mw3abyL2475sNq3s5Jw12D9ZqbLfvaHN8=";
+  };
+
+  vendorHash = "sha256-fOq62QRx7BoE7RJielTnu1dtvkLy2FkzG59uuMQVLc4=";
+
+  subPackages = [ "cmd/rq" ];
+
+  nativeCheckInputs = [ which ];
+
+  postCheck = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    substituteInPlace smoketest/smoketest.sh \
+      --replace-fail 'RQ="$(pwd)/../build/rq"' "RQ=$GOPATH/bin/rq"
+    patchShebangs --build smoketest
+    smoketest/smoketest.sh
+  '';
+
+  meta = {
+    description = "CLI tool for evaluating Rego Queries";
+    mainProgram = "rq";
+    homepage = "https://sr.ht/~charles/rq";
+    changelog = "https://git.sr.ht/~charles/rq/tree/${finalAttrs.src.rev}/item/CHANGELOG.md";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ refi64 ];
+  };
+})

From 332f43a24781be624cfe66ae16a31081e5a27513 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 8 Aug 2025 14:43:32 +0000
Subject: [PATCH 04/19] treewide: refactor package definitions

---
 pkgs/by-name/as/as-tree/package.nix           |  8 ++--
 pkgs/by-name/as/asap/package.nix              | 16 +++----
 .../as/ascii-image-converter/package.nix      | 10 ++--
 pkgs/by-name/as/asciidoctorj/package.nix      | 16 +++----
 pkgs/by-name/as/asciigraph/package.nix        | 10 ++--
 pkgs/by-name/as/asciiquarium/package.nix      | 21 ++++-----
 pkgs/by-name/as/asdf-vm/package.nix           | 16 +++----
 pkgs/by-name/as/aseq2json/package.nix         | 12 ++---
 pkgs/by-name/as/asleap/package.nix            |  2 +-
 pkgs/by-name/as/asmfmt/package.nix            | 12 ++---
 pkgs/by-name/as/asn1c/package.nix             | 16 +++----
 pkgs/by-name/as/aspino/package.nix            | 10 ++--
 pkgs/by-name/as/assaultcube/package.nix       | 46 +++++++++----------
 pkgs/by-name/as/assh/package.nix              |  4 +-
 pkgs/by-name/as/assign-lb-ip/package.nix      | 10 ++--
 pkgs/by-name/as/astc-encoder/package.nix      | 14 +++---
 .../as/asterisk-module-sccp/package.nix       | 14 +++---
 .../as/astrolabe-generator/package.nix        | 22 ++++-----
 pkgs/by-name/as/astrolog/package.nix          | 14 +++---
 pkgs/by-name/as/asuka/package.nix             | 12 ++---
 pkgs/by-name/as/asunder/package.nix           | 36 ++++++++-------
 21 files changed, 158 insertions(+), 163 deletions(-)

diff --git a/pkgs/by-name/as/as-tree/package.nix b/pkgs/by-name/as/as-tree/package.nix
index 6945721494f5..150cd1d3c079 100644
--- a/pkgs/by-name/as/as-tree/package.nix
+++ b/pkgs/by-name/as/as-tree/package.nix
@@ -12,16 +12,16 @@ rustPlatform.buildRustPackage {
     owner = "jez";
     repo = "as-tree";
     rev = "0036c20f66795774eb9cda3ccbae6ca1e1c19444";
-    sha256 = "sha256-80yB89sKIuv7V68p0jEsi2hRdz+5CzE+4R0joRzO7Dk=";
+    hash = "sha256-80yB89sKIuv7V68p0jEsi2hRdz+5CzE+4R0joRzO7Dk=";
   };
 
   cargoHash = "sha256-HTwzmfpp9HKBKvjYXUqVDv9GUHl+2K3LMBSy1+GfmNU=";
 
-  meta = with lib; {
+  meta = {
     description = "Print a list of paths as a tree of paths";
     homepage = "https://github.com/jez/as-tree";
-    license = with licenses; [ blueOak100 ];
-    maintainers = with maintainers; [ jshholland ];
+    license = with lib.licenses; [ blueOak100 ];
+    maintainers = with lib.maintainers; [ jshholland ];
     mainProgram = "as-tree";
   };
 }
diff --git a/pkgs/by-name/as/asap/package.nix b/pkgs/by-name/as/asap/package.nix
index df54e9102e28..5029244131eb 100644
--- a/pkgs/by-name/as/asap/package.nix
+++ b/pkgs/by-name/as/asap/package.nix
@@ -5,13 +5,13 @@
   SDL,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "asap";
   version = "6.0.3";
 
   src = fetchzip {
-    url = "mirror://sourceforge/project/asap/asap/${version}/asap-${version}.tar.gz";
-    sha256 = "sha256-a4RUtFue5wdoGUykLRb46s4+yR/I/7DhwE1SiWPRg8s=";
+    url = "mirror://sourceforge/project/asap/asap/${finalAttrs.version}/asap-${finalAttrs.version}.tar.gz";
+    hash = "sha256-a4RUtFue5wdoGUykLRb46s4+yR/I/7DhwE1SiWPRg8s=";
   };
 
   outputs = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     "install-lib"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://asap.sourceforge.net/";
     mainProgram = "asap-sdl";
     description = "Another Slight Atari Player";
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
       music (*.sap, *.cmc, *.mpt, *.rmt, *.tmc, ...) on modern computers and
       mobile devices.
     '';
-    maintainers = with maintainers; [ OPNA2608 ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/as/ascii-image-converter/package.nix b/pkgs/by-name/as/ascii-image-converter/package.nix
index a74990a9b548..e33dceccb3bf 100644
--- a/pkgs/by-name/as/ascii-image-converter/package.nix
+++ b/pkgs/by-name/as/ascii-image-converter/package.nix
@@ -11,17 +11,17 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "TheZoraiz";
     repo = "ascii-image-converter";
-    rev = "v${version}";
-    sha256 = "sha256-svM/TzGQU/QgjqHboy0470+A6p4kR76typ9gnfjfAJk=";
+    tag = "v${version}";
+    hash = "sha256-svM/TzGQU/QgjqHboy0470+A6p4kR76typ9gnfjfAJk=";
   };
 
   vendorHash = "sha256-rQS3QH9vnEbQZszG3FOr1P5HYgS63BurCNCFQTTdvZs=";
 
-  meta = with lib; {
+  meta = {
     description = "Convert images into ASCII art on the console";
     homepage = "https://github.com/TheZoraiz/ascii-image-converter#readme";
-    license = licenses.asl20;
-    maintainers = [ maintainers.danth ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ danth ];
     mainProgram = "ascii-image-converter";
   };
 }
diff --git a/pkgs/by-name/as/asciidoctorj/package.nix b/pkgs/by-name/as/asciidoctorj/package.nix
index db2d8d46dbf3..bf3fb5d67603 100644
--- a/pkgs/by-name/as/asciidoctorj/package.nix
+++ b/pkgs/by-name/as/asciidoctorj/package.nix
@@ -6,13 +6,13 @@
   makeWrapper,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "asciidoctorj";
   version = "3.0.0";
 
   src = fetchzip {
-    url = "mirror://maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip";
-    sha256 = "sha256-F4tmpdNS0PIoLpqV9gifJf2iQ/kX+cp3EssRyhzyOUw=";
+    url = "mirror://maven/org/asciidoctor/asciidoctorj/${finalAttrs.version}/asciidoctorj-${finalAttrs.version}-bin.zip";
+    hash = "sha256-F4tmpdNS0PIoLpqV9gifJf2iQ/kX+cp3EssRyhzyOUw=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       --prefix JAVA_HOME : ${jdk}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Official library for running Asciidoctor on the JVM";
     longDescription = ''
       AsciidoctorJ is the official library for running Asciidoctor on the JVM.
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
       languages.
     '';
     homepage = "https://asciidoctor.org/docs/asciidoctorj/";
-    license = licenses.asl20;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ moaxcp ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ moaxcp ];
     mainProgram = "asciidoctorj";
   };
-}
+})
diff --git a/pkgs/by-name/as/asciigraph/package.nix b/pkgs/by-name/as/asciigraph/package.nix
index f70593abe5e5..a69f3c500a3a 100644
--- a/pkgs/by-name/as/asciigraph/package.nix
+++ b/pkgs/by-name/as/asciigraph/package.nix
@@ -11,8 +11,8 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "guptarohit";
     repo = "asciigraph";
-    rev = "v${version}";
-    sha256 = "sha256-+4aGkumO42cloHWV8qEEJ5bj8TTdtfXTWGFCgCRE4Mg=";
+    tag = "v${version}";
+    hash = "sha256-+4aGkumO42cloHWV8qEEJ5bj8TTdtfXTWGFCgCRE4Mg=";
   };
 
   vendorHash = null;
@@ -22,11 +22,11 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/guptarohit/asciigraph";
     description = "Lightweight ASCII line graph ╭┈╯ command line app";
     mainProgram = "asciigraph";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ mmahut ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ mmahut ];
   };
 }
diff --git a/pkgs/by-name/as/asciiquarium/package.nix b/pkgs/by-name/as/asciiquarium/package.nix
index 54c4723e7cdf..8263b9d05094 100644
--- a/pkgs/by-name/as/asciiquarium/package.nix
+++ b/pkgs/by-name/as/asciiquarium/package.nix
@@ -6,15 +6,12 @@
   perlPackages,
 }:
 
-let
-  version = "1.1";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "asciiquarium";
-  inherit version;
+  version = "1.1";
   src = fetchurl {
-    url = "https://robobunny.com/projects/asciiquarium/asciiquarium_${version}.tar.gz";
-    sha256 = "0qfkr5b7sxzi973nh0h84blz2crvmf28jkkgaj3mxrr56mhwc20v";
+    url = "https://robobunny.com/projects/asciiquarium/asciiquarium_${finalAttrs.version}.tar.gz";
+    hash = "sha256-GwjGYTUl516HVG9OiYSrOzPx6SIIAmjHSfF3fVbJ02E=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -28,15 +25,15 @@ stdenv.mkDerivation {
       --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.TermAnimation ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Enjoy the mysteries of the sea from the safety of your own terminal";
     mainProgram = "asciiquarium";
     homepage = "https://robobunny.com/projects/asciiquarium/html/";
-    license = licenses.gpl2;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       sigmasquadron
       utdemir
     ];
   };
-}
+})
diff --git a/pkgs/by-name/as/asdf-vm/package.nix b/pkgs/by-name/as/asdf-vm/package.nix
index 1acbce85e93a..dc0160f61c38 100644
--- a/pkgs/by-name/as/asdf-vm/package.nix
+++ b/pkgs/by-name/as/asdf-vm/package.nix
@@ -46,15 +46,15 @@ let
     ${asdfReshimFile}
   '';
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "asdf-vm";
   version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "asdf-vm";
     repo = "asdf";
-    rev = "v${version}";
-    sha256 = "sha256-quDgoYi+3hZUEAzXWTHuL5UK1T+4o7+G67w0UzZOjJA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-quDgoYi+3hZUEAzXWTHuL5UK1T+4o7+G67w0UzZOjJA=";
   };
 
   nativeBuildInputs = [
@@ -86,12 +86,12 @@ stdenv.mkDerivation rec {
       --bash completions/asdf.bash
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Extendable version manager with support for Ruby, Node.js, Erlang & more";
     homepage = "https://asdf-vm.com/";
-    license = licenses.mit;
-    maintainers = [ maintainers.c4605 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ c4605 ];
     mainProgram = "asdf";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/as/aseq2json/package.nix b/pkgs/by-name/as/aseq2json/package.nix
index 57b19a87c5bd..d975ca8164ba 100644
--- a/pkgs/by-name/as/aseq2json/package.nix
+++ b/pkgs/by-name/as/aseq2json/package.nix
@@ -15,9 +15,9 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "google";
     repo = "midi-dump-tools";
     rev = "8572e6313a0d7ec95492dcab04a46c5dd30ef33a";
-    sha256 = "LQ9LLVumi3GN6c9tuMSOd1Bs2pgrwrLLQbs5XF+NZeA=";
+    hash = "sha256-LQ9LLVumi3GN6c9tuMSOd1Bs2pgrwrLLQbs5XF+NZeA=";
   };
-  sourceRoot = "${finalAttrs.src.name}/aseq2json";
+  sourceRoot = "source/aseq2json";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
@@ -30,12 +30,12 @@ stdenv.mkDerivation (finalAttrs: {
     install -D --target-directory "$out/bin" aseq2json
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Listens for MIDI events on the Alsa sequencer and outputs as JSON to stdout";
     mainProgram = "aseq2json";
     homepage = "https://github.com/google/midi-dump-tools";
-    license = licenses.asl20;
-    maintainers = [ maintainers.queezle ];
-    platforms = platforms.linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ queezle ];
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/as/asleap/package.nix b/pkgs/by-name/as/asleap/package.nix
index ac7d564a9b60..8c6697c33435 100644
--- a/pkgs/by-name/as/asleap/package.nix
+++ b/pkgs/by-name/as/asleap/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     owner = "zackw";
     repo = "asleap";
     rev = "eb3bd42098cba42b65f499c9d8c73d890861b94f";
-    sha256 = "sha256-S6jS0cg9tHSfmP6VHyISkXJxczhPx3HDdxT46c+YmE8=";
+    hash = "sha256-S6jS0cg9tHSfmP6VHyISkXJxczhPx3HDdxT46c+YmE8=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/as/asmfmt/package.nix b/pkgs/by-name/as/asmfmt/package.nix
index 598ec7fd563d..ee2468cfca91 100644
--- a/pkgs/by-name/as/asmfmt/package.nix
+++ b/pkgs/by-name/as/asmfmt/package.nix
@@ -11,8 +11,8 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "klauspost";
     repo = "asmfmt";
-    rev = "v${version}";
-    sha256 = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc=";
+    tag = "v${version}";
+    hash = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc=";
   };
 
   vendorHash = null;
@@ -29,7 +29,7 @@ buildGoModule rec {
   # There are no tests.
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Go assembler formatter";
     mainProgram = "asmfmt";
     longDescription = ''
@@ -37,8 +37,8 @@ buildGoModule rec {
       your Go code.
     '';
     homepage = "https://github.com/klauspost/asmfmt";
-    changelog = "https://github.com/klauspost/asmfmt/releases/tag/${src.rev}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ kalbasit ];
+    changelog = "https://github.com/klauspost/asmfmt/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kalbasit ];
   };
 }
diff --git a/pkgs/by-name/as/asn1c/package.nix b/pkgs/by-name/as/asn1c/package.nix
index 61f45133bf8f..1072090c2112 100644
--- a/pkgs/by-name/as/asn1c/package.nix
+++ b/pkgs/by-name/as/asn1c/package.nix
@@ -5,13 +5,13 @@
   perl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "asn1c";
   version = "0.9.28";
 
   src = fetchurl {
-    url = "https://lionet.info/soft/asn1c-${version}.tar.gz";
-    sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0";
+    url = "https://lionet.info/soft/asn1c-${finalAttrs.version}.tar.gz";
+    hash = "sha256-gAdEC2R+8t2ftz2THDOsEXZOavskN9vmOLtOX8gjhrk=";
   };
 
   outputs = [
@@ -32,11 +32,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "http://lionet.info/asn1c/compiler.html";
     description = "Open Source ASN.1 Compiler";
-    license = licenses.bsd2;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.numinit ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ numinit ];
   };
-}
+})
diff --git a/pkgs/by-name/as/aspino/package.nix b/pkgs/by-name/as/aspino/package.nix
index 3ed47f59f021..6a0ccf0a2c95 100644
--- a/pkgs/by-name/as/aspino/package.nix
+++ b/pkgs/by-name/as/aspino/package.nix
@@ -10,7 +10,7 @@
 let
   glucose' = fetchurl {
     url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz";
-    sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld";
+    hash = "sha256-jboqQX/Z8RcPG30UVHaI7hLJKpgOCwCeha7BpaSgBS8=";
   };
 in
 
@@ -51,11 +51,11 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "SAT/PseudoBoolean/MaxSat/ASP solver using glucose";
-    maintainers = with maintainers; [ ];
-    platforms = platforms.unix;
-    license = licenses.asl20;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.asl20;
     homepage = "https://alviano.net/software/maxino/";
   };
 }
diff --git a/pkgs/by-name/as/assaultcube/package.nix b/pkgs/by-name/as/assaultcube/package.nix
index 69332a0a81bb..c5d31f1300cd 100644
--- a/pkgs/by-name/as/assaultcube/package.nix
+++ b/pkgs/by-name/as/assaultcube/package.nix
@@ -19,15 +19,15 @@
   server ? true,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "assaultcube";
   version = "1.3.0.2";
 
   src = fetchFromGitHub {
     owner = "assaultcube";
     repo = "AC";
-    rev = "v${version}";
-    sha256 = "0qv339zw9q5q1y7bghca03gw7z4v89sl4lbr6h3b7siy08mcwiz9";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6UfOKgI+6rMGNHlRQnVCm/zD3wCKwbeOD7jgxH8aY2M=";
   };
 
   nativeBuildInputs = [
@@ -50,16 +50,16 @@ stdenv.mkDerivation rec {
     libvorbis
   ];
 
-  targets = (lib.optionalString server "server") + (lib.optionalString client " client");
   makeFlags = [
     "-C source/src"
     "CXX=${stdenv.cc.targetPrefix}c++"
-    targets
-  ];
+  ]
+  ++ lib.optionals server [ "server" ]
+  ++ lib.optionals client [ "client" ];
 
   desktopItems = [
     (makeDesktopItem {
-      name = pname;
+      name = "assaultcube";
       desktopName = "AssaultCube";
       comment = "A multiplayer, first-person shooter game, based on the CUBE engine. Fast, arcade gameplay.";
       genericName = "First-person shooter";
@@ -69,45 +69,41 @@ stdenv.mkDerivation rec {
         "Shooter"
       ];
       icon = "assaultcube";
-      exec = pname;
+      exec = "assaultcube";
     })
   ];
 
-  gamedatadir = "/share/games/${pname}";
-
   installPhase = ''
     runHook preInstall
 
-    bindir=$out/bin
+    mkdir -p $out/bin $out/share/games/assaultcube
 
-    mkdir -p $bindir $out/$gamedatadir
-
-    cp -r config packages $out/$gamedatadir
+    cp -r config packages $out/share/games/assaultcube
 
     if (test -e source/src/ac_client) then
-      cp source/src/ac_client $bindir
+      cp source/src/ac_client $out/bin
       mkdir -p $out/share/applications
       install -Dpm644 packages/misc/icon.png $out/share/icons/assaultcube.png
       install -Dpm644 packages/misc/icon.png $out/share/pixmaps/assaultcube.png
 
-      makeWrapper $out/bin/ac_client $out/bin/${pname} \
-        --chdir "$out/$gamedatadir" --add-flags "--home=\$HOME/.assaultcube/v1.2next --init"
+      makeWrapper $out/bin/ac_client $out/bin/assaultcube \
+        --chdir "$out/share/games/assaultcube" --add-flags "--home=\$HOME/.assaultcube/v1.2next --init"
     fi
 
     if (test -e source/src/ac_server) then
-      cp source/src/ac_server $bindir
-      makeWrapper $out/bin/ac_server $out/bin/${pname}-server \
-        --chdir "$out/$gamedatadir" --add-flags "-Cconfig/servercmdline.txt"
+      cp source/src/ac_server $out/bin
+      makeWrapper $out/bin/ac_server $out/bin/assaultcube-server \
+        --chdir "$out/share/games/assaultcube" --add-flags "-Cconfig/servercmdline.txt"
     fi
 
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Fast and fun first-person-shooter based on the Cube fps";
     homepage = "https://assault.cubers.net";
-    platforms = platforms.linux; # should work on darwin with a little effort.
-    license = licenses.unfree;
-    maintainers = with maintainers; [ darkonion0 ];
+    platforms = lib.platforms.linux; # should work on darwin with a little effort.
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ darkonion0 ];
   };
-}
+})
diff --git a/pkgs/by-name/as/assh/package.nix b/pkgs/by-name/as/assh/package.nix
index c2f5eecd3ee5..8d7c9cc6db2e 100644
--- a/pkgs/by-name/as/assh/package.nix
+++ b/pkgs/by-name/as/assh/package.nix
@@ -15,8 +15,8 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "advanced-ssh-config";
     owner = "moul";
-    rev = "v${version}";
-    sha256 = "sha256-rvJJZqVSBdaJ154NV6RaxbymsSsHbKnlJDeR6KHQE7M=";
+    tag = "v${version}";
+    hash = "sha256-rvJJZqVSBdaJ154NV6RaxbymsSsHbKnlJDeR6KHQE7M=";
   };
 
   vendorHash = "sha256-L2Uo/jsMtxQClF1UDa7NIUbOm7BflvncNsjqGnCsPKo=";
diff --git a/pkgs/by-name/as/assign-lb-ip/package.nix b/pkgs/by-name/as/assign-lb-ip/package.nix
index b80fd5c5ce23..176e15568a26 100644
--- a/pkgs/by-name/as/assign-lb-ip/package.nix
+++ b/pkgs/by-name/as/assign-lb-ip/package.nix
@@ -11,17 +11,17 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Nordix";
     repo = "assign-lb-ip";
-    rev = "v${version}";
-    sha256 = "sha256-Sfi58wcX61HNCmlDoparTqnfsuxu6barSnV0uYlC+ng=";
+    tag = "v${version}";
+    hash = "sha256-Sfi58wcX61HNCmlDoparTqnfsuxu6barSnV0uYlC+ng=";
   };
 
   vendorHash = "sha256-N78a0pjs2Bg2Bslk/I0ntL88ui4IkRGenL0Pn17Lt/w=";
 
-  meta = with lib; {
+  meta = {
     description = "Assigns loadBalancerIP address to a Kubernetes service for testing purposes";
     mainProgram = "assign-lb-ip";
     homepage = "https://github.com/Nordix/assign-lb-ip";
-    license = licenses.asl20;
-    maintainers = [ maintainers.starcraft66 ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ starcraft66 ];
   };
 }
diff --git a/pkgs/by-name/as/astc-encoder/package.nix b/pkgs/by-name/as/astc-encoder/package.nix
index 71af59c5fea8..c50ccb7cd6a6 100644
--- a/pkgs/by-name/as/astc-encoder/package.nix
+++ b/pkgs/by-name/as/astc-encoder/package.nix
@@ -45,15 +45,15 @@ let
       (head isas);
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "astc-encoder";
   version = "5.3.0";
 
   src = fetchFromGitHub {
     owner = "ARM-software";
     repo = "astc-encoder";
-    rev = version;
-    sha256 = "sha256-15fX+3wzDoVzvQAhneeGajMsFXqSwmYtlsi3qrNFNus=";
+    tag = finalAttrs.version;
+    hash = "sha256-15fX+3wzDoVzvQAhneeGajMsFXqSwmYtlsi3qrNFNus=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -87,9 +87,9 @@ stdenv.mkDerivation rec {
       and HDR mode and can read various image formats. Run `astcenc
       -help` to see all the options.
     '';
-    platforms = platforms.unix;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ dasisdormax ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dasisdormax ];
     broken = !stdenv.hostPlatform.is64bit;
   };
-}
+})
diff --git a/pkgs/by-name/as/asterisk-module-sccp/package.nix b/pkgs/by-name/as/asterisk-module-sccp/package.nix
index a81ef23cca00..6c9af1bc9d09 100644
--- a/pkgs/by-name/as/asterisk-module-sccp/package.nix
+++ b/pkgs/by-name/as/asterisk-module-sccp/package.nix
@@ -6,15 +6,15 @@
   patchelf,
   asterisk,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "asterisk-module-sccp";
   version = "4.3.5";
 
   src = fetchFromGitHub {
     owner = "chan-sccp";
     repo = "chan-sccp";
-    rev = "v${version}";
-    sha256 = "sha256-Lonsh7rx3C17LU5pZpZuFxlki0iotDt+FivggFJbldU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Lonsh7rx3C17LU5pZpZuFxlki0iotDt+FivggFJbldU=";
   };
 
   nativeBuildInputs = [ patchelf ];
@@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
     patchelf --set-rpath "$p:${lib.makeLibraryPath [ binutils-unwrapped ]}" "$p"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Replacement for the SCCP channel driver in Asterisk";
-    license = licenses.gpl1Only;
-    maintainers = with maintainers; [ das_j ];
+    license = lib.licenses.gpl1Only;
+    maintainers = with lib.maintainers; [ das_j ];
   };
-}
+})
diff --git a/pkgs/by-name/as/astrolabe-generator/package.nix b/pkgs/by-name/as/astrolabe-generator/package.nix
index 90cb20eb005e..c82eaf7806a3 100644
--- a/pkgs/by-name/as/astrolabe-generator/package.nix
+++ b/pkgs/by-name/as/astrolabe-generator/package.nix
@@ -7,13 +7,13 @@
   unzip,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "astrolabe-generator";
   version = "3.3";
 
   src = fetchurl {
-    url = "https://github.com/wymarc/astrolabe-generator/releases/download/v${version}/AstrolabeGenerator-${version}.zip";
-    sha256 = "141gfmrqa1mf2qas87qig4phym9fg9gbrcfl2idzd5gi91824dn9";
+    url = "https://github.com/wymarc/astrolabe-generator/releases/download/v${finalAttrs.version}/AstrolabeGenerator-${finalAttrs.version}.zip";
+    hash = "sha256-yTYiUEjxlfZbFNSxvF56LlUPL3kRH6QVFq4GhXN1L5A=";
   };
 
   buildInputs = [ jre ];
@@ -25,19 +25,19 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/{bin,share/java}
-    cp AstrolabeGenerator-${version}.jar $out/share/java
+    cp AstrolabeGenerator-${finalAttrs.version}.jar $out/share/java
 
     makeWrapper ${jre}/bin/java $out/bin/AstrolabeGenerator \
-      --add-flags "-jar $out/share/java/AstrolabeGenerator-${version}.jar"
+      --add-flags "-jar $out/share/java/AstrolabeGenerator-${finalAttrs.version}.jar"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.astrolabeproject.com";
     description = "Java-based tool for generating EPS files for constructing astrolabes and related tools";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.gpl3;
-    maintainers = [ ];
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "AstrolabeGenerator";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/as/astrolog/package.nix b/pkgs/by-name/as/astrolog/package.nix
index 75bb669a0d9a..50fe03eab302 100644
--- a/pkgs/by-name/as/astrolog/package.nix
+++ b/pkgs/by-name/as/astrolog/package.nix
@@ -30,17 +30,17 @@ stdenv.mkDerivation {
     let
       ephemeris = fetchzip {
         url = "http://astrolog.org/ftp/ephem/astephem.zip";
-        sha256 = "1mwvpvfk3lxjcc79zvwl4ypqzgqzipnc01cjldxrmx56xkc35zn7";
+        hash = "sha256-+on9LE27hCPRacHaIo6wz6M3V+G1QpyJ1Rp4wHbycM0=";
         stripRoot = false;
       };
       moonsEphemeris = fetchzip {
         url = "https://www.astrolog.org/ftp/ephem/moons/sepm.zip";
-        sha256 = "0labcidm8mrwvww93nwpp5738m9ff9q48cqzbgd18xny1jf6f8xd";
+        hash = "sha256-bHJc1yyR2loSOC4QJWsYNtKRYpxN9ZnKK5cWCapAptI=";
         stripRoot = false;
       };
       atlas = fetchurl {
         url = "http://astrolog.org/ftp/atlas/atlasbig.as";
-        sha256 = "001bmqyldsbk4bdliqfl4a9ydrh1ff13wccvfniwaxlmvkridx2q";
+        hash = "sha256-5DVfW3IaOwOguH9cv2opr1gIWo+K/Q2bLtRM35oD/EM=";
       };
     in
     ''
@@ -60,12 +60,12 @@ stdenv.mkDerivation {
       ''}
     '';
 
-  meta = with lib; {
-    maintainers = [ maintainers.kmein ];
+  meta = {
+    maintainers = with lib.maintainers; [ kmein ];
     homepage = "https://astrolog.org/astrolog.htm";
     description = "Freeware astrology program";
     mainProgram = "astrolog";
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/by-name/as/asuka/package.nix b/pkgs/by-name/as/asuka/package.nix
index 1f9f85521ed5..2526441c0de3 100644
--- a/pkgs/by-name/as/asuka/package.nix
+++ b/pkgs/by-name/as/asuka/package.nix
@@ -14,8 +14,8 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromSourcehut {
     owner = "~julienxx";
     repo = "asuka";
-    rev = version;
-    sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M=";
+    tag = version;
+    hash = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M=";
   };
 
   cargoHash = "sha256-aNHkhcvOdK6sf6nWxCNPxcktYhrnmLdMrLqWb/1QBQ4=";
@@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec {
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Gemini Project client written in Rust with NCurses";
     mainProgram = "asuka";
     homepage = "https://git.sr.ht/~julienxx/asuka";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ sikmir ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ sikmir ];
   };
 }
diff --git a/pkgs/by-name/as/asunder/package.nix b/pkgs/by-name/as/asunder/package.nix
index eedbdef3393f..c567e342913b 100644
--- a/pkgs/by-name/as/asunder/package.nix
+++ b/pkgs/by-name/as/asunder/package.nix
@@ -24,12 +24,23 @@
 #, aacSupport ? false, TODO: neroAacEnc
 }:
 
-stdenv.mkDerivation rec {
+let
+  runtimeDeps =
+    lib.optional mp3Support lame
+    ++ lib.optional oggSupport vorbis-tools
+    ++ lib.optional flacSupport flac
+    ++ lib.optional opusSupport opusTools
+    ++ lib.optional wavpackSupport wavpack
+    ++ lib.optional monkeysAudioSupport monkeysAudio
+    ++ [ cdparanoia ];
+in
+
+stdenv.mkDerivation (finalAttrs: {
   version = "3.0.1";
   pname = "asunder";
   src = fetchurl {
-    url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-iGji4bl7ZofIAOf2EiYqMWu4V+3TmIN2jOYottJTN2s=";
+    url = "http://littlesvr.ca/asunder/releases/asunder-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-iGji4bl7ZofIAOf2EiYqMWu4V+3TmIN2jOYottJTN2s=";
   };
 
   nativeBuildInputs = [
@@ -42,27 +53,18 @@ stdenv.mkDerivation rec {
     libcddb
   ];
 
-  runtimeDeps =
-    lib.optional mp3Support lame
-    ++ lib.optional oggSupport vorbis-tools
-    ++ lib.optional flacSupport flac
-    ++ lib.optional opusSupport opusTools
-    ++ lib.optional wavpackSupport wavpack
-    ++ lib.optional monkeysAudioSupport monkeysAudio
-    ++ [ cdparanoia ];
-
   postInstall = ''
     wrapProgram "$out/bin/asunder" \
       --prefix PATH : "${lib.makeBinPath runtimeDeps}"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Graphical Audio CD ripper and encoder for Linux";
     mainProgram = "asunder";
     homepage = "http://littlesvr.ca/asunder/index.php";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ mudri ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ mudri ];
+    platforms = lib.platforms.linux;
 
     longDescription = ''
       Asunder is a graphical Audio CD ripper and encoder for Linux. You can use
@@ -70,4 +72,4 @@ stdenv.mkDerivation rec {
       WavPack, Musepack, AAC, and Monkey's Audio files.
     '';
   };
-}
+})

From 8edab4fd19ccd46f33e4180b64ff3f128b75c6fe Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Thu, 7 Aug 2025 23:14:12 -0400
Subject: [PATCH 05/19] bork: init at 0.4.0-unstable-2025-04-18

---
 pkgs/by-name/bo/bork/deps.nix    | 113 +++++++++++++++++++++++++++++++
 pkgs/by-name/bo/bork/package.nix |  47 +++++++++++++
 2 files changed, 160 insertions(+)
 create mode 100644 pkgs/by-name/bo/bork/deps.nix
 create mode 100644 pkgs/by-name/bo/bork/package.nix

diff --git a/pkgs/by-name/bo/bork/deps.nix b/pkgs/by-name/bo/bork/deps.nix
new file mode 100644
index 000000000000..289de98b9f82
--- /dev/null
+++ b/pkgs/by-name/bo/bork/deps.nix
@@ -0,0 +1,113 @@
+# generated by zon2nix (https://github.com/nix-community/zon2nix)
+
+{
+  linkFarm,
+  fetchzip,
+  fetchgit,
+}:
+
+linkFarm "zig-packages" [
+  {
+    name = "1220102cb2c669d82184fb1dc5380193d37d68b54e8d75b76b2d155b9af7d7e2e76d";
+    path = fetchzip {
+      url = "https://github.com/ziglibs/diffz/archive/ef45c00d655e5e40faf35afbbde81a1fa5ed7ffb.tar.gz";
+      hash = "sha256-5/3W0Xt9RjsvCb8Q4cdaM8dkJP7CdFro14JJLCuqASo=";
+    };
+  }
+  {
+    name = "1220dba3f6cb8c7a2be0f29243176b44b7d6bbdb45735fcaf5cfb3d1e0fa71cb9031";
+    path = fetchgit {
+      url = "https://github.com/karlseguin/websocket.zig";
+      rev = "69ac58551be9ff5f41689198bb57e29f8436cf39";
+      hash = "sha256-vSNgjTYmXgqdBRZ8vf9Z+tdwIFxEvIIVDVPs2gw674k=";
+    };
+  }
+  {
+    name = "clap-0.10.0-oBajB8fkAQB0JvsrWLar4YZrseSZ9irFxHB7Hvy_bvxb";
+    path = fetchgit {
+      url = "https://github.com/Hejsil/zig-clap";
+      rev = "a4e784da8399c51d5eeb5783e6a485b960d5c1f9";
+      hash = "sha256-WCFNzSGyF9fQ4WO2RdACQGMtmFoaVQQN/WHlvd98NGc=";
+    };
+  }
+  {
+    name = "known_folders-0.0.0-Fy-PJtLDAADGDOwYwMkVydMSTp_aN-nfjCZw6qPQ2ECL";
+    path = fetchgit {
+      url = "https://github.com/ziglibs/known-folders";
+      rev = "aa24df42183ad415d10bc0a33e6238c437fc0f59";
+      hash = "sha256-YiJ2lfG1xsGFMO6flk/BMhCqJ3kB3MnOX5fnfDEcmMY=";
+    };
+  }
+  {
+    name = "lsp_codegen-0.1.0-CMjjo0ZXCQB-rAhPYrlfzzpU0u0u2MeGvUucZ-_g32eg";
+    path = fetchgit {
+      url = "https://github.com/zigtools/zig-lsp-codegen";
+      rev = "063a98c13a2293d8654086140813bdd1de6501bc";
+      hash = "sha256-KzRi/a3FCS11Mryin9skkf3rFrIuoMP8+RcU0IuYNBA=";
+    };
+  }
+  {
+    name = "lsp_kit-0.1.0-hAAxO9S9AADv_5D0iplASFtNCFXAPk54M0u-3jj2MRFk";
+    path = fetchgit {
+      url = "https://github.com/kristoff-it/zig-lsp-kit";
+      rev = "87ff3d537a0c852442e180137d9557711963802c";
+      hash = "sha256-4oLmV2Wg525VgdX2WZMbdylIdpYrkM7Z5zqCem4Ek2g=";
+    };
+  }
+  {
+    name = "vaxis-0.1.0-BWNV_FUICQBW4jXUsQoUlEpd_7454reqJuxeYTqxrbys";
+    path = fetchgit {
+      url = "https://github.com/rockorager/libvaxis";
+      rev = "0c2b8046e4f657710ef02b77e070c116852b3a2c";
+      hash = "sha256-nCJoy91knRjCRDAgjt19Vdox67fTR8oqA7oiWEVQ38k=";
+    };
+  }
+  {
+    name = "websocket-0.1.0-ZPISdXNIAwCXG7oHBj4zc1CfmZcDeyR6hfTEOo8_YI4r";
+    path = fetchgit {
+      url = "https://github.com/karlseguin/websocket.zig";
+      rev = "4e8fb28b680d22e633541e810e8e6190e7748651";
+      hash = "sha256-KundVpTltqUkv5IuXUf3FhRXycdxmvqKFDCJ5gLGiv8=";
+    };
+  }
+  {
+    name = "zeit-0.6.0-5I6bk5daAgC-P60TjxRqW0bYknfCGxJp-03eS9UjGrO7";
+    path = fetchgit {
+      url = "https://github.com/rockorager/zeit";
+      rev = "175cf91a641790799e9d676878a9fe814aaed134";
+      hash = "sha256-SRzEGzq/W0clekfIPsmAq8CD6yFU3JTgdC+sxDGqu6A=";
+    };
+  }
+  {
+    name = "zg-0.13.4-AAAAAGiZ7QLz4pvECFa_wG4O4TP4FLABHHbemH2KakWM";
+    path = fetchgit {
+      url = "https://codeberg.org/utkarshmalik/zg";
+      rev = "7ca90b6f8796cd6615ddc61e12cd292ea26662ce";
+      hash = "sha256-fo3l6cjkrr/godElTGnQzalBsasN7J73IDIRmw7v1gA=";
+    };
+  }
+  {
+    name = "zig_yaml-0.1.0-C1161hVrAgDsyB2EZnq-Vp-QuZ9xJm2y0dECRXGG3UaP";
+    path = fetchgit {
+      url = "https://github.com/kubkon/zig-yaml";
+      rev = "27f63d3d2d13ed228d8fc077635205e6c2a405c7";
+      hash = "sha256-sDQHQ7uKDqAyvnEvfPheubn8C5QVWIXT9BdtT78UKeE=";
+    };
+  }
+  {
+    name = "ziggy-0.1.0-kTg8vwkbBgAOHreabwZtDDtNDi3U_RAiOMvuRDTJiy0I";
+    path = fetchgit {
+      url = "https://github.com/kristoff-it/ziggy";
+      rev = "8a29017169f43dc2c3526817e98142eb9a335087";
+      hash = "sha256-w4qq/SBlRQw3r9iIZ2RY3infa/ysopOQX5QDS7+8kt8=";
+    };
+  }
+  {
+    name = "zigimg-0.1.0-lly-O4heEADSRxoTwJwrD3TBfUob9052sIgb9SL8Iz-A";
+    path = fetchgit {
+      url = "https://github.com/TUSF/zigimg";
+      rev = "0ce4eca3560d5553b13263d6b6bb72e146dd43d0";
+      hash = "sha256-Rr+mAfbLOoaxHOwCug+0cWCmW9gDhjhnaO2J/Oik9HI=";
+    };
+  }
+]
diff --git a/pkgs/by-name/bo/bork/package.nix b/pkgs/by-name/bo/bork/package.nix
new file mode 100644
index 000000000000..e19a6bbcb65c
--- /dev/null
+++ b/pkgs/by-name/bo/bork/package.nix
@@ -0,0 +1,47 @@
+{
+  callPackage,
+  curl,
+  fetchFromGitHub,
+  lib,
+  stdenvNoCC,
+  zig_0_14,
+}:
+
+let
+  zig = zig_0_14;
+in
+stdenvNoCC.mkDerivation {
+  name = "bork";
+  version = "0.4.0-unstable-2025-04-18";
+
+  src = fetchFromGitHub {
+    owner = "kristoff-it";
+    repo = "bork";
+    rev = "ae7c7a82fc717d31dd9240300e5ca84f069dc453";
+    hash = "sha256-HAW5/FXgAwD+N48H+K2salN7o125i012GB1kB4CnXgQ=";
+  };
+
+  nativeBuildInputs = [
+    zig.hook
+  ];
+
+  buildInputs = [
+    curl
+  ];
+
+  zigBuildFlags = [ "--release=fast" ];
+
+  postPatch = ''
+    ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
+  '';
+
+  meta = {
+    description = "TUI chat client tailored for livecoding on Twitch";
+    homepage = "https://github.com/kristoff-it/bork";
+    changelog = "https://github.com/kristoff-it/bork/releases";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jonhermansen ];
+    platforms = lib.platforms.unix;
+    mainProgram = "bork";
+  };
+}

From 1ef329349a0d9ed6851cbb522b47be28847c92a6 Mon Sep 17 00:00:00 2001
From: TornaxO7 <tornax@proton.me>
Date: Mon, 11 Aug 2025 07:06:26 +0200
Subject: [PATCH 06/19] rio: 0.2.25 -> 0.2.28

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

diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix
index 089196927553..296f2b7ec585 100644
--- a/pkgs/by-name/ri/rio/package.nix
+++ b/pkgs/by-name/ri/rio/package.nix
@@ -48,16 +48,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rio";
-  version = "0.2.25";
+  version = "0.2.28";
 
   src = fetchFromGitHub {
     owner = "raphamorim";
     repo = "rio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HjM4cbOvy79hQEg8C/PK7D0jjiMRw5zP4jPFPctNX9o=";
+    hash = "sha256-bQ6Kj8kKDdcvRX5084KRjsuctp22Zi7375GWjOBznhw=";
   };
 
-  cargoHash = "sha256-I0LSUzMH6tyn6/Y74FApEdo0/m+6fa8UK0hzVBxA7F8=";
+  cargoHash = "sha256-LJLexxczsqtIZuLil7sB3aAt1S2RBOmuvOQTBeuSUP4";
 
   nativeBuildInputs = [
     ncurses

From 503470c34b241137d02eff4f6b55080f8c9b01c1 Mon Sep 17 00:00:00 2001
From: Vinny Meller <vinnymeller@proton.me>
Date: Wed, 6 Aug 2025 00:20:17 +0000
Subject: [PATCH 07/19] git-spice: 0.15.2 -> 0.16.1

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

diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix
index 26d043123887..6d82f58517b8 100644
--- a/pkgs/by-name/gi/git-spice/package.nix
+++ b/pkgs/by-name/gi/git-spice/package.nix
@@ -10,16 +10,16 @@
 
 buildGo124Module rec {
   pname = "git-spice";
-  version = "0.15.2";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "abhinav";
     repo = "git-spice";
     tag = "v${version}";
-    hash = "sha256-vpBQdkP5jC3glGykLCd3/df4Lhi0MeU0XLnlTNDp1bM=";
+    hash = "sha256-SILcEXyUo73c8gPDDESCkm/eQIh8elM850qwJqTyO6E=";
   };
 
-  vendorHash = "sha256-uh4GUkfWo12pYQD/Mpw+EWwmukHUpxOii7DTu6C84zo=";
+  vendorHash = "sha256-T6zSwQdDWYQqe8trIlhpU8dUQXtz8OGmnW5L5AVjGn8=";
 
   subPackages = [ "." ];
 
@@ -37,16 +37,7 @@ buildGo124Module rec {
 
   __darwinAllowLocalNetworking = true;
 
-  preCheck = ''
-    # timeout on both aarch64-darwin and x86_64-linux
-    rm testdata/script/issue725_pre_push_hook_worktree.txt
-
-    # failing on both aarch64-darwin and x86_64-linux
-    # TODO: check if this still fails after next release
-    rm testdata/script/branch_restack_conflict_no_edit.txt
-  ''
-
-  + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
+  preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
     # timeout
     rm testdata/script/branch_submit_remote_prompt.txt
     rm testdata/script/branch_submit_multiple_pr_templates.txt

From f04de1ccf03c1d0ffdeea90d4f833ad56d4027e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Aug 2025 15:15:33 +0000
Subject: [PATCH 08/19] python3Packages.coinmetrics-api-client: 2025.5.6.13 ->
 2025.8.8.16

---
 .../python-modules/coinmetrics-api-client/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
index 877954e266b9..814c35ffc3d4 100644
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "coinmetrics-api-client";
-  version = "2025.5.6.13";
+  version = "2025.8.8.16";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "coinmetrics_api_client";
-    hash = "sha256-EUxgT+LK0s7IV+EWrLKgkNMsuhZBOUfMN1PLjub9JWQ=";
+    hash = "sha256-/k0LwHxPZEF1Hyll3Xemzg/LqWtKnU+AToK1BpYfUDY=";
   };
 
   pythonRelaxDeps = [ "typer" ];

From bbe2b8a46e51f95c7fe0d724700d388e31d57b30 Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Thu, 14 Aug 2025 15:57:40 -0400
Subject: [PATCH 09/19] tdf: 0.2.0 -> 0.4.1

---
 pkgs/by-name/td/tdf/package.nix | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/td/tdf/package.nix b/pkgs/by-name/td/tdf/package.nix
index 030bbfe594ea..e02e0f0ee762 100644
--- a/pkgs/by-name/td/tdf/package.nix
+++ b/pkgs/by-name/td/tdf/package.nix
@@ -4,34 +4,30 @@
   rustPlatform,
   pkg-config,
   cairo,
-  glib,
-  poppler,
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tdf";
-  version = "0.2.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "itsjunetime";
     repo = "tdf";
     fetchSubmodules = true;
-    rev = "a2b728fae3c5b0addfa64e8d3e44eac6fd50f1d9";
-    hash = "sha256-0as/tKw0nKkZn+5q5PlKwK+LZK0xWXDAdiD3valVjBs=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-yttuWWKIrh54eJSdKejDTswoDarNifD5DtfQHSlL3rE=";
   };
 
-  cargoHash = "sha256-krIPfi4SM4uCw7NLauudwh1tgAaB8enDWnMC5X16n48=";
+  cargoHash = "sha256-UB7G5tl90CNq/aYUaUOpgGJcEL9ND3pJ29/lpIkh2iU=";
 
   nativeBuildInputs = [ pkg-config ];
+
   buildInputs = [
+    rustPlatform.bindgenHook
     cairo
-    glib
-    poppler
   ];
 
-  strictDeps = true;
-
-  # No tests are currently present
+  # Tests depend on cpuprofiler, which is not packaged in nixpkgs
   doCheck = false;
 
   # requires nightly features (feature(portable_simd))
@@ -40,12 +36,12 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Tui-based PDF viewer";
     homepage = "https://github.com/itsjunetime/tdf";
-    license = lib.licenses.gpl3Plus;
+    license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
       luftmensch-luftmensch
       DieracDelta
     ];
     mainProgram = "tdf";
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    platforms = lib.platforms.unix;
   };
-}
+})

From 4c37c67bbe11e5c92a9d5df182bb7e363a5fa00b Mon Sep 17 00:00:00 2001
From: pinage404 <pinage404@gmail.com>
Date: Sat, 16 Aug 2025 00:43:03 +0200
Subject: [PATCH 10/19] voxinput: 0.4.0 -> 0.6.1

Diff: https://github.com/richiejp/VoxInput/compare/refs/tags/v0.4.0...refs/tags/v0.6.1

Changelog: https://github.com/richiejp/VoxInput/releases/tag/v0.6.1
---
 pkgs/by-name/vo/voxinput/package.nix | 30 +++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/vo/voxinput/package.nix b/pkgs/by-name/vo/voxinput/package.nix
index d822d6a0f122..2e6b51ffdd83 100644
--- a/pkgs/by-name/vo/voxinput/package.nix
+++ b/pkgs/by-name/vo/voxinput/package.nix
@@ -1,35 +1,51 @@
 {
-  lib,
   buildGoModule,
   fetchFromGitHub,
-  nix-update-script,
   makeWrapper,
-  testers,
+  pkg-config,
   libpulseaudio,
   dotool,
+  libGL,
+  xorg,
+  libxkbcommon,
+  wayland,
+  lib,
   stdenv,
+  nix-update-script,
+  testers,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "voxinput";
-  version = "0.4.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "richiejp";
     repo = "VoxInput";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kIKvgPojlkIpDjxaFsHXEvHX3txW9GbachRFksA/Ymg=";
+    hash = "sha256-04RLlE8e8W6vTOz7GF8yEkysp3cwTSOgE1Uk7qXG/ws=";
   };
 
-  vendorHash = "sha256-Qcc/Y7xRaERuu3SIvn/jwTtj+xKii4EZvFsewGG687Y=";
+  vendorHash = "sha256-0osfAJROLn8Iru576M5lq5dwFaw2PVBs6LBscZf3Vxw=";
 
   nativeBuildInputs = [
     makeWrapper
+    pkg-config
   ];
 
   buildInputs = [
     libpulseaudio
     dotool
+
+    libGL
+    xorg.libX11.dev
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXinerama
+    xorg.libXrandr
+    xorg.libXxf86vm
+    libxkbcommon
+    wayland
   ];
 
   # To take advantage of the udev rule something like `services.udev.packages = [ nixpkgs.voxinput ]`
@@ -44,7 +60,7 @@ buildGoModule (finalAttrs: {
     echo 'KERNEL=="uinput", GROUP="input", MODE="0620", OPTIONS+="static_node=uinput"' > $out/lib/udev/rules.d/99-voxinput.rules
   '';
 
-  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
+  postFixup = lib.optionalString stdenv.hostPlatform.isElf ''
     patchelf $out/bin/.voxinput-wrapped \
       --add-rpath ${lib.makeLibraryPath [ libpulseaudio ]}
   '';

From f35deb3b96a1e8d2cfe84e23dd541cac545812aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 01:34:46 +0000
Subject: [PATCH 11/19] wiremix: 0.6.2 -> 0.7.0

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

diff --git a/pkgs/by-name/wi/wiremix/package.nix b/pkgs/by-name/wi/wiremix/package.nix
index fb250b2d56ef..601f19e79d4a 100644
--- a/pkgs/by-name/wi/wiremix/package.nix
+++ b/pkgs/by-name/wi/wiremix/package.nix
@@ -8,14 +8,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wiremix";
-  version = "0.6.2";
+  version = "0.7.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-7O8B45ZJr0QDRnbcu4nV4kbH8hCz+tUbjyy2KDMUr3o=";
+    hash = "sha256-oxr2S02NiHY0fqYH8priqLg1baSRAMpEJov4Koiic/M=";
   };
 
-  cargoHash = "sha256-Wb697rtP0s/eua69mDawT6/ZaxwjxmwuxZMgrrM2Vsg=";
+  cargoHash = "sha256-KdpWF6WVOJzKvSjCz+XdCSVxd465R8iOK3aFUnSczvU=";
 
   nativeBuildInputs = [
     pkg-config

From 046300b34df10fe2c8a2e44b55e5189ec78e9109 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 09:57:19 +0000
Subject: [PATCH 12/19] xenia-canary: 0-unstable-2025-08-06 ->
 0-unstable-2025-08-15

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

diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix
index d66bc9521c37..90e0ed5613d4 100644
--- a/pkgs/by-name/xe/xenia-canary/package.nix
+++ b/pkgs/by-name/xe/xenia-canary/package.nix
@@ -19,14 +19,14 @@
 }:
 llvmPackages_20.stdenv.mkDerivation {
   pname = "xenia-canary";
-  version = "0-unstable-2025-08-06";
+  version = "0-unstable-2025-08-15";
 
   src = fetchFromGitHub {
     owner = "xenia-canary";
     repo = "xenia-canary";
     fetchSubmodules = true;
-    rev = "e9b24642541f0203d369fedd74900cbbaddeac1e";
-    hash = "sha256-q3NJvt19mi6Ve5rMHAtzP3P/ryiypCAuiEsVVCDKn8M=";
+    rev = "a9fb32a2fddaf46573a0300c84db2b530cc62c2f";
+    hash = "sha256-F2zf3LeQl2F/iDAqFFAWBNX2C+L9mEeNWKi3w/Fon7g=";
   };
 
   dontConfigure = true;

From 02b7b8270fede6e914f9aac6a1e7bc5586c5b69b Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Sat, 16 Aug 2025 15:23:14 +0800
Subject: [PATCH 13/19] projclean: init at 0.8.0

---
 pkgs/by-name/pr/projclean/package.nix | 37 +++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/pr/projclean/package.nix

diff --git a/pkgs/by-name/pr/projclean/package.nix b/pkgs/by-name/pr/projclean/package.nix
new file mode 100644
index 000000000000..221b34554dae
--- /dev/null
+++ b/pkgs/by-name/pr/projclean/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "projclean";
+  version = "0.8.0";
+
+  src = fetchFromGitHub {
+    owner = "sigoden";
+    repo = "projclean";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-EScezOsfiirg8YbhteFxuVTodeup8tUzZdcrWveJxWE=";
+  };
+
+  cargoHash = "sha256-9atTgWg1iYCeXsRLLMOR87CbpIezD3ozMMOgumRNKAg=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Project dependencies & build artifacts cleanup tool";
+    homepage = "https://github.com/sigoden/projclean";
+    license = with lib.licenses; [
+      mit
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ chillcicada ];
+    mainProgram = "projclean";
+  };
+})

From 02770696063aaf565d48e1e7d351f8241882e25f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Aug 2025 12:36:06 +0000
Subject: [PATCH 14/19] libjodycode: 3.1.2 -> 4.0

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

diff --git a/pkgs/by-name/li/libjodycode/package.nix b/pkgs/by-name/li/libjodycode/package.nix
index 164fdb1f66e8..5dcd17a93262 100644
--- a/pkgs/by-name/li/libjodycode/package.nix
+++ b/pkgs/by-name/li/libjodycode/package.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libjodycode";
-  version = "3.1.2";
+  version = "4.0";
 
   outputs = [
     "out"
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "jbruchon";
     repo = "libjodycode";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-doTGeIElftC4SAcn3MTQ+DffQFMv1Elo28i/MFxjFzk=";
+    hash = "sha256-2G6jh+eVwri3RINiFxrc7xwoGTTxlGKsEQMu9YxWSzY=";
   };
 
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

From dae2a433bcd22e0c585e1f62d1fd208394d7327d Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 16 Aug 2025 09:34:45 -0700
Subject: [PATCH 15/19] windsurf: 1.11.5 -> 1.12.2

---
 pkgs/by-name/wi/windsurf/info.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json
index 5a1a8dae89cd..31193e4894a4 100644
--- a/pkgs/by-name/wi/windsurf/info.json
+++ b/pkgs/by-name/wi/windsurf/info.json
@@ -1,20 +1,20 @@
 {
   "aarch64-darwin": {
-    "version": "1.11.5",
+    "version": "1.12.2",
     "vscodeVersion": "1.99.3",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/f8b63909dde4ac913fee41e867b511a598b3b517/Windsurf-darwin-arm64-1.11.5.zip",
-    "sha256": "7f3a4122c72701c087d02e9ffd64d9432400c1468dfbec5890207e3ede3453f2"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/b8f002c02d165600299a109bf21d02d139c52644/Windsurf-darwin-arm64-1.12.2.zip",
+    "sha256": "de998189f46c4389cad8b1b984984042864ff0492cc92a066451cd9338f1237c"
   },
   "x86_64-darwin": {
-    "version": "1.11.5",
+    "version": "1.12.2",
     "vscodeVersion": "1.99.3",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/f8b63909dde4ac913fee41e867b511a598b3b517/Windsurf-darwin-x64-1.11.5.zip",
-    "sha256": "685f45fbae8906523baa4744ead97204b254cf190092491aa235fa236393f5ca"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/b8f002c02d165600299a109bf21d02d139c52644/Windsurf-darwin-x64-1.12.2.zip",
+    "sha256": "bb5d0c002d76ccffac28a673b01c02b5a603a222b1f2a399d43951a9c1b3e2d3"
   },
   "x86_64-linux": {
-    "version": "1.11.5",
+    "version": "1.12.2",
     "vscodeVersion": "1.99.3",
-    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/f8b63909dde4ac913fee41e867b511a598b3b517/Windsurf-linux-x64-1.11.5.tar.gz",
-    "sha256": "cc83879091be631757de224d0a5b0e0b3bdc74bcd939f423ec3e02926643a7da"
+    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/b8f002c02d165600299a109bf21d02d139c52644/Windsurf-linux-x64-1.12.2.tar.gz",
+    "sha256": "ae1d3075237885c56bcb39d5b36f460f2a8ba4e4038c63f1d0b5795178e77c43"
   }
 }

From 5bceb20f3b251709b864ef89ad9ed83ef9b38c2a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 17 Aug 2025 01:22:04 +0200
Subject: [PATCH 16/19] jdupes: 1.28.0 -> 1.29.0

Diff: https://codeberg.org/jbruchon/jdupes/compare/v1.28.0...v1.29.0
Release: https://codeberg.org/jbruchon/jdupes/releases/tag/v1.29.0
Changelog: https://codeberg.org/jbruchon/jdupes/src/branch/master/CHANGES.txt
---
 pkgs/by-name/jd/jdupes/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/jd/jdupes/package.nix b/pkgs/by-name/jd/jdupes/package.nix
index f630bcd8b926..a49d0c6c84c8 100644
--- a/pkgs/by-name/jd/jdupes/package.nix
+++ b/pkgs/by-name/jd/jdupes/package.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jdupes";
-  version = "1.28.0";
+  version = "1.29.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "jbruchon";
     repo = "jdupes";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-jRjVuN/FNDpKB+Ibi+Mkm+WhB16cz9c33dOOeiPdgr8=";
+    hash = "sha256-ddl1GCA96j5H6C9KTtJudQ4wSUeOGA6p4P8JPbsVr9o=";
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The testdir
     # directories have such files and will be removed.
@@ -27,6 +27,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [
     "PREFIX=${placeholder "out"}"
+    # don't link with ../libjodycode
+    "IGNORE_NEARBY_JC=1"
+    # link with system libjodycode (this case is erroneously missing in v1.29.0)
+    "LDFLAGS_EXTRA=-ljodycode"
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     "ENABLE_DEDUPE=1"

From 60eb311cb829efe4e09f44511302490db0e896cf Mon Sep 17 00:00:00 2001
From: Notarin Steele <424c414e4b@gmail.com>
Date: Sat, 16 Aug 2025 19:29:45 -0400
Subject: [PATCH 17/19] hayabusa: 0.1.0 -> 0.3.9

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

diff --git a/pkgs/by-name/ha/hayabusa/package.nix b/pkgs/by-name/ha/hayabusa/package.nix
index 95cfcb1cb8be..fc777a4bb048 100644
--- a/pkgs/by-name/ha/hayabusa/package.nix
+++ b/pkgs/by-name/ha/hayabusa/package.nix
@@ -14,11 +14,11 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "notarin";
     repo = "hayabusa";
-    rev = "306167c632173f6633e51c5610fe32af7718ec25";
-    hash = "sha256-e2zoVIhxcE9cUypi8Uzz3YZe2JvIaEVuWOGpqHVtxn8=";
+    rev = "1d6b8cfd301d60ff9f6946970b51818c036083b0";
+    hash = "sha256-w9vXC7L7IP4QLPFS1IgPOKSm7fT7W0R+NsHTdAfIupg=";
   };
 
-  cargoHash = "sha256-wWJIZRiDK32uGroIG36QvRSvPw18nFGfp7OI7VNhCWE=";
+  cargoHash = "sha256-F1dUv1SR6cf1o6a2JG2i2fCgjZpGsG20mskIrf3oiHY=";
 
   enableParallelBuilding = true;
 
@@ -32,12 +32,12 @@ rustPlatform.buildRustPackage {
   ];
 
   postPatch = ''
-    substituteInPlace src/daemon/hayabusa.service \
+    substituteInPlace distribution/hayabusa.service \
       --replace "/usr/local" "$out"
   '';
 
   postInstall = ''
-    install -Dm444 src/daemon/hayabusa.service -t $out/lib/systemd/system/
+    install -Dm444 distribution/hayabusa.service -t $out/lib/systemd/system/
   '';
 
   meta = {

From 5821facf41a9febb0916938809544d8ab9a2944e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 00:31:20 +0000
Subject: [PATCH 18/19] vdrPlugins.epgsearch: 2.4.3 -> 2.4.4

---
 pkgs/applications/video/vdr/epgsearch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/vdr/epgsearch/default.nix b/pkgs/applications/video/vdr/epgsearch/default.nix
index 208ce7fb953f..6c4c33d92102 100644
--- a/pkgs/applications/video/vdr/epgsearch/default.nix
+++ b/pkgs/applications/video/vdr/epgsearch/default.nix
@@ -10,12 +10,12 @@
 }:
 stdenv.mkDerivation rec {
   pname = "vdr-epgsearch";
-  version = "2.4.3";
+  version = "2.4.4";
 
   src = fetchFromGitHub {
     repo = "vdr-plugin-epgsearch";
     owner = "vdr-projects";
-    sha256 = "sha256-hOMISobeEt/jB4/18t5ZeN+EcPHhm8Jz8Kar72KYS3E=";
+    sha256 = "sha256-hHTb6MbN18gNiovX1BKR6ldxxRDeDXJt4kNm722phRk=";
     rev = "v${version}";
   };
 

From 58c49a665d0cbd87a0a4660c30505059283c271c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Aug 2025 00:34:20 +0000
Subject: [PATCH 19/19] vdrPlugins.markad: 4.2.14 -> 4.2.15

---
 pkgs/applications/video/vdr/markad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix
index 05dc617c25af..b093e1f2c0d8 100644
--- a/pkgs/applications/video/vdr/markad/default.nix
+++ b/pkgs/applications/video/vdr/markad/default.nix
@@ -7,12 +7,12 @@
 }:
 stdenv.mkDerivation rec {
   pname = "vdr-markad";
-  version = "4.2.14";
+  version = "4.2.15";
 
   src = fetchFromGitHub {
     repo = "vdr-plugin-markad";
     owner = "kfb77";
-    hash = "sha256-ro7bva0eDik6GbA70aXnBy6UgdzSLx/N4oGjCbzmw8Q=";
+    hash = "sha256-ujYr+KqCbQ8t3nN/b/rkDHfbLN2h4ghcNsXePPLEevQ=";
     tag = "V${version}";
   };