gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nvidia-container-toolkit: use finalAttrs, cleanup (#420172)

Browse Source
This commit is contained in:
Aleksana
2025-06-28 21:46:20 +08:00
committed by GitHub
parent ee142014bc 52b1656a79
commit cfdd8dcfe2
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/by-name/nv/nvidia-container-toolkit/package.nix
View File

@@ -25,14 +25,14 @@ let
# From https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/03cbf9c6cd26c75afef8a2dd68e0306aace80401/Makefile#L54 # From https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/03cbf9c6cd26c75afef8a2dd68e0306aace80401/Makefile#L54
cliVersionPackage = "github.com/NVIDIA/nvidia-container-toolkit/internal/info"; cliVersionPackage = "github.com/NVIDIA/nvidia-container-toolkit/internal/info";
in in
buildGoModule rec { buildGoModule (finalAttrs: {
pname = "nvidia-container-toolkit"; pname = "nvidia-container-toolkit";
version = "1.17.8"; version = "1.17.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NVIDIA"; owner = "NVIDIA";
repo = "nvidia-container-toolkit"; repo = "nvidia-container-toolkit";
rev = "v${version}"; tag = "v${finalAttrs.version}";
hash = "sha256-B17cPxdrQ8qMNgFh4XcDwwKryukMrn0GV2LNPHM7kBo="; hash = "sha256-B17cPxdrQ8qMNgFh4XcDwwKryukMrn0GV2LNPHM7kBo=";
}; };
@@ -76,13 +76,10 @@ buildGoModule rec {
ldflags = [ ldflags = [
"-extldflags=-Wl,-z,lazy" # May be redunandant, cf. `man ld`: "Lazy binding is the default". "-extldflags=-Wl,-z,lazy" # May be redunandant, cf. `man ld`: "Lazy binding is the default".
"-s" # "disable symbol table" "-s" # "disable symbol table"
"-w" # "disable DWARF generation"
# "-X name=value" # "-X name=value"
"-X" "-X ${cliVersionPackage}.version=${finalAttrs.version}"
"${cliVersionPackage}.version=${version}" "-X ${cliVersionPackage}.gitCommit=${finalAttrs.src.rev}"
"-X"
"github.com/NVIDIA/nvidia-container-toolkit/internal/info.gitCommit=${src.rev}"
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@@ -98,10 +95,7 @@ buildGoModule rec {
"TestDuplicateHook" "TestDuplicateHook"
]; ];
in in
[ [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
"-skip"
"${builtins.concatStringsSep "|" skippedTests}"
];
postInstall = postInstall =
'' ''
@@ -122,14 +116,14 @@ buildGoModule rec {
--subst-var-by glibcbin ${lib.getBin glibc} --subst-var-by glibcbin ${lib.getBin glibc}
''; '';
meta = with lib; { meta = {
homepage = "https://gitlab.com/nvidia/container-toolkit/container-toolkit"; homepage = "https://gitlab.com/nvidia/container-toolkit/container-toolkit";
description = "NVIDIA Container Toolkit"; description = "NVIDIA Container Toolkit";
license = licenses.asl20; license = lib.licenses.asl20;
platforms = platforms.linux; platforms = lib.platforms.linux;
maintainers = with maintainers; [ maintainers = with lib.maintainers; [
cpcloud cpcloud
christoph-heiss christoph-heiss
]; ];
}; };
} })