From 6ac4d821b80ff346cc6bb3402a955145c6f28a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Thu, 25 Dec 2025 09:06:37 +0100
Subject: [PATCH] use finalAttrs

---
 packages/auc.nix                              | 55 +++++++++----------
 packages/hc.nix                               | 36 ++++++------
 packages/opustags.nix                         | 11 ++--
 .../indic-transliteration/default.nix         |  9 +--
 packages/stag.nix                             | 11 ++--
 5 files changed, 55 insertions(+), 67 deletions(-)

diff --git a/packages/auc.nix b/packages/auc.nix
index bef3100..5bc0902 100644
--- a/packages/auc.nix
+++ b/packages/auc.nix
@@ -3,36 +3,33 @@
   fetchFromGitHub,
   lib,
   pandoc,
-}: let
-  owner = "kamalist";
+}:
+stdenv.mkDerivation (finalAttrs: {
   pname = "auc";
-in
-  stdenv.mkDerivation {
-    inherit pname;
-    version = "2019-04-02";
+  version = "2019-04-02";
 
-    src = fetchFromGitHub {
-      inherit owner;
-      repo = "AUC";
-      rev = "66d1cd57472442b4bf3c1ed12ca5cadd57d076b3";
-      sha256 = "0gb4asmlfr19h42f3c5wg9c9i3014if3ymrqan6w9klgzgfyh2la";
-    };
+  src = fetchFromGitHub {
+    owner = "kamalist";
+    repo = "AUC";
+    rev = "66d1cd57472442b4bf3c1ed12ca5cadd57d076b3";
+    sha256 = "0gb4asmlfr19h42f3c5wg9c9i3014if3ymrqan6w9klgzgfyh2la";
+  };
 
-    installPhase = ''
-      mkdir -p $out/{bin,man/man1}
-      install auc $out/bin
-      ${pandoc}/bin/pandoc -V title=${lib.escapeShellArg pname} -V section=1 $src/README.md -s -t man -o $out/man/man1/auc.1
+  installPhase = ''
+    mkdir -p $out/{bin,man/man1}
+    install auc $out/bin
+    ${pandoc}/bin/pandoc -V title=${lib.escapeShellArg finalAttrs.pname} -V section=1 $src/README.md -s -t man -o $out/man/man1/auc.1
+  '';
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "Command-line Roman calendar";
+    longDescription = ''
+      AUC (Ab Urbe condita) is a command-line Roman calendar tool. Currently it shows the specified date in the format of the Ancient Romans.
     '';
-
-    doCheck = true;
-
-    meta = with lib; {
-      description = "Command-line Roman calendar";
-      longDescription = ''
-        AUC (Ab Urbe condita) is a command-line Roman calendar tool. Currently it shows the specified date in the format of the Ancient Romans.
-      '';
-      license = licenses.mit;
-      maintainers = [maintainers.kmein];
-      platforms = platforms.all;
-    };
-  }
+    license = licenses.mit;
+    maintainers = [ maintainers.kmein ];
+    platforms = platforms.all;
+  };
+})
diff --git a/packages/hc.nix b/packages/hc.nix
index 1b83c1b..11adf37 100644
--- a/packages/hc.nix
+++ b/packages/hc.nix
@@ -12,19 +12,17 @@
   util-linux,
   zbar,
 }:
-let
+stdenv.mkDerivation (finalAttrs: {
+  name = "hc-${finalAttrs.version}";
   version = "1.0.0";
-in
-stdenv.mkDerivation {
-  name = "hc-${version}";
 
   src = fetchgit {
     url = "https://cgit.krebsco.de/hc";
-    rev = "refs/tags/v${version}";
+    rev = "refs/tags/v${finalAttrs.version}";
     sha256 = "09349gja22p0j3xs082kp0fnaaada14bafszn4r3q7rg1id2slfb";
   };
 
-  nativeBuildInputs = [makeWrapper];
+  nativeBuildInputs = [ makeWrapper ];
 
   buildPhase = null;
 
@@ -34,19 +32,21 @@ stdenv.mkDerivation {
     cp $src/bin/hc $out/bin/hc
 
     wrapProgram $out/bin/hc \
-      --prefix PATH : ${lib.makeBinPath [
-      coreutils
-      findutils
-      gawk
-      gnugrep
-      qrencode
-      texlive.combined.scheme-full
-      util-linux
-      zbar
-    ]}
+      --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          findutils
+          gawk
+          gnugrep
+          qrencode
+          texlive.combined.scheme-full
+          util-linux
+          zbar
+        ]
+      }
   '';
 
   meta = {
-    inherit version;
+    version = finalAttrs.version;
   };
-}
+})
diff --git a/packages/opustags.nix b/packages/opustags.nix
index 91dd5f8..7124d99 100644
--- a/packages/opustags.nix
+++ b/packages/opustags.nix
@@ -6,17 +6,14 @@
   libogg,
   fetchFromGitHub,
 }:
-let
-  version = "1.3.0";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   name = "opustags";
-  version = version;
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "fmang";
     repo = "opustags";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "09z0cdg20algaj2yyhfz3hxh1biwjjvzx1pc2vdc64n8lkswqsc1";
   };
 
@@ -35,4 +32,4 @@ stdenv.mkDerivation {
     description = "Ogg Opus tags editor";
     platforms = platforms.all;
   };
-}
+})
diff --git a/packages/python3Packages/indic-transliteration/default.nix b/packages/python3Packages/indic-transliteration/default.nix
index 2bc54e7..056f293 100644
--- a/packages/python3Packages/indic-transliteration/default.nix
+++ b/packages/python3Packages/indic-transliteration/default.nix
@@ -6,14 +6,11 @@
   regex,
   ...
 }:
-let
+buildPythonPackage (finalAttrs: {
   pname = "indic_transliteration";
-in
-buildPythonPackage {
-  inherit pname;
   version = "unstable-2020-12-15";
   src = fetchFromGitHub {
-    repo = pname;
+    repo = finalAttrs.pname;
     owner = "sanskrit-coders";
     rev = "2ea25a03af15937916b6768835e056166986c567";
     sha256 = "1pcf800hl0zkcffc47mkjq9mizsxdi0hwxlnij5bvbqdshd3w9ll";
@@ -21,4 +18,4 @@ buildPythonPackage {
   patches = [./regex-version.patch];
   propagatedBuildInputs = [backports_functools_lru_cache selenium regex];
   doCheck = false;
-}
+})
diff --git a/packages/stag.nix b/packages/stag.nix
index 7007187..e724535 100644
--- a/packages/stag.nix
+++ b/packages/stag.nix
@@ -6,17 +6,14 @@
   taglib,
   zlib,
 }:
-let
-  version = "1.0";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "stag";
-  version = version;
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "smabie";
     repo = "stag";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-IWb6ZbPlFfEvZogPh8nMqXatrg206BTV2DYg7BMm7R4=";
   };
 
@@ -46,4 +43,4 @@ stdenv.mkDerivation {
     maintainers = [ lib.maintainers.kmein ];
     platforms = lib.platforms.unix;
   };
-}
+})