commit 843b91a0eee065972051c4be0945dd0ad8c628d3 · pyrox.dev/nixpkgs

+268 -182

pkgs/development/cuda-modules/cuda/overrides.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         cudaVersion,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         addDriverRunpath,

     

       5
       5
       -
       }:

     

       6
       1
        
       let

     

       7
       7
       -
         inherit (lib) attrsets lists strings;

     

       8
       8
       -
         # cudaVersionOlder : Version -> Boolean

     

       9
       9
       -
         cudaVersionOlder = strings.versionOlder cudaVersion;

     

       10
       10
       -
         # cudaVersionAtLeast : Version -> Boolean

     

       11
       11
       -
         cudaVersionAtLeast = strings.versionAtLeast cudaVersion;

     

       2
       2
       +
         filterAndCreateOverrides =

     

       3
       3
       +
           createOverrideAttrs: final: prev:

     

       4
       4
       +
           let

     

       5
       5
       +
             # It is imperative that we use `final.callPackage` to perform overrides,

     

       6
       6
       +
             # so the final package set is available to the override functions.

     

       7
       7
       +
             inherit (final) callPackage;

     

       8
       8
       +
       

     

       9
       9
       +
             # NOTE(@connorbaker): We MUST use `lib` from `prev` because the attribute

     

       10
       10
       +
             # names CAN NOT depend on `final`.

     

       11
       11
       +
             inherit (prev.lib.attrsets) filterAttrs mapAttrs;

     

       12
       12
       +
             inherit (prev.lib.trivial) pipe;

     

       12
       13
        
       

     

       13
       13
       -
         addBuildInputs =

     

       14
       14
       -
           drv: buildInputs:

     

       15
       15
       -
           drv.overrideAttrs (prevAttrs: {

     

       16
       16
       -
             buildInputs = prevAttrs.buildInputs ++ buildInputs;

     

       17
       17
       -
           });

     

       14
       14
       +
             # NOTE: Filter out attributes that are not present in the previous version of

     

       15
       15
       +
             # the package set. This is necessary to prevent the appearance of attributes

     

       16
       16
       +
             # like `cuda_nvcc` in `cudaPackages_10_0, which predates redistributables.

     

       17
       17
       +
             filterOutNewAttrs = filterAttrs (name: _: prev ? ${name});

     

       18
       18
       +
       

     

       19
       19
       +
             # Apply callPackage to each attribute value, yielding a value to be passed

     

       20
       20
       +
             # to overrideAttrs.

     

       21
       21
       +
             callPackageThenOverrideAttrs = mapAttrs (

     

       22
       22
       +
               name: value: prev.${name}.overrideAttrs (callPackage value { })

     

       23
       23
       +
             );

     

       24
       24
       +
           in

     

       25
       25
       +
           pipe createOverrideAttrs [

     

       26
       26
       +
             filterOutNewAttrs

     

       27
       27
       +
             callPackageThenOverrideAttrs

     

       28
       28
       +
           ];

     

       18
       29
        
       in

     

       19
       19
       -
       # NOTE: Filter out attributes that are not present in the previous version of

     

       20
       20
       -
       # the package set. This is necessary to prevent the appearance of attributes

     

       21
       21
       -
       # like `cuda_nvcc` in `cudaPackages_10_0, which predates redistributables.

     

       22
       22
       -
       final: prev:

     

       23
       23
       -
       attrsets.filterAttrs (attr: _: (builtins.hasAttr attr prev)) {

     

       24
       24
       -
         libcufile = prev.libcufile.overrideAttrs (prevAttrs: {

     

       25
       25
       -
           buildInputs = prevAttrs.buildInputs ++ [

     

       26
       26
       -
             final.libcublas.lib

     

       27
       27
       -
             final.pkgs.numactl

     

       28
       28
       -
             final.pkgs.rdma-core

     

       29
       29
       -
           ];

     

       30
       30
       -
           # Before 11.7 libcufile depends on itself for some reason.

     

       31
       31
       -
           autoPatchelfIgnoreMissingDeps =

     

       32
       32
       -
             prevAttrs.autoPatchelfIgnoreMissingDeps

     

       33
       33
       -
             ++ lists.optionals (cudaVersionOlder "11.7") [ "libcufile.so.0" ];

     

       34
       34
       -
         });

     

       30
       30
       +
       # Each attribute name is the name of an existing package in the previous version

     

       31
       31
       +
       # of the package set.

     

       32
       32
       +
       # The value is a function (to be provided to callPackage), which yields a value

     

       33
       33
       +
       # to be provided to overrideAttrs. This allows us to override the attributes of

     

       34
       34
       +
       # a package without losing access to the fixed point of the package set --

     

       35
       35
       +
       # especially useful given that some packages may depend on each other!

     

       36
       36
       +
       filterAndCreateOverrides {

     

       37
       37
       +
         libcufile =

     

       38
       38
       +
           {

     

       39
       39
       +
             cudaOlder,

     

       40
       40
       +
             lib,

     

       41
       41
       +
             libcublas,

     

       42
       42
       +
             numactl,

     

       43
       43
       +
             rdma-core,

     

       44
       44
       +
           }:

     

       45
       45
       +
           prevAttrs: {

     

       46
       46
       +
             buildInputs = prevAttrs.buildInputs ++ [

     

       47
       47
       +
               libcublas.lib

     

       48
       48
       +
               numactl

     

       49
       49
       +
               rdma-core

     

       50
       50
       +
             ];

     

       51
       51
       +
             # Before 11.7 libcufile depends on itself for some reason.

     

       52
       52
       +
             autoPatchelfIgnoreMissingDeps =

     

       53
       53
       +
               prevAttrs.autoPatchelfIgnoreMissingDeps

     

       54
       54
       +
               ++ lib.lists.optionals (cudaOlder "11.7") [ "libcufile.so.0" ];

     

       55
       55
       +
           };

     

       35
       56
        
       

     

       36
       36
       -
         libcusolver = addBuildInputs prev.libcusolver (

     

       37
       37
       -
           # Always depends on this

     

       38
       38
       -
           [ final.libcublas.lib ]

     

       39
       39
       -
           # Dependency from 12.0 and on

     

       40
       40
       -
           ++ lists.optionals (cudaVersionAtLeast "12.0") [ final.libnvjitlink.lib ]

     

       41
       41
       -
           # Dependency from 12.1 and on

     

       42
       42
       -
           ++ lists.optionals (cudaVersionAtLeast "12.1") [ final.libcusparse.lib ]

     

       43
       43
       -
         );

     

       57
       57
       +
         libcusolver =

     

       58
       58
       +
           {

     

       59
       59
       +
             cudaAtLeast,

     

       60
       60
       +
             lib,

     

       61
       61
       +
             libcublas,

     

       62
       62
       +
             libcusparse ? null,

     

       63
       63
       +
             libnvjitlink ? null,

     

       64
       64
       +
           }:

     

       65
       65
       +
           prevAttrs: {

     

       66
       66
       +
             buildInputs =

     

       67
       67
       +
               prevAttrs.buildInputs

     

       68
       68
       +
               # Always depends on this

     

       69
       69
       +
               ++ [ libcublas.lib ]

     

       70
       70
       +
               # Dependency from 12.0 and on

     

       71
       71
       +
               ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink.lib ]

     

       72
       72
       +
               # Dependency from 12.1 and on

     

       73
       73
       +
               ++ lib.lists.optionals (cudaAtLeast "12.1") [ libcusparse.lib ];

     

       74
       74
       +
       

     

       75
       75
       +
             brokenConditions = prevAttrs.brokenConditions // {

     

       76
       76
       +
               "libnvjitlink missing (CUDA >= 12.0)" =

     

       77
       77
       +
                 !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink.lib != null));

     

       78
       78
       +
               "libcusparse missing (CUDA >= 12.1)" =

     

       79
       79
       +
                 !(cudaAtLeast "12.1" -> (libcusparse != null && libcusparse.lib != null));

     

       80
       80
       +
             };

     

       81
       81
       +
           };

     

       82
       82
       +
       

     

       83
       83
       +
         libcusparse =

     

       84
       84
       +
           {

     

       85
       85
       +
             cudaAtLeast,

     

       86
       86
       +
             lib,

     

       87
       87
       +
             libnvjitlink ? null,

     

       88
       88
       +
           }:

     

       89
       89
       +
           prevAttrs: {

     

       90
       90
       +
             buildInputs =

     

       91
       91
       +
               prevAttrs.buildInputs

     

       92
       92
       +
               # Dependency from 12.0 and on

     

       93
       93
       +
               ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink.lib ];

     

       44
       94
        
       

     

       45
       45
       -
         libcusparse = addBuildInputs prev.libcusparse (

     

       46
       46
       -
           lists.optionals (cudaVersionAtLeast "12.0") [ final.libnvjitlink.lib ]

     

       47
       47
       -
         );

     

       95
       95
       +
             brokenConditions = prevAttrs.brokenConditions // {

     

       96
       96
       +
               "libnvjitlink missing (CUDA >= 12.0)" =

     

       97
       97
       +
                 !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink.lib != null));

     

       98
       98
       +
             };

     

       99
       99
       +
           };

     

       48
       100
        
       

     

       49
       49
       -
         cuda_cudart = prev.cuda_cudart.overrideAttrs (prevAttrs: {

     

       50
       50
       -
           # Remove once cuda-find-redist-features has a special case for libcuda

     

       51
       51
       -
           outputs =

     

       52
       52
       -
             prevAttrs.outputs

     

       53
       53
       -
             ++ lists.optionals (!(builtins.elem "stubs" prevAttrs.outputs)) [ "stubs" ];

     

       101
       101
       +
         # TODO(@connorbaker): cuda_cudart.dev depends on crt/host_config.h, which is from

     

       102
       102
       +
         # cuda_nvcc.dev. It would be nice to be able to encode that.

     

       103
       103
       +
         cuda_cudart =

     

       104
       104
       +
           { addDriverRunpath, lib }:

     

       105
       105
       +
           prevAttrs: {

     

       106
       106
       +
             # Remove once cuda-find-redist-features has a special case for libcuda

     

       107
       107
       +
             outputs =

     

       108
       108
       +
               prevAttrs.outputs

     

       109
       109
       +
               ++ lib.lists.optionals (!(builtins.elem "stubs" prevAttrs.outputs)) [ "stubs" ];

     

       54
       110
        
       

     

       55
       55
       -
           allowFHSReferences = false;

     

       111
       111
       +
             allowFHSReferences = false;

     

       56
       112
        
       

     

       57
       57
       -
           # The libcuda stub's pkg-config doesn't follow the general pattern:

     

       58
       58
       -
           postPatch =

     

       59
       59
       -
             prevAttrs.postPatch or ""

     

       60
       60
       -
             + ''

     

       61
       61
       -
               while IFS= read -r -d $'\0' path ; do

     

       62
       62
       -
                 sed -i \

     

       63
       63
       -
                   -e "s|^libdir\s*=.*/lib\$|libdir=''${!outputLib}/lib/stubs|" \

     

       64
       64
       -
                   -e "s|^Libs\s*:\(.*\)\$|Libs: \1 -Wl,-rpath,${addDriverRunpath.driverLink}/lib|" \

     

       65
       65
       -
                   "$path"

     

       66
       66
       -
               done < <(find -iname 'cuda-*.pc' -print0)

     

       67
       67
       -
             ''

     

       68
       68
       -
             + ''

     

       113
       113
       +
             # The libcuda stub's pkg-config doesn't follow the general pattern:

     

       114
       114
       +
             postPatch =

     

       115
       115
       +
               prevAttrs.postPatch or ""

     

       116
       116
       +
               + ''

     

       117
       117
       +
                 while IFS= read -r -d $'\0' path; do

     

       118
       118
       +
                   sed -i \

     

       119
       119
       +
                     -e "s|^libdir\s*=.*/lib\$|libdir=''${!outputLib}/lib/stubs|" \

     

       120
       120
       +
                     -e "s|^Libs\s*:\(.*\)\$|Libs: \1 -Wl,-rpath,${addDriverRunpath.driverLink}/lib|" \

     

       121
       121
       +
                     "$path"

     

       122
       122
       +
                 done < <(find -iname 'cuda-*.pc' -print0)

     

       123
       123
       +
               ''

     

       69
       124
        
               # Namelink may not be enough, add a soname.

     

       70
       125
        
               # Cf. https://gitlab.kitware.com/cmake/cmake/-/issues/25536

     

       71
       71
       -
               if [[ -f lib/stubs/libcuda.so && ! -f lib/stubs/libcuda.so.1 ]] ; then

     

       72
       72
       -
                 ln -s libcuda.so lib/stubs/libcuda.so.1

     

       73
       73
       -
               fi

     

       74
       74
       -
             '';

     

       75
       75
       -
       

     

       76
       76
       -
           postFixup =

     

       77
       77
       -
             prevAttrs.postFixup or ""

     

       78
       78
       -
             + ''

     

       79
       79
       -
               moveToOutput lib/stubs "$stubs"

     

       80
       80
       -
               ln -s "$stubs"/lib/stubs/* "$stubs"/lib/

     

       81
       81
       -
               ln -s "$stubs"/lib/stubs "''${!outputLib}/lib/stubs"

     

       82
       82
       -
             '';

     

       83
       83
       -
         });

     

       126
       126
       +
               + ''

     

       127
       127
       +
                 if [[ -f lib/stubs/libcuda.so && ! -f lib/stubs/libcuda.so.1 ]]; then

     

       128
       128
       +
                   ln -s libcuda.so lib/stubs/libcuda.so.1

     

       129
       129
       +
                 fi

     

       130
       130
       +
               '';

     

       84
       131
        
       

     

       85
       85
       -
         cuda_compat = prev.cuda_compat.overrideAttrs (prevAttrs: {

     

       86
       86
       -
           autoPatchelfIgnoreMissingDeps = prevAttrs.autoPatchelfIgnoreMissingDeps ++ [

     

       87
       87
       -
             "libnvrm_gpu.so"

     

       88
       88
       -
             "libnvrm_mem.so"

     

       89
       89
       -
             "libnvdla_runtime.so"

     

       90
       90
       -
           ];

     

       91
       91
       -
           # `cuda_compat` only works on aarch64-linux, and only when building for Jetson devices.

     

       92
       92
       -
           badPlatformsConditions = prevAttrs.badPlatformsConditions // {

     

       93
       93
       -
             "Trying to use cuda_compat on aarch64-linux targeting non-Jetson devices" =

     

       94
       94
       -
               !final.flags.isJetsonBuild;

     

       132
       132
       +
             postFixup =

     

       133
       133
       +
               prevAttrs.postFixup or ""

     

       134
       134
       +
               + ''

     

       135
       135
       +
                 moveToOutput lib/stubs "$stubs"

     

       136
       136
       +
                 ln -s "$stubs"/lib/stubs/* "$stubs"/lib/

     

       137
       137
       +
                 ln -s "$stubs"/lib/stubs "''${!outputLib}/lib/stubs"

     

       138
       138
       +
               '';

     

       95
       139
        
           };

     

       96
       96
       -
         });

     

       97
       140
        
       

     

       98
       98
       -
         cuda_gdb = addBuildInputs prev.cuda_gdb (

     

       99
       99
       -
           # x86_64 only needs gmp from 12.0 and on

     

       100
       100
       -
           lists.optionals (cudaVersionAtLeast "12.0") [ final.pkgs.gmp ]

     

       101
       101
       -
         );

     

       102
       102
       -
       

     

       103
       103
       -
         cuda_nvcc = prev.cuda_nvcc.overrideAttrs (

     

       104
       104
       -
           oldAttrs:

     

       105
       105
       -
           let

     

       106
       106
       -
             # This replicates the logic in stdenvAdapters.useLibsFrom, except we use

     

       107
       107
       -
             # gcc from pkgsHostTarget and not from buildPackages.

     

       108
       108
       -
             ccForLibs-wrapper = final.pkgs.stdenv.cc;

     

       109
       109
       -
             gccMajorVersion = final.nvccCompatibilities.${cudaVersion}.gccMaxMajorVersion;

     

       110
       110
       -
             cc = final.pkgs.wrapCCWith {

     

       111
       111
       -
               cc = final.pkgs."gcc${gccMajorVersion}".cc;

     

       112
       112
       -
               useCcForLibs = true;

     

       113
       113
       -
               gccForLibs = ccForLibs-wrapper.cc;

     

       141
       141
       +
         cuda_compat =

     

       142
       142
       +
           { flags, lib }:

     

       143
       143
       +
           prevAttrs: {

     

       144
       144
       +
             autoPatchelfIgnoreMissingDeps = prevAttrs.autoPatchelfIgnoreMissingDeps ++ [

     

       145
       145
       +
               "libnvrm_gpu.so"

     

       146
       146
       +
               "libnvrm_mem.so"

     

       147
       147
       +
               "libnvdla_runtime.so"

     

       148
       148
       +
             ];

     

       149
       149
       +
             # `cuda_compat` only works on aarch64-linux, and only when building for Jetson devices.

     

       150
       150
       +
             badPlatformsConditions = prevAttrs.badPlatformsConditions // {

     

       151
       151
       +
               "Trying to use cuda_compat on aarch64-linux targeting non-Jetson devices" = !flags.isJetsonBuild;

     

       114
       152
        
             };

     

       115
       115
       -
           in

     

       153
       153
       +
           };

     

       154
       154
       +
       

     

       155
       155
       +
         cuda_gdb =

     

       116
       156
        
           {

     

       157
       157
       +
             cudaAtLeast,

     

       158
       158
       +
             gmp,

     

       159
       159
       +
             lib,

     

       160
       160
       +
           }:

     

       161
       161
       +
           prevAttrs: {

     

       162
       162
       +
             buildInputs =

     

       163
       163
       +
               prevAttrs.buildInputs

     

       164
       164
       +
               # x86_64 only needs gmp from 12.0 and on

     

       165
       165
       +
               ++ lib.lists.optionals (cudaAtLeast "12.0") [ gmp ];

     

       166
       166
       +
           };

     

       117
       167
        
       

     

       118
       118
       -
             outputs = oldAttrs.outputs ++ lists.optionals (!(builtins.elem "lib" oldAttrs.outputs)) [ "lib" ];

     

       119
       119
       -
       

     

       168
       168
       +
         cuda_nvcc =

     

       169
       169
       +
           {

     

       170
       170
       +
             backendStdenv,

     

       171
       171
       +
             cuda_cudart,

     

       172
       172
       +
             lib,

     

       173
       173
       +
             setupCudaHook,

     

       174
       174
       +
           }:

     

       175
       175
       +
           prevAttrs: {

     

       120
       176
        
             # Patch the nvcc.profile.

     

       121
       177
        
             # Syntax:

     

       122
       178
        
             # - `=` for assignment,

     
···

       131
       187
        
             # backend-stdenv.nix

     

       132
       188
        
       

     

       133
       189
        
             postPatch =

     

       134
       134
       -
               (oldAttrs.postPatch or "")

     

       190
       190
       +
               (prevAttrs.postPatch or "")

     

       135
       191
        
               + ''

     

       136
       192
        
                 substituteInPlace bin/nvcc.profile \

     

       137
       193
        
                   --replace-fail \

     

       138
       138
       -
                     '$(TOP)/lib' \

     

       139
       139
       -
                     "''${!outputLib}/lib" \

     

       140
       140
       -
                   --replace-fail \

     

       141
       194
        
                     '$(TOP)/$(_NVVM_BRANCH_)' \

     

       142
       195
        
                     "''${!outputBin}/nvvm" \

     

       143
       196
        
                   --replace-fail \

     
···

       147
       200
        
                 cat << EOF >> bin/nvcc.profile

     

       148
       201
        
       

     

       149
       202
        
                 # Fix a compatible backend compiler

     

       150
       150
       -
                 PATH += ${lib.getBin cc}/bin:

     

       203
       203
       +
                 PATH += "${backendStdenv.cc}/bin":

     

       151
       204
        
       

     

       152
       205
        
                 # Expose the split-out nvvm

     

       153
       153
       -
                 LIBRARIES =+ -L''${!outputBin}/nvvm/lib

     

       154
       154
       -
                 INCLUDES =+ -I''${!outputBin}/nvvm/include

     

       155
       155
       -
       

     

       156
       156
       -
                 # Expose cudart and the libcuda stubs

     

       157
       157
       -
                 LIBRARIES =+ -L$static/lib" "-L${final.cuda_cudart.lib}/lib -L${final.cuda_cudart.lib}/lib/stubs

     

       158
       158
       -
                 INCLUDES =+ -I${final.cuda_cudart.dev}/include

     

       206
       206
       +
                 LIBRARIES =+ "-L''${!outputBin}/nvvm/lib"

     

       207
       207
       +
                 INCLUDES =+ "-I''${!outputBin}/nvvm/include"

     

       159
       208
        
                 EOF

     

       160
       209
        
               '';

     

       161
       210
        
       

     

       162
       162
       -
             propagatedBuildInputs = [ final.setupCudaHook ];

     

       211
       211
       +
             # NOTE(@connorbaker):

     

       212
       212
       +
             # Though it might seem odd or counter-intuitive to add the setup hook to `propagatedBuildInputs` instead of

     

       213
       213
       +
             # `propagatedNativeBuildInputs`, it is necessary! If you move the setup hook from `propagatedBuildInputs` to

     

       214
       214
       +
             # `propagatedNativeBuildInputs`, it stops being propagated to downstream packages during their build because

     

       215
       215
       +
             # setup hooks in `propagatedNativeBuildInputs` are not designed to affect the runtime or build environment of

     

       216
       216
       +
             # dependencies; they are only meant to affect the build environment of the package that directly includes them.

     

       217
       217
       +
             propagatedBuildInputs = (prevAttrs.propagatedBuildInputs or [ ]) ++ [ setupCudaHook ];

     

       163
       218
        
       

     

       164
       219
        
             postInstall =

     

       165
       165
       -
               (oldAttrs.postInstall or "")

     

       220
       220
       +
               (prevAttrs.postInstall or "")

     

       166
       221
        
               + ''

     

       167
       222
        
                 moveToOutput "nvvm" "''${!outputBin}"

     

       168
       223
        
               '';

     
···

       170
       225
        
             # The nvcc and cicc binaries contain hard-coded references to /usr

     

       171
       226
        
             allowFHSReferences = true;

     

       172
       227
        
       

     

       173
       173
       -
             meta = (oldAttrs.meta or { }) // {

     

       228
       228
       +
             meta = (prevAttrs.meta or { }) // {

     

       174
       229
        
               mainProgram = "nvcc";

     

       175
       230
        
             };

     

       176
       176
       -
           }

     

       177
       177
       -
         );

     

       231
       231
       +
           };

     

       178
       232
        
       

     

       179
       179
       -
         cuda_nvprof = prev.cuda_nvprof.overrideAttrs (prevAttrs: {

     

       180
       180
       -
           buildInputs = prevAttrs.buildInputs ++ [ final.cuda_cupti.lib ];

     

       181
       181
       -
         });

     

       233
       233
       +
         cuda_nvprof =

     

       234
       234
       +
           { cuda_cupti }: prevAttrs: { buildInputs = prevAttrs.buildInputs ++ [ cuda_cupti.lib ]; };

     

       182
       235
        
       

     

       183
       183
       -
         cuda_demo_suite = addBuildInputs prev.cuda_demo_suite [

     

       184
       184
       -
           final.pkgs.freeglut

     

       185
       185
       -
           final.pkgs.libGLU

     

       186
       186
       -
           final.pkgs.libglvnd

     

       187
       187
       -
           final.pkgs.mesa

     

       188
       188
       -
           final.libcufft.lib

     

       189
       189
       -
           final.libcurand.lib

     

       190
       190
       -
         ];

     

       236
       236
       +
         cuda_demo_suite =

     

       237
       237
       +
           {

     

       238
       238
       +
             freeglut,

     

       239
       239
       +
             libcufft,

     

       240
       240
       +
             libcurand,

     

       241
       241
       +
             libGLU,

     

       242
       242
       +
             libglvnd,

     

       243
       243
       +
             mesa,

     

       244
       244
       +
           }:

     

       245
       245
       +
           prevAttrs: {

     

       246
       246
       +
             buildInputs = prevAttrs.buildInputs ++ [

     

       247
       247
       +
               freeglut

     

       248
       248
       +
               libcufft.lib

     

       249
       249
       +
               libcurand.lib

     

       250
       250
       +
               libGLU

     

       251
       251
       +
               libglvnd

     

       252
       252
       +
               mesa

     

       253
       253
       +
             ];

     

       254
       254
       +
           };

     

       191
       255
        
       

     

       192
       192
       -
         nsight_compute = prev.nsight_compute.overrideAttrs (prevAttrs: {

     

       193
       193
       -
           nativeBuildInputs =

     

       194
       194
       -
             prevAttrs.nativeBuildInputs

     

       195
       195
       -
             ++ (

     

       196
       196
       -
               if (strings.versionOlder prev.nsight_compute.version "2022.2.0") then

     

       197
       197
       -
                 [ final.pkgs.qt5.wrapQtAppsHook ]

     

       198
       198
       -
               else

     

       199
       199
       -
                 [ final.pkgs.qt6.wrapQtAppsHook ]

     

       200
       200
       -
             );

     

       201
       201
       -
           buildInputs =

     

       202
       202
       -
             prevAttrs.buildInputs

     

       203
       203
       -
             ++ (

     

       204
       204
       -
               if (strings.versionOlder prev.nsight_compute.version "2022.2.0") then

     

       205
       205
       -
                 [ final.pkgs.qt5.qtwebview ]

     

       206
       206
       -
               else

     

       207
       207
       -
                 [ final.pkgs.qt6.qtwebview ]

     

       208
       208
       -
             );

     

       209
       209
       -
         });

     

       256
       256
       +
         nsight_compute =

     

       257
       257
       +
           {

     

       258
       258
       +
             lib,

     

       259
       259
       +
             qt5 ? null,

     

       260
       260
       +
             qt6 ? null,

     

       261
       261
       +
           }:

     

       262
       262
       +
           prevAttrs:

     

       263
       263
       +
           let

     

       264
       264
       +
             inherit (lib.strings) versionOlder versionAtLeast;

     

       265
       265
       +
             inherit (prevAttrs) version;

     

       266
       266
       +
             qt = if versionOlder version "2022.2.0" then qt5 else qt6;

     

       267
       267
       +
             inherit (qt) wrapQtAppsHook qtwebview;

     

       268
       268
       +
           in

     

       269
       269
       +
           {

     

       270
       270
       +
             nativeBuildInputs = prevAttrs.nativeBuildInputs ++ [ wrapQtAppsHook ];

     

       271
       271
       +
             buildInputs = prevAttrs.buildInputs ++ [ qtwebview ];

     

       272
       272
       +
             brokenConditions = prevAttrs.brokenConditions // {

     

       273
       273
       +
               "Qt 5 missing (<2022.2.0)" = !(versionOlder version "2022.2.0" -> qt5 != null);

     

       274
       274
       +
               "Qt 6 missing (>=2022.2.0)" = !(versionAtLeast version "2022.2.0" -> qt6 != null);

     

       275
       275
       +
             };

     

       276
       276
       +
           };

     

       210
       277
        
       

     

       211
       211
       -
         nsight_systems = prev.nsight_systems.overrideAttrs (

     

       278
       278
       +
         nsight_systems =

     

       279
       279
       +
           {

     

       280
       280
       +
             cuda_cudart,

     

       281
       281
       +
             cudaOlder,

     

       282
       282
       +
             gst_all_1,

     

       283
       283
       +
             lib,

     

       284
       284
       +
             nss,

     

       285
       285
       +
             numactl,

     

       286
       286
       +
             pulseaudio,

     

       287
       287
       +
             qt5 ? null,

     

       288
       288
       +
             qt6 ? null,

     

       289
       289
       +
             rdma-core,

     

       290
       290
       +
             ucx,

     

       291
       291
       +
             wayland,

     

       292
       292
       +
             xorg,

     

       293
       293
       +
           }:

     

       212
       294
        
           prevAttrs:

     

       213
       295
        
           let

     

       214
       214
       -
             qt = if lib.versionOlder prevAttrs.version "2022.4.2.1" then final.pkgs.qt5 else final.pkgs.qt6;

     

       296
       296
       +
             inherit (lib.strings) versionOlder versionAtLeast;

     

       297
       297
       +
             inherit (prevAttrs) version;

     

       298
       298
       +
             qt = if lib.strings.versionOlder prevAttrs.version "2022.4.2.1" then qt5 else qt6;

     

       215
       299
        
             qtwayland =

     

       216
       300
        
               if lib.versions.major qt.qtbase.version == "5" then

     

       217
       301
        
                 lib.getBin qt.qtwayland

     
···

       223
       307
        
             # An ad hoc replacement for

     

       224
       308
        
             # https://github.com/ConnorBaker/cuda-redist-find-features/issues/11

     

       225
       309
        
             env.rmPatterns = toString [

     

       310
       310
       +
               "nsight-systems/*/*/lib{arrow,jpeg}*"

     

       311
       311
       +
               "nsight-systems/*/*/lib{ssl,ssh,crypto}*"

     

       312
       312
       +
               "nsight-systems/*/*/libboost*"

     

       313
       313
       +
               "nsight-systems/*/*/libexec"

     

       226
       314
        
               "nsight-systems/*/*/libQt*"

     

       227
       315
        
               "nsight-systems/*/*/libstdc*"

     

       228
       228
       -
               "nsight-systems/*/*/libboost*"

     

       229
       229
       -
               "nsight-systems/*/*/lib{ssl,ssh,crypto}*"

     

       230
       230
       -
               "nsight-systems/*/*/lib{arrow,jpeg}*"

     

       231
       316
        
               "nsight-systems/*/*/Mesa"

     

       317
       317
       +
               "nsight-systems/*/*/Plugins"

     

       232
       318
        
               "nsight-systems/*/*/python/bin/python"

     

       233
       233
       -
               "nsight-systems/*/*/libexec"

     

       234
       234
       -
               "nsight-systems/*/*/Plugins"

     

       235
       319
        
             ];

     

       236
       320
        
             postPatch =

     

       237
       321
        
               prevAttrs.postPatch or ""

     

       238
       322
        
               + ''

     

       239
       239
       -
                 for path in $rmPatterns ; do

     

       323
       323
       +
                 for path in $rmPatterns; do

     

       240
       324
        
                   rm -r "$path"

     

       241
       325
        
                 done

     

       242
       326
        
               '';

     

       243
       327
        
             nativeBuildInputs = prevAttrs.nativeBuildInputs ++ [ qt.wrapQtAppsHook ];

     

       244
       328
        
             buildInputs = prevAttrs.buildInputs ++ [

     

       245
       245
       -
               final.cuda_cudart.stubs

     

       246
       246
       -
               final.pkgs.alsa-lib

     

       247
       247
       -
               final.pkgs.boost178

     

       248
       248
       -
               final.pkgs.e2fsprogs

     

       249
       249
       -
               final.pkgs.gst_all_1.gst-plugins-base

     

       250
       250
       -
               final.pkgs.gst_all_1.gstreamer

     

       251
       251
       -
               final.pkgs.nss

     

       252
       252
       -
               final.pkgs.numactl

     

       253
       253
       -
               final.pkgs.pulseaudio

     

       254
       254
       -
               final.pkgs.rdma-core

     

       255
       255
       -
               final.pkgs.ucx

     

       256
       256
       -
               final.pkgs.wayland

     

       257
       257
       -
               final.pkgs.xorg.libXcursor

     

       258
       258
       -
               final.pkgs.xorg.libXdamage

     

       259
       259
       -
               final.pkgs.xorg.libXrandr

     

       260
       260
       -
               final.pkgs.xorg.libXtst

     

       261
       261
       -
               qt.qtbase

     

       262
       329
        
               (qt.qtdeclarative or qt.full)

     

       263
       330
        
               (qt.qtsvg or qt.full)

     

       331
       331
       +
               cuda_cudart.stubs

     

       332
       332
       +
               gst_all_1.gst-plugins-base

     

       333
       333
       +
               gst_all_1.gstreamer

     

       334
       334
       +
               nss

     

       335
       335
       +
               numactl

     

       336
       336
       +
               pulseaudio

     

       337
       337
       +
               qt.qtbase

     

       264
       338
        
               qtWaylandPlugins

     

       339
       339
       +
               rdma-core

     

       340
       340
       +
               ucx

     

       341
       341
       +
               wayland

     

       342
       342
       +
               xorg.libXcursor

     

       343
       343
       +
               xorg.libXdamage

     

       344
       344
       +
               xorg.libXrandr

     

       345
       345
       +
               xorg.libXtst

     

       265
       346
        
             ];

     

       266
       347
        
       

     

       267
       267
       -
             # Older releases require boost 1.70 deprecated in Nixpkgs

     

       268
       268
       -
             meta.broken = prevAttrs.meta.broken or false || lib.versionOlder final.cudaVersion "11.8";

     

       269
       269
       -
           }

     

       270
       270
       -
         );

     

       348
       348
       +
             brokenConditions = prevAttrs.brokenConditions // {

     

       349
       349
       +
               # Older releases require boost 1.70, which is deprecated in Nixpkgs

     

       350
       350
       +
               "CUDA too old (<11.8)" = cudaOlder "11.8";

     

       351
       351
       +
               "Qt 5 missing (<2022.4.2.1)" = !(versionOlder version "2022.4.2.1" -> qt5 != null);

     

       352
       352
       +
               "Qt 6 missing (>=2022.4.2.1)" = !(versionAtLeast version "2022.4.2.1" -> qt6 != null);

     

       353
       353
       +
             };

     

       354
       354
       +
           };

     

       271
       355
        
       

     

       272
       272
       -
         nvidia_driver = prev.nvidia_driver.overrideAttrs {

     

       273
       273
       -
           # No need to support this package as we have drivers already

     

       274
       274
       -
           # in linuxPackages.

     

       275
       275
       -
           meta.broken = true;

     

       276
       276
       -
         };

     

       356
       356
       +
         nvidia_driver =

     

       357
       357
       +
           { }:

     

       358
       358
       +
           prevAttrs: {

     

       359
       359
       +
             brokenConditions = prevAttrs.brokenConditions // {

     

       360
       360
       +
               "Package is not supported; use drivers from linuxPackages" = true;

     

       361
       361
       +
             };

     

       362
       362
       +
           };

     

       277
       363
        
       }

+1 -1

pkgs/top-level/cuda-packages.nix

···

       86
       86
        
           [

     

       87
       87
        
             (import ../development/cuda-modules/setup-hooks/extension.nix)

     

       88
       88
        
             (callPackage ../development/cuda-modules/cuda/extension.nix { inherit cudaVersion; })

     

       89
       89
       -
             (callPackage ../development/cuda-modules/cuda/overrides.nix { inherit cudaVersion; })

     

       89
       89
       +
             (import ../development/cuda-modules/cuda/overrides.nix)

     

       90
       90
        
             (callPackage ../development/cuda-modules/generic-builders/multiplex.nix {

     

       91
       91
        
               inherit cudaVersion flags mkVersionedPackageName;

     

       92
       92
        
               pname = "cudnn";