From 2ad7a28bed1d77d13200796865cbf49786ee1670 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 14 Sep 2025 14:19:48 +0000 Subject: [PATCH 1/9] aeolus-stops: switch to finalAttrs, hardcode subdir string, fully qualify lib attributes --- pkgs/by-name/ae/aeolus-stops/package.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ae/aeolus-stops/package.nix b/pkgs/by-name/ae/aeolus-stops/package.nix index 5d3808bbe0d3..1196d309f530 100644 --- a/pkgs/by-name/ae/aeolus-stops/package.nix +++ b/pkgs/by-name/ae/aeolus-stops/package.nix @@ -4,25 +4,23 @@ fetchurl, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "stops"; version = "0.4.0"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/stops-${version}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/stops-${finalAttrs.version}.tar.bz2"; hash = "sha256-DnmguOAGyw9nv88ekJfbC04Qwbsw5tXEAaKeiCQR/LA="; }; outputHashMode = "recursive"; outputHash = "sha256-gGHowq7g7MZmnhrpqG+3wNLwQCtpiBB88euIKeQIpJ0="; - subdir = "share/Aeolus/stops"; - installPhase = '' runHook preInstall - mkdir -p $out/${subdir} - cp -r * $out/${subdir} + mkdir -p $out/share/Aeolus/stops + cp -r * $out/share/Aeolus/stops runHook postInstall ''; @@ -36,4 +34,4 @@ stdenvNoCC.mkDerivation rec { nico202 ]; }; -} +}) From 88d4cdcb4961bf62e8a71d6ba81bee0c54c41855 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 14 Sep 2025 15:48:28 +0000 Subject: [PATCH 2/9] aeolus: hardcode subdir path --- pkgs/by-name/ae/aeolus/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ae/aeolus/package.nix b/pkgs/by-name/ae/aeolus/package.nix index e62a65cbbe38..6242734f9045 100644 --- a/pkgs/by-name/ae/aeolus/package.nix +++ b/pkgs/by-name/ae/aeolus/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { cfg = '' # Aeolus system wide default options # Ignored if ~/.aeolusrc with local options exists - -u -S ${aeolus-stops}/${aeolus-stops.subdir} + -u -S ${aeolus-stops}/share/Aeolus/stops ''; in '' From 09d963e5482f1f4b6ca0b233bbaa47d90637690e Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 14 Sep 2025 14:28:34 +0000 Subject: [PATCH 3/9] akkoma: hardcode pname value --- pkgs/by-name/ak/akkoma/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ak/akkoma/package.nix b/pkgs/by-name/ak/akkoma/package.nix index 22157be35fb4..42622e228edb 100644 --- a/pkgs/by-name/ak/akkoma/package.nix +++ b/pkgs/by-name/ak/akkoma/package.nix @@ -47,7 +47,7 @@ beamPackages.mixRelease rec { ]; mixFodDeps = beamPackages.fetchMixDeps { - pname = "mix-deps-${pname}"; + pname = "mix-deps-akkoma"; inherit src version; hash = "sha256-DqSeMjom9UjgGjjfJomWCr7jQhXEkqVrDCvW3+pDtcQ="; From 4d948d71fba6eda247f7b69ea85f995d03eed497 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 14 Sep 2025 14:34:53 +0000 Subject: [PATCH 4/9] alfaview: hardcode pname value in URL, switch to --replace-fail, finalAttrs --- pkgs/by-name/al/alfaview/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix index fe9d38198f42..9c5cad8b3489 100644 --- a/pkgs/by-name/al/alfaview/package.nix +++ b/pkgs/by-name/al/alfaview/package.nix @@ -29,12 +29,12 @@ libx11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alfaview"; version = "9.24.1"; src = fetchurl { - url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; + url = "https://assets.alfaview.com/stable/linux/deb/alfaview_${finalAttrs.version}.deb"; hash = "sha256-vRo5ZD3yYTWhR6fbc/HFtBBbYuq3cGbxPuDlSt5D8XM="; }; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { libxcb-render-util ]; - libPath = lib.makeLibraryPath buildInputs; + libPath = lib.makeLibraryPath finalAttrs.buildInputs; dontBuild = true; dontConfigure = true; @@ -84,11 +84,11 @@ stdenv.mkDerivation rec { mv opt $out substituteInPlace $out/share/applications/alfaview.desktop \ - --replace "/opt/alfaview" "$out/bin" \ - --replace "/usr/share/pixmaps/alfaview_production.png" alfaview_production + --replace-fail "/opt/alfaview" "$out/bin" \ + --replace-fail "/usr/share/pixmaps/alfaview.png" alfaview makeWrapper $out/opt/alfaview/alfaview $out/bin/alfaview \ - --prefix LD_LIBRARY_PATH : ${libPath} + --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath} runHook postInstall ''; @@ -102,4 +102,4 @@ stdenv.mkDerivation rec { mainProgram = "alfaview"; platforms = [ "x86_64-linux" ]; }; -} +}) From 1aecdfd45c1d6377d94c031af49656ff55c54ee1 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 14 Sep 2025 14:39:40 +0000 Subject: [PATCH 5/9] altair: fix fetchurl attr, hardcode binary/desktop names, fully qualify lib attrs Use `hash` instead of deprecated `sha256`, replace ${pname} with explicit `altair` in wrapper and .desktop handling, and remove broad `with lib;` in meta. --- pkgs/by-name/al/altair/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/al/altair/package.nix b/pkgs/by-name/al/altair/package.nix index e4059055cbeb..e98b119f8fbe 100644 --- a/pkgs/by-name/al/altair/package.nix +++ b/pkgs/by-name/al/altair/package.nix @@ -22,12 +22,12 @@ appimageTools.wrapType2 { nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = '' - wrapProgram $out/bin/${pname} \ + wrapProgram $out/bin/altair \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + install -m 444 -D ${appimageContents}/altair.desktop -t $out/share/applications + substituteInPlace $out/share/applications/altair.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=altair' cp -r ${appimageContents}/usr/share/icons $out/share ''; From 858d5017cfb618bc29c73c95b706bbf2057a7fbf Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 14 Sep 2025 14:44:43 +0000 Subject: [PATCH 6/9] analog: use finalAttrs, update fetchFromGitHub args, fix LANGDIR path Switch to finalAttrs form, replace rev/sha256 with tag/hash, and hardcode LANGDIR to "analog" instead of using ${pname} for consistency. --- pkgs/by-name/an/analog/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/an/analog/package.nix b/pkgs/by-name/an/analog/package.nix index 6bfb07561a27..38da846cc176 100644 --- a/pkgs/by-name/an/analog/package.nix +++ b/pkgs/by-name/an/analog/package.nix @@ -8,15 +8,15 @@ libpng, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "analog"; version = "6.0.18"; src = fetchFromGitHub { owner = "c-amie"; repo = "analog-ce"; - tag = version; - sha256 = "sha256-NCturEibnpl6+paUZezksHzP33WtAzfIolvBLeEHXjY="; + tag = finalAttrs.version; + hash = "sha256-NCturEibnpl6+paUZezksHzP33WtAzfIolvBLeEHXjY="; }; buildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i src/anlghead.h \ -e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \ - -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/${pname}/lang/\"|g" + -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/analog/lang/\"|g" substituteInPlace src/Makefile \ --replace-fail "gcc" "${stdenv.cc.targetPrefix}cc" \ --replace-fail "LIBS = -lm" "LIBS = -lm -lpng -lgd -ljpeg -lz -lbz2" \ @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { mainProgram = "analog"; }; -} +}) From 6eef837e3970c7935c177dcd8d92888f4b4f68d2 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 14 Sep 2025 14:48:13 +0000 Subject: [PATCH 7/9] andika: use finalAttrs, update URL/doc paths, fully qualify lib attrs in meta Switch to finalAttrs form, reference finalAttrs.version in URL and doc install path, and replace broad `with lib;` with explicit lib-qualified attributes. --- pkgs/by-name/an/andika/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/an/andika/package.nix b/pkgs/by-name/an/andika/package.nix index 481426a3d502..b71bafa3408d 100644 --- a/pkgs/by-name/an/andika/package.nix +++ b/pkgs/by-name/an/andika/package.nix @@ -4,12 +4,12 @@ fetchzip, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "andika"; version = "7.000"; src = fetchzip { - url = "https://software.sil.org/downloads/r/andika/Andika-${version}.zip"; + url = "https://software.sil.org/downloads/r/andika/Andika-${finalAttrs.version}.zip"; hash = "sha256-46kbzFxNEpSuqyUwpScnxxgZi1dJlwK+AUkdULcinok="; }; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { runHook preInstall install -Dm644 *.ttf -t $out/share/fonts/truetype - install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} + install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/andika-${finalAttrs.version} runHook postInstall ''; @@ -34,4 +34,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.f--t ]; }; -} +}) From 2174f07ecc60f5b7810a5943ccb9892f74459519 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 14 Sep 2025 14:51:20 +0000 Subject: [PATCH 8/9] annapurna-sil: use finalAttrs, update URL/doc paths, fully qualify lib attrs in meta Switch to finalAttrs form, reference finalAttrs.version in URL and doc install path, and replace broad `with lib;` with explicit lib-qualified attributes. --- pkgs/by-name/an/annapurna-sil/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/an/annapurna-sil/package.nix b/pkgs/by-name/an/annapurna-sil/package.nix index d30aaa2ab603..d8fbe0f5247a 100644 --- a/pkgs/by-name/an/annapurna-sil/package.nix +++ b/pkgs/by-name/an/annapurna-sil/package.nix @@ -4,12 +4,12 @@ fetchzip, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "annapurna-sil"; version = "2.100"; src = fetchzip { - url = "https://software.sil.org/downloads/r/annapurna/AnnapurnaSIL-${version}.zip"; + url = "https://software.sil.org/downloads/r/annapurna/AnnapurnaSIL-${finalAttrs.version}.zip"; hash = "sha256-TFaCchtd9SRGsU9r+m8QOvZfc7/FJxwclkSfbLwf6/4="; }; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { runHook preInstall install -Dm644 *.ttf -t $out/share/fonts/truetype - install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} + install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/annapurna-sil-${finalAttrs.version} runHook postInstall ''; @@ -32,4 +32,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.kmein ]; }; -} +}) From 8e66dc69206da44436e9cd3c04af81fd47946125 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 14 Sep 2025 15:02:08 +0000 Subject: [PATCH 9/9] barcode: use finalAttrs, update fetch args, fully qualify lib attrs in meta Switch to finalAttrs form, replace pname/version interpolation with finalAttrs.version, update to hash attr, and replace broad `with lib;` with explicit lib-qualified attributes. --- pkgs/by-name/ba/barcode/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/barcode/package.nix b/pkgs/by-name/ba/barcode/package.nix index f58b710140df..fcd810276487 100644 --- a/pkgs/by-name/ba/barcode/package.nix +++ b/pkgs/by-name/ba/barcode/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "barcode"; src = fetchurl { url = "mirror://gnu/barcode/barcode-${finalAttrs.version}.tar.xz"; - sha256 = "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8"; + hash = "sha256-6H7PZCFXPhfONYeduDKGF3lSWGUIMa/9Al+6QvFVzcY="; }; patches = [ # Pull upstream patch for -fno-common toolchains. (fetchpatch { name = "fno-common.patch"; url = "http://git.savannah.gnu.org/cgit/barcode.git/patch/?id=4654f68706a459c9602d9932b56a56e8930f7d53"; - sha256 = "15kclzcwlh0ymr7m48vc0m8z98q0wf4xbfcky4g1y8yvvpvvrfgc"; + hash = "sha256-7Lm8993bIx8e8ZO51YnjAKP0UQVsI1JPrh5AytmnbJY="; }) ];