commit 765529dfff5cb04cd8ebf9275c9bccc9473fcbb5 · pyrox.dev/nixpkgs

+3 -2

pkgs/development/cuda-modules/fixups/default.nix

···

       1
       1
       -
       { lib }:

     

       2
       2
       -
       

     

       1
       1
       +
       let

     

       2
       2
       +
         lib = import ../../../../lib;

     

       3
       3
       +
       in

     

       3
       4
        
       lib.concatMapAttrs (

     

       4
       5
        
         fileName: _type:

     

       5
       6
        
         let

+2 -2

pkgs/development/cuda-modules/generic-builders/manifest.nix

···

       5
       5
        
         autoPatchelfHook,

     

       6
       6
        
         backendStdenv,

     

       7
       7
        
         callPackage,

     

       8
       8
       +
         cudaFixups,

     

       8
       9
        
         cudaLib,

     

       9
       10
        
         fetchurl,

     

       10
       10
       -
         fixups,

     

       11
       11
        
         lib,

     

       12
       12
        
         markForCudatoolkitRootHook,

     

       13
       13
        
         flags,

     
···

       45
       45
        
         # Last step before returning control to `callPackage` (adds the `.override` method)

     

       46
       46
        
         # we'll apply (`overrideAttrs`) necessary package-specific "fixup" functions.

     

       47
       47
        
         # Order is significant.

     

       48
       48
       -
         maybeFixup = fixups.${pname} or null;

     

       48
       48
       +
         maybeFixup = cudaFixups.${pname} or null;

     

       49
       49
        
         fixup = if maybeFixup != null then callPackage maybeFixup { } else { };

     

       50
       50
        
       

     

       51
       51
        
         # Get the redist systems for which package provides distributables.

+2

pkgs/top-level/all-packages.nix

···

       2721
       2721
        
       

     

       2722
       2722
        
         cudaLib = import ../development/cuda-modules/lib;

     

       2723
       2723
        
       

     

       2724
       2724
       +
         cudaFixups = import ../development/cuda-modules/fixups;

     

       2725
       2725
       +
       

     

       2724
       2726
        
         cudaPackages_11_0 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.0"; };

     

       2725
       2727
        
         cudaPackages_11_1 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.1"; };

     

       2726
       2728
        
         cudaPackages_11_2 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "11.2"; };

+5 -13

pkgs/top-level/cuda-packages.nix

···

       26
       26
        
         cudaMajorMinorVersion,

     

       27
       27
        
         lib,

     

       28
       28
        
         newScope,

     

       29
       29
       -
         pkgs,

     

       30
       29
        
         stdenv,

     

       31
       30
        
       }:

     

       32
       31
        
       let

     
···

       39
       38
        
           versions

     

       40
       39
        
           ;

     

       41
       40
        
       

     

       42
       42
       -
         # MUST be defined outside fix-point (cf. "NAMESET STRICTNESS" above)

     

       43
       43
       -
         fixups = import ../development/cuda-modules/fixups { inherit lib; };

     

       44
       44
       -
       

     

       45
       41
        
         # Since Jetson capabilities are never built by default, we can check if any of them were requested

     

       46
       42
        
         # through final.config.cudaCapabilities and use that to determine if we should change some manifest versions.

     

       47
       43
        
         # Copied from backendStdenv.

     
···

       54
       50
        
       

     

       55
       51
        
         passthruFunction = final: {

     

       56
       52
        
           # NOTE:

     

       57
       57
       -
           # It is important that cudaLib (and fixups, which will be addressed later) are not part of the package set

     

       58
       58
       -
           # fixed-point.

     

       59
       59
       -
           # As described by @SomeoneSerge:

     

       53
       53
       +
           # It is important that cudaLib and cudaFixups are not part of the package set fixed-point. As described by

     

       54
       54
       +
           # @SomeoneSerge:

     

       60
       55
        
           # > The layering should be: configuration -> (identifies/is part of) cudaPackages -> (is built using) cudaLib.

     

       61
       56
        
           # > No arrows should point in the reverse directions.

     

       62
       57
        
           # That is to say that cudaLib should only know about package sets and configurations, because it implements

     

       63
       58
        
           # functionality for interpreting configurations, resolving them against data, and constructing package sets.

     

       64
       64
       -
           inherit

     

       65
       65
       -
             cudaMajorMinorVersion

     

       66
       66
       -
             fixups

     

       67
       67
       -
             lib

     

       68
       68
       -
             pkgs

     

       69
       69
       -
             ;

     

       59
       59
       +
           # This decision is driven both by a separation of concerns and by "NAMESET STRICTNESS" (see above).

     

       60
       60
       +
       

     

       61
       61
       +
           inherit cudaMajorMinorVersion;

     

       70
       62
        
       

     

       71
       63
        
           cudaNamePrefix = "cuda${cudaMajorMinorVersion}";

     

       72
       64