commit 71f11f66a0ccc687c3230abb95301afca10b7d17 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix

···

       39
       39
        
             --device-name-strategy ${deviceNameStrategy} \

     

       40
       40
        
             --ldconfig-path ${lib.getExe' glibc "ldconfig"} \

     

       41
       41
        
             --library-search-path ${lib.getLib nvidia-driver}/lib \

     

       42
       42
       -
             --nvidia-ctk-path ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"}

     

       42
       42
       +
             --nvidia-cdi-hook-path ${lib.getExe' nvidia-container-toolkit.tools "nvidia-cdi-hook"}

     

       43
       43
        
         }

     

       44
       44
        
       

     

       45
       45
        
         function additionalMount {

+16 -17

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         glibc,

     

       4
       4
       -
         fetchFromGitLab,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
        
         makeWrapper,

     

       6
       6
        
         buildGoModule,

     

       7
       7
        
         formats,

     
···

       26
       26
        
         cliVersionPackage = "github.com/NVIDIA/nvidia-container-toolkit/internal/info";

     

       27
       27
        
       in

     

       28
       28
        
       buildGoModule rec {

     

       29
       29
       -
         pname = "container-toolkit/container-toolkit";

     

       30
       30
       -
         version = "1.15.0-rc.3";

     

       29
       29
       +
         pname = "nvidia-container-toolkit";

     

       30
       30
       +
         version = "1.17.5";

     

       31
       31
        
       

     

       32
       32
       -
         src = fetchFromGitLab {

     

       33
       33
       -
           owner = "nvidia";

     

       32
       32
       +
         src = fetchFromGitHub {

     

       33
       33
       +
           owner = "NVIDIA";

     

       34
       34
        
           repo = pname;

     

       35
       35
        
           rev = "v${version}";

     

       36
       36
       -
           hash = "sha256-IH2OjaLbcKSGG44aggolAOuJkjk+GaXnnTbrXfZ0lVo=";

     

       36
       36
       +
           hash = "sha256-vEo8agJ3jTaBokBjdGcO2naE457y8KPUAedC8vtwD1Y=";

     

       37
       37
        
       

     

       38
       38
        
         };

     

       39
       39
        
       

     
···

       51
       51
        
         ];

     

       52
       52
        
       

     

       53
       53
        
         postPatch = ''

     

       54
       54
       -
           # Replace the default hookDefaultFilePath to the $out path and override

     

       55
       55
       -
           # default ldconfig locations to the one in nixpkgs.

     

       56
       56
       -
       

     

       57
       54
        
           substituteInPlace internal/config/config.go \

     

       58
       58
       -
             --replace '/usr/bin/nvidia-container-runtime-hook' "$out/bin/nvidia-container-runtime-hook" \

     

       59
       59
       -
             --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'

     

       60
       60
       -
       

     

       61
       61
       -
           substituteInPlace internal/config/config_test.go \

     

       55
       55
       +
             --replace '/usr/bin/nvidia-container-runtime-hook' "$tools/bin/nvidia-container-runtime-hook" \

     

       62
       56
        
             --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'

     

       63
       57
        
       

     

       64
       58
        
           substituteInPlace tools/container/toolkit/toolkit.go \

     

       65
       59
        
             --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'

     

       60
       60
       +
         '';

     

       66
       61
        
       

     

       67
       67
       -
           substituteInPlace cmd/nvidia-ctk/hook/update-ldcache/update-ldcache.go \

     

       68
       68
       -
             --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'

     

       69
       69
       -
         '';

     

       62
       62
       +
         subPackages = [

     

       63
       63
       +
           "cmd/nvidia-cdi-hook"

     

       64
       64
       +
           "cmd/nvidia-container-runtime.cdi"

     

       65
       65
       +
           "cmd/nvidia-container-runtime-hook"

     

       66
       66
       +
           "cmd/nvidia-container-runtime.legacy"

     

       67
       67
       +
           "cmd/nvidia-ctk"

     

       68
       68
       +
         ];

     

       70
       69
        
       

     

       71
       70
        
         # Based on upstream's Makefile:

     

       72
       71
        
         # https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/03cbf9c6cd26c75afef8a2dd68e0306aace80401/Makefile#L64

     
···

       104
       103
        
               --prefix PATH : ${libnvidia-container}/bin

     

       105
       104
        
       

     

       106
       105
        
             mkdir -p $tools/bin

     

       107
       107
       -
             mv $out/bin/{containerd,crio,docker,nvidia-toolkit,toolkit} $tools/bin

     

       106
       106
       +
             mv $out/bin/{nvidia-cdi-hook,nvidia-container-runtime.cdi,nvidia-container-runtime-hook,nvidia-container-runtime.legacy} $tools/bin

     

       108
       107
        
           ''

     

       109
       108
        
           + lib.optionalString (configTemplate != null || configTemplatePath != null) ''

     

       110
       109
        
             mkdir -p $out/etc/nvidia-container-runtime