NixOS · alyssais · Jun 6, 2025 · Jun 5, 2025
diff --git a/pkgs/by-name/au/auto-multiple-choice/package.nix b/pkgs/by-name/au/auto-multiple-choice/package.nix
@@ -23,12 +23,12 @@
   pkg-config,
   poppler,
 }:
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "auto-multiple-choice";
   version = "1.7.0";
   src = fetchurl {
-    url = "https://download.auto-multiple-choice.net/${pname}_${version}_dist.tar.gz";
-    # before 1.7.0, the URL pattern used "precomp" instead of "dist".    ^^^^
+    url = "https://download.auto-multiple-choice.net/auto-multiple-choice_${finalAttrs.version}_dist.tar.gz";
+    # before 1.7.0, the URL pattern used "precomp" instead of "dist".
     sha256 = "sha256-37kWqgdvZopvNSU6LA/FmY2wfSJz3rRSlaQF2HSbdmA=";
   };
 

diff --git a/pkgs/by-name/be/besu/package.nix b/pkgs/by-name/be/besu/package.nix
@@ -9,12 +9,12 @@
   testers,
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "besu";
   version = "24.1.2";
 
   src = fetchurl {
-    url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz";
+    url = "https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/${finalAttrs.version}/besu-${finalAttrs.version}.tar.gz";
     sha256 = "sha256-CC24z0+2dSeqDddX5dJUs7SX9QJ8Iyh/nAp0pqdDvwg=";
   };
 
@@ -26,20 +26,20 @@ stdenv.mkDerivation (finalAttrs: rec {
     cp -r bin $out/
     mkdir -p $out/lib
     cp -r lib $out/
-    wrapProgram $out/bin/${pname} \
+    wrapProgram $out/bin/besu \
       --set JAVA_HOME "${jre}" \
       --suffix ${
         if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"
-      } : ${lib.makeLibraryPath buildInputs}
+      } : ${lib.makeLibraryPath finalAttrs.buildInputs}
   '';
 
   passthru.tests = {
     version = testers.testVersion {
       package = finalAttrs.finalPackage;
-      version = "v${version}";
+      version = "v${finalAttrs.version}";
     };
     jemalloc =
-      runCommand "${pname}-test-jemalloc"
+      runCommand "besu-test-jemalloc"
         {
           nativeBuildInputs = [ finalAttrs.finalPackage ];
           meta.platforms = with lib.platforms; linux;

diff --git a/pkgs/by-name/eu/eukleides/package.nix b/pkgs/by-name/eu/eukleides/package.nix
@@ -11,12 +11,12 @@
   texlive,
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "eukleides";
   version = "1.5.4";
 
   src = fetchurl {
-    url = "http://www.eukleides.org/files/${pname}-${version}.tar.bz2";
+    url = "http://www.eukleides.org/files/eukleides-${finalAttrs.version}.tar.bz2";
     sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q";
   };
 

diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix
@@ -8,12 +8,12 @@
   jre,
   unzip,
 }:
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "geoserver";
   version = "2.27.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip";
+    url = "mirror://sourceforge/geoserver/GeoServer/${finalAttrs.version}/geoserver-${finalAttrs.version}-bin.zip";
     hash = "sha256-bhL+u+BoKgW2cwOXEzaq0h07dKFz9u9WB2jW8nAF0vI=";
   };
 

diff --git a/pkgs/by-name/gl/glog/package.nix b/pkgs/by-name/gl/glog/package.nix
@@ -9,14 +9,14 @@
   pkgsBuildHost,
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "glog";
   version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "glog";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-+nwWP6VBmhgU7GCPSEGUzvUSCc48wXME181WpJ5ABP4=";
   };
 

