Make use of finalAttrs on some packages

Signed-off-by: Felix Singer <felixsinger@posteo.net>
This commit is contained in:
Felix Singer 2025-05-23 05:19:52 +02:00
parent ae4748a12e
commit d0a438a3bd
7 changed files with 24 additions and 23 deletions

View file

@ -16,12 +16,12 @@
curl, curl,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "jenkins"; pname = "jenkins";
version = "2.492.3"; version = "2.492.3";
src = fetchurl { src = fetchurl {
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war";
hash = "sha256-kMz1VhM8Nv33ZTrXEPANJIvyiV+fvCbM7g4tO6aBsB8="; hash = "sha256-kMz1VhM8Nv33ZTrXEPANJIvyiV+fvCbM7g4tO6aBsB8=";
}; };
@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
cp "$src" "$out/webapps/jenkins.war" cp "$src" "$out/webapps/jenkins.war"
# Create the `jenkins-cli` command. # Create the `jenkins-cli` command.
${openjdk}/bin/jar -xf "$src" WEB-INF/lib/cli-${version}.jar \ ${openjdk}/bin/jar -xf "$src" WEB-INF/lib/cli-${finalAttrs.version}.jar \
&& mv WEB-INF/lib/cli-${version}.jar "$out/share/jenkins-cli.jar" && mv WEB-INF/lib/cli-${finalAttrs.version}.jar "$out/share/jenkins-cli.jar"
makeWrapper "${openjdk}/bin/java" "$out/bin/jenkins-cli" \ makeWrapper "${openjdk}/bin/java" "$out/bin/jenkins-cli" \
--add-flags "-jar $out/share/jenkins-cli.jar" --add-flags "-jar $out/share/jenkins-cli.jar"
@ -84,8 +84,8 @@ stdenv.mkDerivation rec {
earldouglas earldouglas
nequissimus nequissimus
]; ];
changelog = "https://www.jenkins.io/changelog-stable/#v${version}"; changelog = "https://www.jenkins.io/changelog-stable/#v${finalAttrs.version}";
mainProgram = "jenkins-cli"; mainProgram = "jenkins-cli";
platforms = platforms.all; platforms = platforms.all;
}; };
} })

View file

@ -9,7 +9,7 @@
stdenv, stdenv,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "libjaylink"; pname = "libjaylink";
version = "0.4.0"; version = "0.4.0";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
domain = "gitlab.zapb.de"; domain = "gitlab.zapb.de";
owner = "libjaylink"; owner = "libjaylink";
repo = "libjaylink"; repo = "libjaylink";
tag = version; tag = finalAttrs.version;
hash = "sha256-PghPVgovNo/HhNg7c6EGXrqi6jMrb8p/uLqGDIZ7t+s="; hash = "sha256-PghPVgovNo/HhNg7c6EGXrqi6jMrb8p/uLqGDIZ7t+s=";
}; };
@ -47,4 +47,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ felixsinger ]; maintainers = with maintainers; [ felixsinger ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} })

View file

@ -7,14 +7,14 @@
buildPackages, buildPackages,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "microcode-intel"; pname = "microcode-intel";
version = "20250512"; version = "20250512";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intel"; owner = "intel";
repo = "Intel-Linux-Processor-Microcode-Data-Files"; repo = "Intel-Linux-Processor-Microcode-Data-Files";
rev = "microcode-${version}"; rev = "microcode-${finalAttrs.version}";
hash = "sha256-xasV1w6+8qnD+RLWsReMo+xm7a9nguV2st3IC4FURDU="; hash = "sha256-xasV1w6+8qnD+RLWsReMo+xm7a9nguV2st3IC4FURDU=";
}; };
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "https://www.intel.com/"; homepage = "https://www.intel.com/";
changelog = "https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/${src.rev}"; changelog = "https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/${finalAttrs.src.rev}";
description = "Microcode for Intel processors"; description = "Microcode for Intel processors";
license = licenses.unfreeRedistributableFirmware; license = licenses.unfreeRedistributableFirmware;
platforms = [ platforms = [
@ -42,4 +42,4 @@ stdenv.mkDerivation rec {
]; ];
maintainers = with maintainers; [ felixsinger ]; maintainers = with maintainers; [ felixsinger ];
}; };
} })

View file

@ -25,12 +25,12 @@ let
]; ];
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "redmine"; pname = "redmine";
inherit version; inherit version;
src = fetchurl { src = fetchurl {
url = "https://www.redmine.org/releases/redmine-${version}.tar.gz"; url = "https://www.redmine.org/releases/redmine-${finalAttrs.version}.tar.gz";
hash = "sha256-lNzFMRXgWBrEbmDD7ZMY8ZJs5GS6u7OF5SNiF9Hmpk4="; hash = "sha256-lNzFMRXgWBrEbmDD7ZMY8ZJs5GS6u7OF5SNiF9Hmpk4=";
}; };
@ -75,4 +75,4 @@ stdenv.mkDerivation rec {
]; ];
license = licenses.gpl2; license = licenses.gpl2;
}; };
} })

View file

@ -8,14 +8,14 @@
systemd, systemd,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage (finalAttrs: {
pname = "tbtools"; pname = "tbtools";
version = "0.6.0"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intel"; owner = "intel";
repo = "tbtools"; repo = "tbtools";
tag = "v${version}"; tag = "v${finalAttrs.version}";
hash = "sha256-xLMnB8KliwHVU5y4L7K0a43gfdhLKFxnAx4wxGL9xMc="; hash = "sha256-xLMnB8KliwHVU5y4L7K0a43gfdhLKFxnAx4wxGL9xMc=";
}; };
@ -44,4 +44,4 @@ rustPlatform.buildRustPackage rec {
]; ];
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
}; };
} })

View file

@ -6,14 +6,14 @@
stdenv, stdenv,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "xfel"; pname = "xfel";
version = "1.3.2"; version = "1.3.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xboot"; owner = "xboot";
repo = "xfel"; repo = "xfel";
tag = "v${version}"; tag = "v${finalAttrs.version}";
hash = "sha256-fmf+jqCWC7RaLknr/TyRV6VQz4+fp83ynHNk2ACkyfQ="; hash = "sha256-fmf+jqCWC7RaLknr/TyRV6VQz4+fp83ynHNk2ACkyfQ=";
}; };
@ -34,4 +34,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
mainProgram = "xfel"; mainProgram = "xfel";
}; };
} })

View file

@ -39,12 +39,13 @@ let
... ...
}@args: }@args:
stdenv.mkDerivation ( stdenv.mkDerivation (
finalAttrs:
{ {
inherit pname version; inherit pname version;
src = fetchgit { src = fetchgit {
url = "https://review.coreboot.org/coreboot"; url = "https://review.coreboot.org/coreboot";
rev = version; rev = finalAttrs.version;
hash = "sha256-tsNdsH+GxjLUTd7KXHMZUTNTIAWeKJ3BNy1Lehjo8Eo="; hash = "sha256-tsNdsH+GxjLUTd7KXHMZUTNTIAWeKJ3BNy1Lehjo8Eo=";
}; };