From aea931223a91acb7a2aa7ded32ed5d3ef9f31bad Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:08:52 +0200
Subject: [PATCH 01/22] magic-enum: remove testers.testVersion

package has no executable
---
 pkgs/development/libraries/magic-enum/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/magic-enum/default.nix b/pkgs/development/libraries/magic-enum/default.nix
index 7f65505793c7..93bcb8a624d8 100644
--- a/pkgs/development/libraries/magic-enum/default.nix
+++ b/pkgs/development/libraries/magic-enum/default.nix
@@ -4,7 +4,6 @@
 , cmake
 , nix-update-script
 , testers
-, magic-enum
 }:
 stdenv.mkDerivation rec{
   pname = "magic-enum";
@@ -29,7 +28,6 @@ stdenv.mkDerivation rec{
 
   passthru = {
     updateScript = nix-update-script { };
-    tests.version = testers.testVersion { package = magic-enum; };
   };
 
   meta = {

From a228d872f69fdc805af4cb804889851f8fcae1b2 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:55 +0200
Subject: [PATCH 02/22] alephone: use finalAttrs.finalPackage

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

diff --git a/pkgs/by-name/al/alephone/package.nix b/pkgs/by-name/al/alephone/package.nix
index 0ae580c75edd..92cf6667f6c3 100644
--- a/pkgs/by-name/al/alephone/package.nix
+++ b/pkgs/by-name/al/alephone/package.nix
@@ -28,7 +28,6 @@
   unzip,
   zlib,
   zziplib,
-  alephone,
   testers,
 }:
 
@@ -94,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.tests.version =
     # test that the version is correct
-    testers.testVersion { package = alephone; };
+    testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = {
     description = "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine";
@@ -112,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
       version,
       zip,
       meta,
-      icon ? alephone.icons + "/alephone.png",
+      icon ? finalAttrs.finalPackage.icons + "/alephone.png",
       ...
     }@extraArgs:
     stdenv.mkDerivation (
@@ -142,14 +141,14 @@ stdenv.mkDerivation (finalAttrs: {
           mkdir -p $out/bin $out/data/$pname $out/share/applications
           cp -a * $out/data/$pname
           cp $desktopItem/share/applications/* $out/share/applications
-          makeWrapper ${alephone}/bin/alephone $out/bin/$pname \
+          makeWrapper ${finalAttrs.finalPackage}/bin/alephone $out/bin/$pname \
             --add-flags $out/data/$pname
         '';
       }
       // extraArgs
       // {
         meta =
-          alephone.meta
+          finalAttrs.finalPackage.meta
           // {
             license = lib.licenses.free;
             mainProgram = pname;

From 1cbae1f8175e3757f3047a20fb5339fc41e05620 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:55 +0200
Subject: [PATCH 03/22] crowdin-cli: use finalAttrs.finalPackage

---
 pkgs/tools/text/crowdin-cli/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix
index 5c46c1efef09..14f33ae0c518 100644
--- a/pkgs/tools/text/crowdin-cli/default.nix
+++ b/pkgs/tools/text/crowdin-cli/default.nix
@@ -7,17 +7,16 @@
 , installShellFiles
 , jre
 , makeWrapper
-, crowdin-cli
 , testers
 , unzip
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "crowdin-cli";
   version = "4.2.0";
 
   src = fetchurl {
-    url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
+    url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";
     hash = "sha256-158zbgYw4FP/vQVsSs9tt9VcisBWpRn/D4ORiM24PYY=";
   };
 
@@ -38,7 +37,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.tests.version = testers.testVersion { package = crowdin-cli; };
+  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = with lib; {
     mainProgram = "crowdin";
@@ -48,4 +47,4 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ DamienCassou ];
   };
-}
+})

From 13cd33392a373c3ddab3652bb7928e7bb044ee09 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:55 +0200
Subject: [PATCH 04/22] datefmt: use finalAttrs.finalPackage

---
 pkgs/tools/misc/datefmt/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/datefmt/default.nix b/pkgs/tools/misc/datefmt/default.nix
index 36fdf9fcfebb..1c1efd792a20 100644
--- a/pkgs/tools/misc/datefmt/default.nix
+++ b/pkgs/tools/misc/datefmt/default.nix
@@ -1,17 +1,17 @@
-{ lib, stdenv, fetchurl, datefmt, testers }:
+{ lib, stdenv, fetchurl, testers }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "datefmt";
   version = "0.2.2";
 
   src = fetchurl {
-    url = "https://cdn.jb55.com/tarballs/datefmt/datefmt-${version}.tar.gz";
+    url = "https://cdn.jb55.com/tarballs/datefmt/datefmt-${finalAttrs.version}.tar.gz";
     sha256 = "sha256-HgW/vOGVEmAbm8k3oIwIa+cogq7qmX7MfTmHqxv9lhY=";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  passthru.tests.version = testers.testVersion { package = datefmt; };
+  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = with lib; {
     homepage = "https://jb55.com/datefmt";
@@ -21,4 +21,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ jb55 ];
     mainProgram = "datefmt";
   };
-}
+})

From fe7de85938f8f7dd9b44a5cb2dfaf18393b7b98e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:55 +0200
Subject: [PATCH 05/22] detekt: use finalAttrs.finalPackage

---
 pkgs/development/tools/detekt/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/detekt/default.nix b/pkgs/development/tools/detekt/default.nix
index 75ac8e45e4ae..45ef24e4b1f7 100644
--- a/pkgs/development/tools/detekt/default.nix
+++ b/pkgs/development/tools/detekt/default.nix
@@ -1,12 +1,12 @@
-{ detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }:
-stdenv.mkDerivation rec {
+{ lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }:
+stdenv.mkDerivation (finalAttrs: {
   pname = "detekt";
   version = "1.23.7";
 
-  jarfilename = "${pname}-${version}-executable.jar";
+  jarfilename = "detekt-${finalAttrs.version}-executable.jar";
 
   src = fetchurl {
-    url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar";
+    url = "https://github.com/detekt/detekt/releases/download/v${finalAttrs.version}/detekt-cli-${finalAttrs.version}-all.jar";
     sha256 = "sha256-hL7e0oMBLLKzi8rvSZZFL81gadLpynS1Dqp54K0hiX4=";
   };
 
@@ -17,15 +17,15 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -D "$src" "$out/share/java/${jarfilename}"
+    install -D "$src" "$out/share/java/${finalAttrs.jarfilename}"
 
     makeWrapper ${jre_headless}/bin/java $out/bin/detekt \
-      --add-flags "-jar $out/share/java/${jarfilename}"
+      --add-flags "-jar $out/share/java/${finalAttrs.jarfilename}"
 
     runHook postInstall
   '';
 
-  passthru.tests.version = testers.testVersion { package = detekt; };
+  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = with lib; {
     description = "Static code analysis for Kotlin";
@@ -36,4 +36,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ mdr ];
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
   };
-}
+})

From 82ada5c114ccb753d4a88e247a14805e8b82a834 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:56 +0200
Subject: [PATCH 06/22] dieharder: use finalAttrs.finalPackage

---
 pkgs/tools/security/dieharder/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/dieharder/default.nix b/pkgs/tools/security/dieharder/default.nix
index 2cc5f719aa1d..c7804f0c5f4d 100644
--- a/pkgs/tools/security/dieharder/default.nix
+++ b/pkgs/tools/security/dieharder/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, gsl
-, dieharder, testers }:
+, testers }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dieharder";
   version = "3.31.1";
 
   src = fetchurl {
-    url = "http://webhome.phy.duke.edu/~rgb/General/dieharder/dieharder-${version}.tgz";
+    url = "http://webhome.phy.duke.edu/~rgb/General/dieharder/dieharder-${finalAttrs.version}.tgz";
     hash = "sha256-bP8P+DlMVTVJrHQzNZzPyVX7JnlCYDFGIN+l5M1Lcn8=";
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gsl ];
 
   passthru = {
-    tests.version = testers.testVersion { package = dieharder; };
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
   };
 
   meta = with lib; {
@@ -34,4 +34,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ zhaofengli ];
     platforms = platforms.unix;
   };
-}
+})

From 57002b84d204602224db56a7b9c41475ae759f32 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:56 +0200
Subject: [PATCH 07/22] donkey: use finalAttrs.finalPackage

---
 pkgs/tools/security/donkey/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/donkey/default.nix b/pkgs/tools/security/donkey/default.nix
index f56811cc273f..e481744ee7d5 100644
--- a/pkgs/tools/security/donkey/default.nix
+++ b/pkgs/tools/security/donkey/default.nix
@@ -4,20 +4,19 @@
 , coreutils
 , lib
 , testers
-, donkey
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "donkey";
   version = "1.2.0";
 
   src = fetchFromGitLab {
     owner = "donkey";
     repo = "donkey";
-    rev = "tags/release/${version}";
+    rev = "tags/release/${finalAttrs.version}";
     hash = "sha256-2xgb9l0Eko39HJVROAWEIP3qLg5t/5h/rm2MoXoKnJI=";
   };
-  sourceRoot = "${src.name}/src";
+  sourceRoot = "${finalAttrs.src.name}/src";
 
   buildInputs = [ libmd ];
 
@@ -27,7 +26,7 @@ stdenv.mkDerivation rec {
     export INSTALL_DATA="${coreutils}/bin/install -m 444"
   '';
 
-  passthru.tests.version = testers.testVersion { package = donkey; };
+  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = with lib; {
     description = "Alternative for S/KEY's 'key' command";
@@ -51,4 +50,4 @@ The name "Donkey" is an acronym of "Don't Key".
     maintainers = with maintainers; [ raboof ];
     platforms = platforms.all;
   };
-}
+})

From 644c9ab3d61b144e8b1ad0bf993f964d7609217b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:56 +0200
Subject: [PATCH 08/22] dunst: use finalAttrs.finalPackage

---
 pkgs/by-name/du/dunst/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix
index f01f65c86283..c5dc4b04eac7 100644
--- a/pkgs/by-name/du/dunst/package.nix
+++ b/pkgs/by-name/du/dunst/package.nix
@@ -23,7 +23,6 @@
 , xorgproto
 , librsvg
 , testers
-, dunst
 , withX11 ? true
 , withWayland ? true
 }:
@@ -89,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "jq" "${lib.getExe jq}"
   '';
 
-  passthru.tests.version = testers.testVersion { package = dunst; };
+  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = with lib; {
     description = "Lightweight and customizable notification daemon";

From eba30179f408f0c57315c940ade22a62334e02db Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:56 +0200
Subject: [PATCH 09/22] gummy: use finalAttrs.finalPackage

---
 pkgs/tools/misc/gummy/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/gummy/default.nix b/pkgs/tools/misc/gummy/default.nix
index e2d600d8e2ee..628d5e9e7d16 100644
--- a/pkgs/tools/misc/gummy/default.nix
+++ b/pkgs/tools/misc/gummy/default.nix
@@ -2,7 +2,6 @@
 , stdenv
 , fetchFromGitea
 , testers
-, gummy
 , cmake
 , libX11
 , libXext
@@ -17,7 +16,7 @@
 , spdlog
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gummy";
   version = "0.6.0";
 
@@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
     domain = "codeberg.org";
     owner = "fusco";
     repo = "gummy";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-kATieFf+dEpcYgSEPoETacP7R+u2dOrg7rOhIkNQ1uE=";
   };
 
@@ -65,7 +64,7 @@ stdenv.mkDerivation rec {
     ln -s $out/libexec/gummyd $out/bin/gummyd
   '';
 
-  passthru.tests.version = testers.testVersion { package = gummy; };
+  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = with lib; {
     homepage = "https://codeberg.org/fusco/gummy";
@@ -77,4 +76,4 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Only;
     maintainers = [ ];
   };
-}
+})

From 039acd3e8ba8bce8e7ed61d39fcb1c286bb8f7af Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:56 +0200
Subject: [PATCH 10/22] infisical: use finalAttrs.finalPackage

---
 pkgs/development/tools/infisical/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix
index 665dda06b2fc..675334b14e39 100644
--- a/pkgs/development/tools/infisical/default.nix
+++ b/pkgs/development/tools/infisical/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, testers, infisical, installShellFiles }:
+{ stdenv, lib, fetchurl, testers, installShellFiles }:
 
 # this expression is mostly automated, and you are STRONGLY
 # RECOMMENDED to use to nix-update for updating this expression when new
@@ -36,7 +36,7 @@ let
     fetchurl { inherit name url hash; };
 
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "infisical";
   version = version;
   inherit src;
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
 
   passthru = {
     updateScript = ./update.sh;
-    tests.version = testers.testVersion { package = infisical; };
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
   };
 
   meta = with lib; {
@@ -84,4 +84,4 @@ stdenv.mkDerivation {
       "x86_64-darwin"
     ];
   };
-}
+})

From 59683380680a2bd17ebdfc6e452361089430ccea Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:57 +0200
Subject: [PATCH 11/22] infnoise: use finalAttrs.finalPackage

---
 pkgs/misc/drivers/infnoise/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/drivers/infnoise/default.nix b/pkgs/misc/drivers/infnoise/default.nix
index 47ff00459923..e2f117e1e8c4 100644
--- a/pkgs/misc/drivers/infnoise/default.nix
+++ b/pkgs/misc/drivers/infnoise/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, libftdi
-, infnoise, testers }:
+, testers }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "infnoise";
   version = "0.3.2";
 
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  GIT_COMMIT = src.rev;
-  GIT_VERSION = version;
+  GIT_COMMIT = finalAttrs.src.rev;
+  GIT_VERSION = finalAttrs.version;
   GIT_DATE = "2019-08-12";
 
   buildInputs = [ libftdi ];
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    tests.version = testers.testVersion { package = infnoise; };
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
   };
 
   meta = with lib; {
@@ -57,4 +57,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ StijnDW zhaofengli ];
     platforms = platforms.linux;
   };
-}
+})

From 879556bc9722dac68ddc7d848179f96304271a94 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:57 +0200
Subject: [PATCH 12/22] ios-webkit-debug-proxy: use finalAttrs.finalPackage

---
 pkgs/by-name/io/ios-webkit-debug-proxy/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix
index 8ec3a3252907..a968dd923196 100644
--- a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix
+++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix
@@ -13,7 +13,6 @@
   libusb1,
   openssl,
 
-  ios-webkit-debug-proxy,
   nix-update-script,
   testers,
 }:
@@ -61,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = nix-update-script { };
-    tests.version = testers.testVersion { package = ios-webkit-debug-proxy; };
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
   };
 
   meta = with lib; {

From 76acfdb15dcdfee8e20326f7e86a9a09f97e3449 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:57 +0200
Subject: [PATCH 13/22] komorebi: use finalAttrs.finalPackage

---
 pkgs/applications/graphics/komorebi/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/komorebi/default.nix b/pkgs/applications/graphics/komorebi/default.nix
index 4d60cde30cd3..f98549cb14ff 100644
--- a/pkgs/applications/graphics/komorebi/default.nix
+++ b/pkgs/applications/graphics/komorebi/default.nix
@@ -13,17 +13,16 @@
 , ninja
 , wrapGAppsHook3
 , testers
-, komorebi
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "komorebi";
   version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "Komorebi-Fork";
     repo = "komorebi";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-vER69dSxu4JuWNAADpkxHE/zjOMhQp+Fc21J+JHQ8xk=";
   };
 
@@ -44,7 +43,7 @@ stdenv.mkDerivation rec {
     clutter-gst
   ];
 
-  passthru.tests.version = testers.testVersion { package = komorebi; };
+  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = with lib; {
     description = "Beautiful and customizable wallpaper manager for Linux";
@@ -53,4 +52,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ kranzes ];
     platforms = platforms.linux;
   };
-}
+})

From 6038b25d0ea5e53d1fd66712b29b9033a4e1ac76 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:57 +0200
Subject: [PATCH 14/22] lgogdownloader: use finalAttrs.finalPackage

---
 pkgs/by-name/lg/lgogdownloader/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix
index e0a3d022163e..bdd32121a5c0 100644
--- a/pkgs/by-name/lg/lgogdownloader/package.nix
+++ b/pkgs/by-name/lg/lgogdownloader/package.nix
@@ -15,19 +15,18 @@
   html-tidy,
   libsForQt5,
   testers,
-  lgogdownloader,
 
   enableGui ? true,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lgogdownloader";
   version = "3.15";
 
   src = fetchFromGitHub {
     owner = "Sude-";
     repo = "lgogdownloader";
-    rev = "refs/tags/v${version}";
+    rev = "refs/tags/v${finalAttrs.version}";
     hash = "sha256-h2N5pRwwZZ3jAvRrT4Ebk4N5WO9tQjDrp8KRqriwUi4=";
   };
 
@@ -56,7 +55,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON";
 
   passthru.tests = {
-    version = testers.testVersion { package = lgogdownloader; };
+    version = testers.testVersion { package = finalAttrs.finalPackage; };
   };
 
   meta = {
@@ -67,4 +66,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ _0x4A6F ];
     platforms = lib.platforms.linux;
   };
-}
+})

From c14bf38c7911453100c199edd809e9b366392c25 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:57 +0200
Subject: [PATCH 15/22] notmuch: use finalAttrs.finalPackage

---
 pkgs/applications/networking/mailreaders/notmuch/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 588cd4326a61..b70512a9d151 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -2,7 +2,6 @@
 , pkg-config, gnupg
 , xapian, gmime3, sfsexp, talloc, zlib
 , doxygen, perl, texinfo
-, notmuch
 , pythonPackages
 , emacs
 , ruby
@@ -157,7 +156,7 @@ stdenv.mkDerivation (finalAttrs: {
       paths = with ruby.gems; [ mail ];
       pathsToLink = [ "/lib" "/nix-support" ];
     };
-    tests.version = testers.testVersion { package = notmuch; };
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
     updateScript = gitUpdater {
       url = "https://git.notmuchmail.org/git/notmuch";

From a1b7dfbc6ca9664254d6fe1f04da40c3ecfd7c4a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:58 +0200
Subject: [PATCH 16/22] packcc: use finalAttrs.finalPackage

---
 pkgs/development/tools/packcc/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/packcc/default.nix b/pkgs/development/tools/packcc/default.nix
index 0f756388be3b..682bc519238e 100644
--- a/pkgs/development/tools/packcc/default.nix
+++ b/pkgs/development/tools/packcc/default.nix
@@ -2,21 +2,20 @@
   bats,
   fetchFromGitHub,
   lib,
-  packcc,
   python3,
   stdenv,
   testers,
   uncrustify,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "packcc";
   version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "arithy";
     repo = "packcc";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-k1C/thvr/5fYrgu/j8YN3kwXp4k26sC9AhYhYAKQuX0=";
   };
 
@@ -61,7 +60,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.tests.version = testers.testVersion { package = packcc; };
+  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = with lib; {
     description = "Parser generator for C";
@@ -72,10 +71,10 @@ stdenv.mkDerivation rec {
       - Supports direct and indirect left-recursive grammar rules.
     '';
     homepage = "https://github.com/arithy/packcc";
-    changelog = "https://github.com/arithy/packcc/releases/tag/${src.rev}";
+    changelog = "https://github.com/arithy/packcc/releases/tag/${finalAttrs.src.rev}";
     license = licenses.mit;
     maintainers = with maintainers; [ azahi ];
     platforms = platforms.unix;
     mainProgram = "packcc";
   };
-}
+})

From 85c14074e0d84830e4e7a5fcf633bea46f3b01cc Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:58 +0200
Subject: [PATCH 17/22] photoprism: use finalAttrs.finalPackage

---
 pkgs/servers/photoprism/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/photoprism/default.nix b/pkgs/servers/photoprism/default.nix
index 0c39ad8b6b81..499758520882 100644
--- a/pkgs/servers/photoprism/default.nix
+++ b/pkgs/servers/photoprism/default.nix
@@ -1,4 +1,5 @@
-{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg_7, libheif, exiftool, imagemagick, makeWrapper, testers
+{ lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg_7, libheif, exiftool, imagemagick, makeWrapper, testers
+, callPackage
 , nixosTests
 , librsvg }:
 
@@ -13,9 +14,9 @@ let
     hash = "sha256-ihDv5c5RUjDbFcAHJjzp/8qCwKfA+rlFXPziaYarzs8=";
   };
 
-  libtensorflow = pkgs.callPackage ./libtensorflow.nix { };
-  backend = pkgs.callPackage ./backend.nix { inherit libtensorflow src version; };
-  frontend = pkgs.callPackage ./frontend.nix { inherit src version; };
+  libtensorflow = callPackage ./libtensorflow.nix { };
+  backend = callPackage ./backend.nix { inherit libtensorflow src version; };
+  frontend = callPackage ./frontend.nix { inherit src version; };
 
   fetchModel = { name, hash }:
     fetchzip {
@@ -41,7 +42,7 @@ let
 
   assets_path = "$out/share/${pname}";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   inherit pname version;
 
   nativeBuildInputs = [
@@ -78,7 +79,7 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  passthru.tests.version = testers.testVersion { package = pkgs.photoprism; };
+  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
   passthru.tests.photoprism = nixosTests.photoprism;
 
   meta = with lib; {
@@ -89,4 +90,4 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ benesim ];
     mainProgram = "photoprism";
   };
-}
+})

From 4865536f92b40ed1ea672e7abbfed5856a589e34 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:58 +0200
Subject: [PATCH 18/22] pmacct: use finalAttrs.finalPackage

---
 pkgs/tools/networking/pmacct/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix
index 542339b05dbb..3cd43ec9a873 100644
--- a/pkgs/tools/networking/pmacct/default.nix
+++ b/pkgs/tools/networking/pmacct/default.nix
@@ -14,17 +14,16 @@
 , withMysql ? true, libmysqlclient, zlib, numactl
 , gnutlsSupport ? false, gnutls
 , testers
-, pmacct
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "1.7.9";
   pname = "pmacct";
 
   src = fetchFromGitHub {
     owner = "pmacct";
     repo = "pmacct";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-3gV6GUhTQnH09NRIJQI0xBn05Bgo3AJsE2cSxNPXITo=";
   };
 
@@ -55,7 +54,7 @@ stdenv.mkDerivation rec {
   ++ lib.optional gnutlsSupport "--enable-gnutls";
 
   passthru.tests = {
-    version = testers.testVersion { package = pmacct; command = "pmacct -V"; };
+    version = testers.testVersion { package = finalAttrs.finalPackage; command = "pmacct -V"; };
   };
 
   meta = with lib; {
@@ -70,4 +69,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ _0x4A6F ];
     platforms = platforms.unix;
   };
-}
+})

From 9f5f2c9b4dce31cd867f58554f1de5a8822d8014 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:58 +0200
Subject: [PATCH 19/22] renovate: use finalAttrs.finalPackage

---
 pkgs/by-name/re/renovate/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix
index e7f615aba604..edea55abb82d 100644
--- a/pkgs/by-name/re/renovate/package.nix
+++ b/pkgs/by-name/re/renovate/package.nix
@@ -7,7 +7,6 @@
   overrideSDK,
   pnpm_9,
   python3,
-  renovate,
   testers,
   xcbuild,
   nixosTests,
@@ -91,7 +90,7 @@ stdenv'.mkDerivation (finalAttrs: {
 
   passthru = {
     tests = {
-      version = testers.testVersion { package = renovate; };
+      version = testers.testVersion { package = finalAttrs.finalPackage; };
       vm-test = nixosTests.renovate;
     };
     updateScript = nix-update-script { };

From 77922ccc8098821d0904f2451a23d7bffcef2d6f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:32:59 +0200
Subject: [PATCH 20/22] violet: use finalAttrs.finalPackage

---
 pkgs/by-name/vi/violet/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/violet/package.nix b/pkgs/by-name/vi/violet/package.nix
index 35e13eea544f..e1fada3863af 100644
--- a/pkgs/by-name/vi/violet/package.nix
+++ b/pkgs/by-name/vi/violet/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   nix-update-script,
   stdenv,
-  violet,
   testers,
 }:
 
@@ -24,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = nix-update-script { };
-    tests = testers.testVersion { package = violet; };
+    tests = testers.testVersion { package = finalAttrs.finalPackage; };
   };
 
   meta = {

From f793451a34abd1849b060c803eb2be05a00e478b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:33:20 +0200
Subject: [PATCH 21/22] undetected-chromedriver: use finalAttrs.finalPackage

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

diff --git a/pkgs/by-name/un/undetected-chromedriver/package.nix b/pkgs/by-name/un/undetected-chromedriver/package.nix
index 3976f3cc685b..844bbe3b069c 100644
--- a/pkgs/by-name/un/undetected-chromedriver/package.nix
+++ b/pkgs/by-name/un/undetected-chromedriver/package.nix
@@ -6,10 +6,9 @@
   python3,
 
   testers,
-  undetected-chromedriver,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "undetected-chromedriver";
   inherit (chromedriver) version;
 
@@ -34,11 +33,11 @@ stdenv.mkDerivation {
     install -D -m 0555 chromedriver $out/bin/undetected-chromedriver
   '';
 
-  passthru.tests.version = testers.testVersion { package = undetected-chromedriver; };
+  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = chromedriver.meta // {
     description = "Custom Selenium ChromeDriver that passes all bot mitigation systems";
     mainProgram = "undetected-chromedriver";
     maintainers = with lib.maintainers; [ paveloom ];
   };
-}
+})

From a4f7690fdcf81b0d53f8387c465d44ac197df01a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 17 Sep 2024 03:33:52 +0200
Subject: [PATCH 22/22] yandex-cloud: use finalAttrs.finalPackage

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

diff --git a/pkgs/by-name/ya/yandex-cloud/package.nix b/pkgs/by-name/ya/yandex-cloud/package.nix
index d93adcae1ab5..e45cf8ab738a 100644
--- a/pkgs/by-name/ya/yandex-cloud/package.nix
+++ b/pkgs/by-name/ya/yandex-cloud/package.nix
@@ -12,14 +12,13 @@
   nix,
   # tests
   testers,
-  yandex-cloud,
 }:
 let
   pname = "yandex-cloud";
   sources = lib.importJSON ./sources.json;
   inherit (sources) version binaries;
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   inherit pname version;
 
   src = fetchurl binaries.${stdenv.hostPlatform.system};
@@ -68,7 +67,7 @@ stdenv.mkDerivation {
         (lib.makeBinPath [ nix ])
       ];
     } ./update.py;
-    tests.version = testers.testVersion { package = yandex-cloud; };
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
   };
 
   meta = {
@@ -96,4 +95,4 @@ stdenv.mkDerivation {
     ];
     mainProgram = "yc";
   };
-}
+})