diff --git a/pkgs/by-name/ha/has/package.nix b/pkgs/by-name/ha/has/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 
-stdenvNoCC.mkDerivation (finalAttrs: rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "has";
   version = "1.5.0";
 
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: rec {
 
   installPhase = ''
     runHook preInstall
-    install -Dm0555 ${pname} -t $out/bin
+    install -Dm0555 has -t $out/bin
     runHook postInstall
   '';
 

diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix
@@ -52,27 +52,28 @@ let
       cp libsha1.so $out/lib/
     '';
   };
+
 in
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "isabelle";
   version = "2025";
 
-  dirname = "Isabelle${version}";
+  dirname = "Isabelle${finalAttrs.version}";
 
   src =
     if stdenv.hostPlatform.isDarwin then
       fetchurl {
-        url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz";
+        url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_macos.tar.gz";
         hash = "sha256-6ldUwiiFf12dOuJU7JgUeX8kU+opDfILL23LLvDi5/g=";
       }
     else if stdenv.hostPlatform.isx86 then
       fetchurl {
-        url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";
+        url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_linux.tar.gz";
         hash = "sha256-PR1m3jcYI/4xqormZjj3NXW6wkTwCzGu4dy2LzgUfFY=";
       }
     else
       fetchurl {
-        url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux_arm.tar.gz";
+        url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_linux_arm.tar.gz";
         hash = "sha256-p/Hp+7J5gJy5s6BVD5Ma1Mu2OS53I8BS7gKSOYYB0PE=";
       };
 
@@ -88,14 +89,14 @@ stdenv.mkDerivation (finalAttrs: rec {
 
   propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ procps ];
 
-  sourceRoot = "${dirname}${lib.optionalString stdenv.hostPlatform.isDarwin ".app"}";
+  sourceRoot = "${finalAttrs.dirname}${lib.optionalString stdenv.hostPlatform.isDarwin ".app"}";
 
   doCheck = stdenv.hostPlatform.system != "aarch64-linux";
   checkPhase = "bin/isabelle build -v HOL-SMT_Examples";
 
   postUnpack = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mv $sourceRoot ${dirname}
-    sourceRoot=${dirname}
+    mv $sourceRoot ${finalAttrs.dirname}
+    sourceRoot=${finalAttrs.dirname}
   '';
 
   postPatch =
@@ -208,19 +209,19 @@ stdenv.mkDerivation (finalAttrs: rec {
 
     # icon
     mkdir -p "$out/share/icons/hicolor/isabelle/apps"
-    cp "$out/Isabelle${version}/lib/icons/isabelle.xpm" "$out/share/icons/hicolor/isabelle/apps/"
+    cp "$out/Isabelle${finalAttrs.version}/lib/icons/isabelle.xpm" "$out/share/icons/hicolor/isabelle/apps/"
 
     # desktop item
     mkdir -p "$out/share"
-    cp -r "${desktopItem}/share/applications" "$out/share/applications"
+    cp -r "${finalAttrs.desktopItem}/share/applications" "$out/share/applications"
   '';
 
   desktopItem = makeDesktopItem {
     name = "isabelle";
     exec = "isabelle jedit";
     icon = "isabelle";
     desktopName = "Isabelle";
-    comment = meta.description;
+    comment = finalAttrs.meta.description;
     categories = [
       "Education"
       "Science"

diff --git a/pkgs/by-name/li/libde265/package.nix b/pkgs/by-name/li/libde265/package.nix
@@ -14,14 +14,14 @@
   gst_all_1,
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "1.0.15";
   pname = "libde265";
 
   src = fetchFromGitHub {
     owner = "strukturag";
     repo = "libde265";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-guiLM4RNe5O0qpeCoQUbs1Z7j0wp8iK9za2+6NIB8yY=";
   };
 

diff --git a/pkgs/by-name/li/littlenavmap/package.nix b/pkgs/by-name/li/littlenavmap/package.nix
@@ -51,14 +51,12 @@ let
       ];
   });
 
-  pname = "littlenavmap";
-
   desktopItem = makeDesktopItem {
     name = "Little Navmap";
     desktopName = "Little Navmap";
-    icon = pname;
+    icon = "littlenavmap";
     terminal = false;
-    exec = pname;
+    exec = "littlenavmap";
     categories = [
       "Qt"
       "Utility"
@@ -67,14 +65,14 @@ let
     ];
   };
 in
-stdenv.mkDerivation (finalAttrs: rec {
-  inherit pname;
+stdenv.mkDerivation (finalAttrs: {
+  pname = "littlenavmap";
   version = "3.0.17";
 
   src = fetchFromGitHub {
     owner = "albar965";
     repo = "littlenavmap";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-/1YB2uEQzT0K6IylpWDqOaMSENDR9GuyJNty+2C8kXM=";
   };
 
@@ -122,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   meta = {
     description = "A free flight planner, navigation tool, moving map, airport search and airport information system for Flight Simulator X, Microsoft Flight Simulator 2020, Prepar3D and X-Plane";
     homepage = "https://github.com/albar965/littlenavmap";
-    changelog = "https://github.com/albar965/littlenavmap/blob/${src.rev}/CHANGELOG.txt";
+    changelog = "https://github.com/albar965/littlenavmap/blob/${finalAttrs.src.tag}/CHANGELOG.txt";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ ck3d ];
     mainProgram = "littlenavmap";

diff --git a/pkgs/by-name/mf/mftrace/package.nix b/pkgs/by-name/mf/mftrace/package.nix
@@ -20,7 +20,7 @@
   - fontforge = null (limited functionality)
 */
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mftrace";
   version = "1.2.20";
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   src = fetchFromGitHub {
     owner = "hanwen";
     repo = "mftrace";
-    rev = "release/${version}";
+    rev = "release/${finalAttrs.version}";
     sha256 = "02ik25aczkbi10jrjlnxby3fmixxrwm2k5r4fkfif3bjfym7nqbc";
   };
 

diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
@@ -12,14 +12,14 @@
   makeDesktopItem,
   nix-update-script,
 }:
-buildDotnetModule (finalAttrs: rec {
+buildDotnetModule (finalAttrs: {
   pname = "msbuild-structured-log-viewer";
   version = "2.2.490";
 
   src = fetchFromGitHub {
     owner = "KirillOsenkov";
     repo = "MSBuildStructuredLog";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-VJun6bs47NKj90e/6ZGp66x+MG1R/qxqrn2L1bVkdHY=";
   };
 
@@ -48,10 +48,10 @@ buildDotnetModule (finalAttrs: rec {
 
   postFixup =
     ''
-      wrapDotnetProgram $out/lib/${finalAttrs.pname}/StructuredLogViewer.Avalonia $out/bin/${meta.mainProgram}
+      wrapDotnetProgram $out/lib/msbuild-structured-log-viewer/StructuredLogViewer.Avalonia $out/bin/${finalAttrs.meta.mainProgram}
     ''
     + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -Dm444 $src/src/StructuredLogViewer/icons/msbuild-structured-log-viewer.png $out/share/icons/hicolor/32x32/apps/${finalAttrs.pname}.png
+      install -Dm444 $src/src/StructuredLogViewer/icons/msbuild-structured-log-viewer.png $out/share/icons/hicolor/32x32/apps/msbuild-structured-log-viewer.png
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace src/StructuredLogViewer.Avalonia/Info.plist \
@@ -60,15 +60,15 @@ buildDotnetModule (finalAttrs: rec {
       install -Dm444 src/StructuredLogViewer.Avalonia/Info.plist $out/Applications/StructuredLogViewer.app/Contents/Info.plist
       install -Dm444 src/StructuredLogViewer.Avalonia/StructuredLogViewer.icns $out/Applications/StructuredLogViewer.app/Contents/Resources/StructuredLogViewer.icns
       mkdir -p $out/Applications/StructuredLogViewer.app/Contents/MacOS
-      ln -s $out/bin/${meta.mainProgram} $out/Applications/StructuredLogViewer.app/Contents/MacOS/StructuredLogViewer.Avalonia
+      ln -s $out/bin/${finalAttrs.meta.mainProgram} $out/Applications/StructuredLogViewer.app/Contents/MacOS/StructuredLogViewer.Avalonia
     '';
 
   desktopItems = makeDesktopItem {
-    name = finalAttrs.pname;
+    name = "msbuild-structured-log-viewer";
     desktopName = "MSBuild Structured Log Viewer";
     comment = finalAttrs.meta.description;
-    icon = finalAttrs.pname;
-    exec = meta.mainProgram;
+    icon = "msbuild-structured-log-viewer";
+    exec = finalAttrs.meta.mainProgram;
     categories = [ "Development" ];
   };
 

diff --git a/pkgs/by-name/no/noti/package.nix b/pkgs/by-name/no/noti/package.nix
@@ -5,7 +5,7 @@
   installShellFiles,
 }:
 
-buildGoModule (finalAttrs: rec {
+buildGoModule (finalAttrs: {
   pname = "noti";
   version = "3.8.0";
 

diff --git a/pkgs/by-name/np/nph/package.nix b/pkgs/by-name/np/nph/package.nix
@@ -10,13 +10,13 @@ let
     nim2 = nim-2_0;
   };
 in
-buildNimPackage' (finalAttrs: rec {
+buildNimPackage' (finalAttrs: {
   pname = "nph";
   version = "0.6.1";
 
   postPatch = ''
     substituteInPlace src/nph.nim \
-      --replace-fail 'git describe --long --dirty --always --tags' "echo ${version}"
+      --replace-fail 'git describe --long --dirty --always --tags' "echo ${finalAttrs.version}"
   '';
 
   src = fetchFromGitHub {

diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix
@@ -30,7 +30,7 @@
   waylandSupport ? stdenv.hostPlatform.isLinux,
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "q2pro";
   version = "0-unstable-2025-05-03";
 
@@ -90,9 +90,9 @@ stdenv.mkDerivation (finalAttrs: rec {
     (lib.mesonEnable "windows-crash-dumps" false)
   ];
 
-  internalVersion = "r${revCount}~${builtins.substring 0 8 src.rev}";
+  internalVersion = "r${finalAttrs.revCount}~${builtins.substring 0 8 finalAttrs.src.rev}";
   postPatch = ''
-    echo '${internalVersion}' > VERSION
+    echo '${finalAttrs.internalVersion}' > VERSION
   '';
 
   postInstall =
@@ -105,13 +105,13 @@ stdenv.mkDerivation (finalAttrs: rec {
       makeWrapper $out/bin/q2pro-unwrapped $out/bin/q2pro \
         --prefix ${ldLibraryPathEnvName} : "${lib.makeLibraryPath finalAttrs.buildInputs}"
 
-      install -D ${src}/src/unix/res/q2pro.xpm $out/share/icons/hicolor/32x32/apps/q2pro.xpm
+      install -D ${finalAttrs.src}/src/unix/res/q2pro.xpm $out/share/icons/hicolor/32x32/apps/q2pro.xpm
     '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
   preVersionCheck = ''
-    export version='${internalVersion}'
+    export version='${finalAttrs.internalVersion}'
   '';
   doInstallCheck = true;