diff --git a/pkgs/by-name/au/auto-multiple-choice/package.nix b/pkgs/by-name/au/auto-multiple-choice/package.nix index 85820918503fb..bb3c234b8d0c8 100644 --- 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 index 208377db95a8f..e0e2675f29379 100644 --- 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 index fed332af09993..039c43921bfb4 100644 --- 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 index 0cee73f25f50b..0822e0f42b29c 100644 --- 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 index 58246c2f059fc..af0e1c8772596 100644 --- 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 index 8f629a440a72a..47c9dd21f648e 100644 --- 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 index 363bf860b8c97..2f592616a62af 100644 --- 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,11 +209,11 @@ 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 { @@ -220,7 +221,7 @@ stdenv.mkDerivation (finalAttrs: rec { 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 index 13842a96aca6a..286f8c37df2e6 100644 --- 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 index 8ebe6e9dce634..998697d081f7d 100644 --- 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 index a384846e7ec1c..8f387f970bb30 100644 --- 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 index 6f2613b10ca3c..20dde2ec56414 100644 --- 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 index 27b8675652c03..4cfd4316b9ea3 100644 --- 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 index 60aa0d965f06e..9b93f5cd87bb0 100644 --- 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 index d56ffd92ae7a2..d46ea13d2d494 100644 --- 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; diff --git a/pkgs/by-name/qr/qrencode/package.nix b/pkgs/by-name/qr/qrencode/package.nix index 246499eba9ce9..b9a588488a51c 100644 --- a/pkgs/by-name/qr/qrencode/package.nix +++ b/pkgs/by-name/qr/qrencode/package.nix @@ -8,7 +8,7 @@ libiconv, }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "qrencode"; version = "4.1.1"; @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: rec { ]; src = fetchurl { - url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz"; + url = "https://fukuchi.org/works/qrencode/qrencode-${finalAttrs.version}.tar.gz"; sha256 = "sha256-2kSO1PUqumvLDNSMrA3VG4aSvMxM0SdDFAL8pvgXHo4="; }; diff --git a/pkgs/by-name/sw/swaynotificationcenter/package.nix b/pkgs/by-name/sw/swaynotificationcenter/package.nix index 565ff0e2e499c..675e233f9230c 100644 --- a/pkgs/by-name/sw/swaynotificationcenter/package.nix +++ b/pkgs/by-name/sw/swaynotificationcenter/package.nix @@ -32,14 +32,14 @@ pantheon, }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "SwayNotificationCenter"; version = "0.11.0"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayNotificationCenter"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-kRawYbBLVx0ie4t7tChkA8QJShS83fUcGrJSKkxBy8Q="; }; @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: rec { meta = with lib; { description = "Simple notification daemon with a GUI built for Sway"; homepage = "https://github.com/ErikReider/SwayNotificationCenter"; - changelog = "https://github.com/ErikReider/SwayNotificationCenter/releases/tag/v${version}"; + changelog = "https://github.com/ErikReider/SwayNotificationCenter/releases/tag/v${finalAttrs.version}"; license = licenses.gpl3; platforms = platforms.linux; mainProgram = "swaync"; diff --git a/pkgs/development/compilers/llvm/common/tblgen.nix b/pkgs/development/compilers/llvm/common/tblgen.nix index 49cbcb0af2ca6..2c2d541d36a92 100644 --- a/pkgs/development/compilers/llvm/common/tblgen.nix +++ b/pkgs/development/compilers/llvm/common/tblgen.nix @@ -55,11 +55,11 @@ let else src; - self = stdenv.mkDerivation (finalAttrs: rec { + self = stdenv.mkDerivation (finalAttrs: { inherit pname version patches; src = src'; - sourceRoot = "${src.name}/llvm"; + sourceRoot = "${finalAttrs.src.name}/llvm"; postPatch = '' ( diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index b500d4dea89cc..6a3fd947024a3 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -30,7 +30,7 @@ libiconv, }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "spidermonkey"; inherit version; diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix index e3952caea88ba..8d8f88f7e907f 100644 --- a/pkgs/development/libraries/libpulsar/default.nix +++ b/pkgs/development/libraries/libpulsar/default.nix @@ -46,14 +46,14 @@ let ++ lib.optional (!asioSupport) boost; in -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "libpulsar"; version = "3.7.1"; src = fetchFromGitHub { owner = "apache"; repo = "pulsar-client-cpp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-RHWi0KCq7U7Dr3Ic7kduc8P64VpAThTQ3lDxLLEqzIU="; }; @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: rec { meta = with lib; { homepage = "https://pulsar.apache.org/docs/next/client-libraries-cpp/"; description = "Apache Pulsar C++ library"; - changelog = "https://github.com/apache/pulsar-client-cpp/releases/tag/v${version}"; + changelog = "https://github.com/apache/pulsar-client-cpp/releases/tag/v${finalAttrs.version}"; platforms = platforms.all; license = licenses.asl20; maintainers = with maintainers; [ diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 4f8c2a880aab3..e2dfaa031fe6d 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -3,7 +3,6 @@ stdenv, fetchurl, fetchFromGitLab, - fetchpatch, cairo, cmake, boost, @@ -60,7 +59,7 @@ let hash = "sha256-bImTdlhMAA79kwbKPrHN3a9vVrtsgBh3rFjH3B7tEbQ="; }; in -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "poppler-${suffix}"; version = "25.05.0"; # beware: updates often break cups-filters build, check scribus too! @@ -70,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: rec { ]; src = fetchurl { - url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; + url = "https://poppler.freedesktop.org/poppler-${finalAttrs.version}.tar.xz"; hash = "sha256-mxYnxbdoFqxeQFKgP1tgW6QLRc8GsCyt0EeWILSZqzg="; }; @@ -182,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: rec { meta = { homepage = "https://poppler.freedesktop.org/"; - changelog = "https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-${version}/NEWS"; + changelog = "https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-${finalAttrs.version}/NEWS"; description = "PDF rendering library"; longDescription = '' Poppler is a PDF rendering library based on the xpdf-3.0 code base. In diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/development/tools/ilspycmd/default.nix index 61918c6b7a95e..4ca7e57522da7 100644 --- a/pkgs/development/tools/ilspycmd/default.nix +++ b/pkgs/development/tools/ilspycmd/default.nix @@ -8,14 +8,14 @@ autoSignDarwinBinariesHook, glibcLocales, }: -buildDotnetModule (finalAttrs: rec { +buildDotnetModule (finalAttrs: { pname = "ilspycmd"; version = "9.0-preview3"; src = fetchFromGitHub { owner = "icsharpcode"; repo = "ILSpy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-7cPXFaEKr76GtqcNsKx7tstRUeTpSTF8ggxbyEnQa9M="; };