diff options
author | Silvan Mosberger <contact@infinisil.com> | 2023-12-01 01:03:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-01 01:03:07 +0100 |
commit | 10bd922e3c5a76ba2649e58958a06cb07d425aa7 (patch) | |
tree | 61295fe16a9e61238d1650784c7e4a975f0bcddd /pkgs | |
parent | 1be03ebc151f697a2df43c0b7879af65e35010fa (diff) | |
parent | 310cda5a0c679f62a86151d55ba964de72e80ba7 (diff) | |
download | nixlib-10bd922e3c5a76ba2649e58958a06cb07d425aa7.tar nixlib-10bd922e3c5a76ba2649e58958a06cb07d425aa7.tar.gz nixlib-10bd922e3c5a76ba2649e58958a06cb07d425aa7.tar.bz2 nixlib-10bd922e3c5a76ba2649e58958a06cb07d425aa7.tar.lz nixlib-10bd922e3c5a76ba2649e58958a06cb07d425aa7.tar.xz nixlib-10bd922e3c5a76ba2649e58958a06cb07d425aa7.tar.zst nixlib-10bd922e3c5a76ba2649e58958a06cb07d425aa7.zip |
Merge pull request #271123 from Mic92/pr/release-outpaths-
Eval fixes from release-attrpaths-superset.nix optimization (part 2)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/compilers/cudatoolkit/flags.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/darwin/xcode/sdk-pkgs.nix | 4 | ||||
-rw-r--r-- | pkgs/test/cuda/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/java-packages.nix | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/compilers/cudatoolkit/flags.nix b/pkgs/development/compilers/cudatoolkit/flags.nix index 3b88ebc708b4..be1d98e87122 100644 --- a/pkgs/development/compilers/cudatoolkit/flags.nix +++ b/pkgs/development/compilers/cudatoolkit/flags.nix @@ -108,7 +108,7 @@ let # archNames :: List String # E.g. [ "Turing" "Ampere" ] - archNames = lists.unique (builtins.map (cap: cudaComputeCapabilityToName.${cap}) cudaCapabilities); + archNames = lists.unique (builtins.map (cap: cudaComputeCapabilityToName.${cap} or (throw "missing cuda compute capability")) cudaCapabilities); # realArches :: List String # The real architectures are physical architectures supported by the CUDA version. diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index 50eb50ea6b78..45cb12b89f4c 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -22,8 +22,8 @@ rec { type = "derivation"; outPath = xcode + "/Contents/Developer/Platforms/${platform}.platform/Developer/SDKs/${platform}${version}.sdk"; - platform = stdenv.targetPlatform.xcodePlatform; - version = stdenv.targetPlatform.sdkVer; + platform = stdenv.targetPlatform.xcodePlatform or ""; + version = stdenv.targetPlatform.sdkVer or ""; }; binutils = wrapBintoolsWith { diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix index 7989e4e2b7d2..c7b790e35e25 100644 --- a/pkgs/test/cuda/default.nix +++ b/pkgs/test/cuda/default.nix @@ -1,7 +1,7 @@ { callPackage }: rec { - cuda-samplesPackages = callPackage ./cuda-samples { }; + cuda-samplesPackages = callPackage ./cuda-samples/generic.nix { }; inherit (cuda-samplesPackages) cuda-samples_cudatoolkit_10 cuda-samples_cudatoolkit_10_0 @@ -14,7 +14,7 @@ rec { cuda-samples_cudatoolkit_11_3 cuda-samples_cudatoolkit_11_4; - cuda-library-samplesPackages = callPackage ./cuda-library-samples { }; + cuda-library-samplesPackages = callPackage ./cuda-library-samples/generic.nix { }; inherit (cuda-library-samplesPackages) cuda-library-samples_cudatoolkit_10 cuda-library-samples_cudatoolkit_10_1 diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index ad13447fcbac..88c95457afee 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -38,7 +38,9 @@ in { jdk-hotspot = callPackage package.jdk-hotspot {}; jre-hotspot = callPackage package.jre-hotspot {}; + } // lib.optionalAttrs (package?jdk-openj9) { jdk-openj9 = callPackage package.jdk-openj9 {}; + } // lib.optionalAttrs (package?jre-openj9) { jre-openj9 = callPackage package.jre-openj9 {}; }; |