From bed3e8069df5ffc8f62f1747c9bc53dd3d0947ef Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Mon, 28 Apr 2025 11:36:39 +0200 Subject: [PATCH] libnvidia-container: renew - use finalAttrs - use tag in fetchFromGithub - no meta = with lib; Signed-off-by: Paul Meyer --- .../li/libnvidia-container/package.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/li/libnvidia-container/package.nix b/pkgs/by-name/li/libnvidia-container/package.nix index fcec4fa35bad..6f5119017601 100644 --- a/pkgs/by-name/li/libnvidia-container/package.nix +++ b/pkgs/by-name/li/libnvidia-container/package.nix @@ -30,14 +30,14 @@ let ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnvidia-container"; version = "1.17.6"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libnvidia-container"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kveP0Px9Fds7pS39aW+cqg2jtiQCMN2zG4GTGRqRrc0="; }; @@ -62,13 +62,13 @@ stdenv.mkDerivation rec { postPatch = '' sed -i \ - -e 's/^REVISION ?=.*/REVISION = ${src.rev}/' \ + -e 's/^REVISION ?=.*/REVISION = ${finalAttrs.src.tag}/' \ -e 's/^COMPILER :=.*/COMPILER = $(CC)/' \ mk/common.mk sed -i \ - -e 's/^GIT_TAG ?=.*/GIT_TAG = ${version}/' \ - -e 's/^GIT_COMMIT ?=.*/GIT_COMMIT = ${src.rev}/' \ + -e 's/^GIT_TAG ?=.*/GIT_TAG = ${finalAttrs.version}/' \ + -e 's/^GIT_COMMIT ?=.*/GIT_COMMIT = ${finalAttrs.src.tag}/' \ versions.mk mkdir -p deps/src/nvidia-modprobe-${modprobeVersion} @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { postFixup = '' for lib in libnvidia-container libnvidia-container-go; do rm -f "$out/lib/$lib.so" - ln -s "$out/lib/$lib.so.${version}" "$out/lib/$lib.so.1" + ln -s "$out/lib/$lib.so.${finalAttrs.version}" "$out/lib/$lib.so.1" ln -s "$out/lib/$lib.so.1" "$out/lib/$lib.so" done ''; @@ -161,20 +161,20 @@ stdenv.mkDerivation rec { ]; in '' - remove-references-to -t "${go}" $out/lib/libnvidia-container-go.so.${version} + remove-references-to -t "${go}" $out/lib/libnvidia-container-go.so.${finalAttrs.version} wrapProgram $out/bin/nvidia-container-cli --prefix LD_LIBRARY_PATH : ${libraryPath} ''; disallowedReferences = [ go ]; - meta = with lib; { + meta = { homepage = "https://github.com/NVIDIA/libnvidia-container"; description = "NVIDIA container runtime library"; - license = licenses.asl20; - platforms = platforms.linux; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; mainProgram = "nvidia-container-cli"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ cpcloud msanft ]; }; -} +})