From 3de2e54dace7e7222554d9d8ce612be5a7f4e22f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 11 Mar 2025 15:44:51 +0100
Subject: [PATCH 01/12] opentabletdriver: use nix-update-script

---
 pkgs/by-name/op/opentabletdriver/package.nix | 3 ++-
 pkgs/by-name/op/opentabletdriver/update.sh   | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100755 pkgs/by-name/op/opentabletdriver/update.sh

diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix
index 9ddcef1c9c37..1e682d20123e 100644
--- a/pkgs/by-name/op/opentabletdriver/package.nix
+++ b/pkgs/by-name/op/opentabletdriver/package.nix
@@ -17,6 +17,7 @@
   udev,
   wrapGAppsHook3,
   versionCheckHook,
+  nix-update-script,
 }:
 
 buildDotnetModule (finalAttrs: {
@@ -122,7 +123,7 @@ buildDotnetModule (finalAttrs: {
   versionCheckProgram = "${placeholder "out"}/bin/otd-daemon";
 
   passthru = {
-    updateScript = ./update.sh;
+    updateScript = nix-update-script { };
     tests = {
       otd-runs = nixosTests.opentabletdriver;
     };
diff --git a/pkgs/by-name/op/opentabletdriver/update.sh b/pkgs/by-name/op/opentabletdriver/update.sh
deleted file mode 100755
index 61eac4b8b5da..000000000000
--- a/pkgs/by-name/op/opentabletdriver/update.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell --pure -i bash -p bash nix nix-update git cacert
-set -euo pipefail
-
-prev_version=$(nix eval --raw -f. opentabletdriver.version)
-nix-update opentabletdriver
-[[ $(nix eval --raw -f. opentabletdriver.version) == "$prev_version" ]] ||
-  "$(nix-build . -A opentabletdriver.fetch-deps --no-out-link)"

From b416182de97b8ce8ad51ebda026dd69c3e51ca1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 11 Mar 2025 16:14:37 +0100
Subject: [PATCH 02/12] ps3-disc-dumper: use nix-update-script

---
 pkgs/by-name/ps/ps3-disc-dumper/package.nix | 3 ++-
 pkgs/by-name/ps/ps3-disc-dumper/update.sh   | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100755 pkgs/by-name/ps/ps3-disc-dumper/update.sh

diff --git a/pkgs/by-name/ps/ps3-disc-dumper/package.nix b/pkgs/by-name/ps/ps3-disc-dumper/package.nix
index d4560a3dded0..7d90e7ad1549 100644
--- a/pkgs/by-name/ps/ps3-disc-dumper/package.nix
+++ b/pkgs/by-name/ps/ps3-disc-dumper/package.nix
@@ -5,6 +5,7 @@
   zlib,
   openssl,
   dotnetCorePackages,
+  nix-update-script,
 }:
 
 buildDotnetModule rec {
@@ -37,7 +38,7 @@ buildDotnetModule rec {
     openssl
   ];
 
-  passthru.updateScript = ./update.sh;
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Handy utility to make decrypted PS3 disc dumps";
diff --git a/pkgs/by-name/ps/ps3-disc-dumper/update.sh b/pkgs/by-name/ps/ps3-disc-dumper/update.sh
deleted file mode 100755
index 0ea59c5145c8..000000000000
--- a/pkgs/by-name/ps/ps3-disc-dumper/update.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell --pure -i bash -p bash nix nix-update git cacert
-set -eo pipefail
-
-prev_version=$(nix eval --raw -f. ps3-disc-dumper.version)
-nix-update ps3-disc-dumper
-[[ $(nix eval --raw -f. ps3-disc-dumper.version) == "$prev_version" ]] ||
-  $(nix-build . -A ps3-disc-dumper.fetch-deps --no-out-link)

From c2e511c47131440fff1d1c1082a25a6feb5dbcd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 11 Mar 2025 16:15:48 +0100
Subject: [PATCH 03/12] nexusmods-app: use nix-update-script

---
 pkgs/by-name/ne/nexusmods-app/package.nix | 3 ++-
 pkgs/by-name/ne/nexusmods-app/update.bash | 9 ---------
 2 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100755 pkgs/by-name/ne/nexusmods-app/update.bash

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 8278059128b8..d49e972513cc 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -11,6 +11,7 @@
   makeFontsConf,
   runCommand,
   xdg-utils,
+  nix-update-script,
   pname ? "nexusmods-app",
 }:
 let
@@ -181,7 +182,7 @@ buildDotnetModule (finalAttrs: {
           NexusMods.App list-tools
         '';
       };
-    updateScript = ./update.bash;
+    updateScript = nix-update-script { };
   };
 
   meta = {
diff --git a/pkgs/by-name/ne/nexusmods-app/update.bash b/pkgs/by-name/ne/nexusmods-app/update.bash
deleted file mode 100755
index fac4a04e422a..000000000000
--- a/pkgs/by-name/ne/nexusmods-app/update.bash
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p nix-update
-#shellcheck shell=bash
-
-set -o errexit -o nounset -o pipefail
-
-package=nexusmods-app
-nix-update "$package"
-"$(nix-build --attr "$package".fetch-deps --no-out-link)"

From 714de72b584fc3cfa7a8ac6e518c97070540a2bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 11 Mar 2025 16:16:39 +0100
Subject: [PATCH 04/12] msbuild-structured-log-viewer: use nix-update-script

---
 pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
index 9c98c20a1034..9372df15749a 100644
--- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
+++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
@@ -10,8 +10,7 @@
   openssl,
   libkrb5,
   makeDesktopItem,
-  writeShellScript,
-  nix-update,
+  nix-update-script,
 }:
 buildDotnetModule (finalAttrs: rec {
   pname = "msbuild-structured-log-viewer";
@@ -73,10 +72,7 @@ buildDotnetModule (finalAttrs: rec {
     categories = [ "Development" ];
   };
 
-  passthru.updateScript = writeShellScript "update-${finalAttrs.pname}" ''
-    ${lib.getExe nix-update}
-    "$(nix-build -A "$UPDATE_NIX_ATTR_PATH.fetch-deps" --no-out-link)"
-  '';
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Rich interactive log viewer for MSBuild logs";

From a8516f0857e2df7226ec5473c12afbeb9e3702c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 11 Mar 2025 16:17:23 +0100
Subject: [PATCH 05/12] lumafly: use nix-update-script

---
 pkgs/by-name/lu/lumafly/package.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/lu/lumafly/package.nix b/pkgs/by-name/lu/lumafly/package.nix
index 397b0e1b820a..1f36430c1997 100644
--- a/pkgs/by-name/lu/lumafly/package.nix
+++ b/pkgs/by-name/lu/lumafly/package.nix
@@ -9,7 +9,7 @@
   icoutils,
   copyDesktopItems,
   makeDesktopItem,
-  writeScript,
+  nix-update-script,
 }:
 buildDotnetModule rec {
   pname = "lumafly";
@@ -34,16 +34,7 @@ buildDotnetModule rec {
 
   selfContainedBuild = true;
 
-  passthru.updateScript = writeScript "update-lumafly" ''
-    #!/usr/bin/env nix-shell
-    #!nix-shell --pure -i bash -p bash nix nix-update git cacert
-    set -eo pipefail
-
-    prev_version=$(nix eval --raw -f. lumafly.version)
-    nix-update lumafly
-    [[ $(nix eval --raw -f. lumafly.version) == "$prev_version" ]] ||
-      $(nix-build . -A lumafly.fetch-deps --no-out-link)
-  '';
+  passthru.updateScript = nix-update-script { };
 
   runtimeDeps = [
     zlib

From b24cb720ddcbd5395e7af1ec00dda4eda299c809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 11 Mar 2025 16:18:24 +0100
Subject: [PATCH 06/12] kryptor: use nix-update-script

---
 pkgs/by-name/kr/kryptor/package.nix | 3 ++-
 pkgs/by-name/kr/kryptor/update.sh   | 6 ------
 2 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100755 pkgs/by-name/kr/kryptor/update.sh

diff --git a/pkgs/by-name/kr/kryptor/package.nix b/pkgs/by-name/kr/kryptor/package.nix
index bcfeffc3a0d8..f1b548ca0fb4 100644
--- a/pkgs/by-name/kr/kryptor/package.nix
+++ b/pkgs/by-name/kr/kryptor/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   dotnetCorePackages,
   versionCheckHook,
+  nix-update-script,
 }:
 
 buildDotnetModule rec {
@@ -27,7 +28,7 @@ buildDotnetModule rec {
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   passthru = {
-    updateScript = ./update.sh;
+    updateScript = nix-update-script { };
   };
 
   meta = {
diff --git a/pkgs/by-name/kr/kryptor/update.sh b/pkgs/by-name/kr/kryptor/update.sh
deleted file mode 100755
index 1e6e7d7646de..000000000000
--- a/pkgs/by-name/kr/kryptor/update.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell --pure -i bash -p bash nix nix-update git cacert
-set -euo pipefail
-
-nix-update kryptor
-$(nix-build . -A kryptor.fetch-deps --no-out-link)

From 6ef639ae0d4efde2735ad165d6fbc6db4c784ae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 11 Mar 2025 16:19:20 +0100
Subject: [PATCH 07/12] tone: use nix-update-script

---
 pkgs/by-name/to/tone/package.nix | 3 ++-
 pkgs/by-name/to/tone/update.sh   | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100755 pkgs/by-name/to/tone/update.sh

diff --git a/pkgs/by-name/to/tone/package.nix b/pkgs/by-name/to/tone/package.nix
index a85045ebb079..55171d5b7dc9 100644
--- a/pkgs/by-name/to/tone/package.nix
+++ b/pkgs/by-name/to/tone/package.nix
@@ -5,6 +5,7 @@
   ffmpeg-full,
   dotnetCorePackages,
   versionCheckHook,
+  nix-update-script,
 }:
 
 buildDotnetModule rec {
@@ -33,7 +34,7 @@ buildDotnetModule rec {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  passthru.updateScript = ./update.sh;
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     homepage = "https://github.com/sandreas/tone";
diff --git a/pkgs/by-name/to/tone/update.sh b/pkgs/by-name/to/tone/update.sh
deleted file mode 100755
index 1063f97cffb9..000000000000
--- a/pkgs/by-name/to/tone/update.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell --pure -i bash -p bash nix nix-update git cacert
-set -eo pipefail
-
-prev_version=$(nix eval --raw -f. tone.version)
-nix-update tone
-[[ $(nix eval --raw -f. tone.version) == "$prev_version" ]] ||
-  "$(nix-build . -A tone.fetch-deps --no-out-link)"

From 4434c44d89c84aa13f759002939484d684c90a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 11 Mar 2025 16:20:52 +0100
Subject: [PATCH 08/12] fsautocomplete: use nix-update-script

---
 pkgs/by-name/fs/fsautocomplete/package.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix
index 0ed8fb1eda91..a2365303b99a 100644
--- a/pkgs/by-name/fs/fsautocomplete/package.nix
+++ b/pkgs/by-name/fs/fsautocomplete/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   dotnetCorePackages,
   testers,
-  _experimental-update-script-combinators,
   nix-update-script,
 }:
 
@@ -38,10 +37,7 @@ buildDotnetModule (finalAttrs: {
 
   passthru = {
     tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
-    updateScript = _experimental-update-script-combinators.sequence [
-      (nix-update-script { })
-      finalAttrs.passthru.fetch-deps
-    ];
+    updateScript = nix-update-script { };
   };
 
   meta = with lib; {

From 016304e79d12c674e5fed462c3ab2e3feb394cae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 11 Mar 2025 16:21:40 +0100
Subject: [PATCH 09/12] v2rayn: use nix-update-script

---
 pkgs/by-name/v2/v2rayn/package.nix | 3 ++-
 pkgs/by-name/v2/v2rayn/update.sh   | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100755 pkgs/by-name/v2/v2rayn/update.sh

diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix
index f7f3516b8bd5..42b8eda79d04 100644
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@@ -16,6 +16,7 @@
   bash,
   xorg,
   xdg-utils,
+  nix-update-script,
 }:
 
 buildDotnetModule rec {
@@ -96,7 +97,7 @@ buildDotnetModule rec {
     install -Dm644 v2rayN/v2rayN.Desktop/v2rayN.png $out/share/pixmaps/v2rayn.png
   '';
 
-  passthru.updateScript = ./update.sh;
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "GUI client for Windows and Linux, support Xray core and sing-box-core and others";
diff --git a/pkgs/by-name/v2/v2rayn/update.sh b/pkgs/by-name/v2/v2rayn/update.sh
deleted file mode 100755
index b8356be9f83c..000000000000
--- a/pkgs/by-name/v2/v2rayn/update.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash nix nix-update
-
-set -eou pipefail
-
-nix-update v2rayn
-
-$(nix-build -A v2rayn.fetch-deps)

From b13efc58669c366a13620b44d80541d94da35514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 11 Mar 2025 16:22:22 +0100
Subject: [PATCH 10/12] vrcadvert: use nix-update-script

---
 pkgs/by-name/vr/vrcadvert/package.nix | 3 ++-
 pkgs/by-name/vr/vrcadvert/update.sh   | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100755 pkgs/by-name/vr/vrcadvert/update.sh

diff --git a/pkgs/by-name/vr/vrcadvert/package.nix b/pkgs/by-name/vr/vrcadvert/package.nix
index 95b9ac8b99d6..90d9f0bf2ba4 100644
--- a/pkgs/by-name/vr/vrcadvert/package.nix
+++ b/pkgs/by-name/vr/vrcadvert/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   lib,
   versionCheckHook,
+  nix-update-script,
 }:
 
 buildDotnetModule rec {
@@ -38,7 +39,7 @@ buildDotnetModule rec {
   ];
   versionCheckProgram = "${placeholder "out"}/bin/VrcAdvert";
 
-  passthru.updateScript = ./update.sh;
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Advertise your OSC app through OSCQuery";
diff --git a/pkgs/by-name/vr/vrcadvert/update.sh b/pkgs/by-name/vr/vrcadvert/update.sh
deleted file mode 100755
index 874b5bb8e525..000000000000
--- a/pkgs/by-name/vr/vrcadvert/update.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell --pure -i bash -p bash nix nix-update git cacert
-set -eo pipefail
-
-prev_version=$(nix eval --raw -f. vrcadvert.version)
-nix-update vrcadvert
-[[ $(nix eval --raw -f. vrcadvert.version) == "$prev_version" ]] ||
-  $(nix-build . -A vrcadvert.fetch-deps --no-out-link)

From 303b868e24b2184caff178de15110d31aff01460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 11 Mar 2025 15:30:57 +0100
Subject: [PATCH 11/12] avalonia: don't run dotnet fetch-deps script twice

See https://github.com/Mic92/nix-update/pull/324
---
 pkgs/by-name/av/avalonia/update.bash | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/av/avalonia/update.bash b/pkgs/by-name/av/avalonia/update.bash
index b0ceaaa03eec..85b6600de5a9 100755
--- a/pkgs/by-name/av/avalonia/update.bash
+++ b/pkgs/by-name/av/avalonia/update.bash
@@ -4,8 +4,9 @@
 
 set -euo pipefail
 
+export NIXPKGS_ALLOW_INSECURE=1 # uses EOL dotnet-sdk-7
 package="$UPDATE_NIX_ATTR_PATH"
-nix-update "$package"
+nix-update "$package" --src-only
 src=$(nix-build -A "$package".src --no-out-link)
 npmDepsFile=$(nix-instantiate --eval -A "$package".npmDepsFile)
 (

From 09d7af29411274a3ac007238c41e0247ddf7b031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 11 Mar 2025 16:36:31 +0100
Subject: [PATCH 12/12] godot: don't run dotnet fetch-deps script twice

See https://github.com/Mic92/nix-update/pull/324
---
 pkgs/development/tools/godot/update.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/godot/update.sh b/pkgs/development/tools/godot/update.sh
index 56d326f99d74..25d396e78119 100755
--- a/pkgs/development/tools/godot/update.sh
+++ b/pkgs/development/tools/godot/update.sh
@@ -9,7 +9,8 @@ attr=$UPDATE_NIX_ATTR_PATH
 prev_version=$UPDATE_NIX_OLD_VERSION
 nix-update "$attr" \
     --version-regex "($versionPrefix\\b.*-stable)" \
-    --override-filename "$2"
+    --override-filename "$2" \
+    --src-only
 [[ $(nix eval --raw -f. "$attr".version) != "$prev_version" ]] || exit 0
 
 "$(nix build --impure --expr "((import ./. {}).$attr.override { withMono = true; }).fetch-deps" --print-out-paths --no-link)"