diff options
author | Robert Hensing <robert@roberthensing.nl> | 2023-02-27 03:53:33 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-28 00:34:00 +0000 |
commit | 359a46e751124454a1a03ad1cdcb1efef745abd8 (patch) | |
tree | c4fe2d0e5faf15ab42ca0c6b0ba1141ea5af52e1 /pkgs/development/compilers/llvm | |
parent | ce07d44ca9d6824125f4a30a96a42555b61de205 (diff) |
llvm*: Remove `outputSpecified` workaround where possible
The effect of `.out // { outputSpecified = false; }` in these cases is to select the default output explicitly, but then make the selection implicit until `overrideAttrs` is called. Previously `overrideAttrs` would not preserve output selection, masking the apparently unnecessary behavior of this workaround. For `libllvm-polly`, this logic does not apply, as it does not select the default output. The `outputSpecified` workaround was introduced in https://github.com/NixOS/nixpkgs/pull/122554 and was perhaps rushed because of a release deadline, and expected delays from mass rebuilds. The change in `overrideAttrs` behavior was added in 5b2f597b116d56104d45c35587920323ed2a5666 / https://github.com/NixOS/nixpkgs/pull/211685 and the problem was discovered in https://github.com/NixOS/nixpkgs/pull/218537, which may contain further information.
Diffstat (limited to 'pkgs/development/compilers/llvm')
-rw-r--r-- | pkgs/development/compilers/llvm/10/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/11/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/13/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/14/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/15/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/5/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/6/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/7/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/8/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/9/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/git/default.nix | 4 |
12 files changed, 24 insertions, 24 deletions
diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index f4120cb91cac5..4d46863fea1a5 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -65,13 +65,13 @@ let # `llvm` historically had the binaries. When choosing an output explicitly, # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm.out // { outputSpecified = false; }; + llvm = tools.libllvm; libclang = callPackage ./clang { inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; # disabled until recommonmark supports sphinx 3 #Llvm-manpages = lowPrio (tools.libllvm.override { diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index c950beef0e8d1..fdaba0ca2be45 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -67,7 +67,7 @@ let # `llvm` historically had the binaries. When choosing an output explicitly, # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm.out // { outputSpecified = false; }; + llvm = tools.libllvm; libllvm-polly = callPackage ./llvm { inherit llvm_meta; @@ -80,7 +80,7 @@ let inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; clang-polly-unwrapped = callPackage ./clang { inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index da3beccbe3252..73f53350206b0 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -68,13 +68,13 @@ let # `llvm` historically had the binaries. When choosing an output explicitly, # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm.out // { outputSpecified = false; }; + llvm = tools.libllvm; libclang = callPackage ./clang { inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; # disabled until recommonmark supports sphinx 3 #Llvm-manpages = lowPrio (tools.libllvm.override { diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 3fc459eb7f042..29dda832e4496 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -70,13 +70,13 @@ let # `llvm` historically had the binaries. When choosing an output explicitly, # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm.out // { outputSpecified = false; }; + llvm = tools.libllvm; libclang = callPackage ./clang { inherit llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; llvm-manpages = lowPrio (tools.libllvm.override { enableManpages = true; diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index 5d14c2f5f933e..314a882db8efa 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -70,13 +70,13 @@ let # `llvm` historically had the binaries. When choosing an output explicitly, # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm.out // { outputSpecified = false; }; + llvm = tools.libllvm; libclang = callPackage ./clang { inherit llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; llvm-manpages = lowPrio (tools.libllvm.override { enableManpages = true; diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index 0cef33ea61cc9..d12e705702bd6 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -119,13 +119,13 @@ in let # `llvm` historically had the binaries. When choosing an output explicitly, # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm.out // { outputSpecified = false; }; + llvm = tools.libllvm; libclang = callPackage ./clang { inherit llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; llvm-manpages = lowPrio (tools.libllvm.override { enableManpages = true; diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 3cfc89dac75f3..d446608d35357 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -41,7 +41,7 @@ let # `llvm` historically had the binaries. When choosing an output explicitly, # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm.out // { outputSpecified = false; }; + llvm = tools.libllvm; libllvm-polly = callPackage ./llvm { inherit llvm_meta; @@ -54,7 +54,7 @@ let inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; llvm-manpages = lowPrio (tools.libllvm.override { enableManpages = true; diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index a0c4ba7271852..e5b5094f05cca 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -41,7 +41,7 @@ let # `llvm` historically had the binaries. When choosing an output explicitly, # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm.out // { outputSpecified = false; }; + llvm = tools.libllvm; libllvm-polly = callPackage ./llvm { inherit llvm_meta; @@ -54,7 +54,7 @@ let inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; llvm-manpages = lowPrio (tools.libllvm.override { enableManpages = true; diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 7ddd14b60d3db..3fc0b359ad6c2 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -65,7 +65,7 @@ let # `llvm` historically had the binaries. When choosing an output explicitly, # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm.out // { outputSpecified = false; }; + llvm = tools.libllvm; libllvm-polly = callPackage ./llvm { inherit llvm_meta; @@ -78,7 +78,7 @@ let inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; clang-polly-unwrapped = callPackage ./clang { inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index 29a2ee7ddc1ec..d628eab465094 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -65,7 +65,7 @@ let # `llvm` historically had the binaries. When choosing an output explicitly, # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm.out // { outputSpecified = false; }; + llvm = tools.libllvm; libllvm-polly = callPackage ./llvm { inherit llvm_meta; @@ -78,7 +78,7 @@ let inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; clang-polly-unwrapped = callPackage ./clang { inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index e2191a81e7958..57187c5ecf1e7 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -65,7 +65,7 @@ let # `llvm` historically had the binaries. When choosing an output explicitly, # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm.out // { outputSpecified = false; }; + llvm = tools.libllvm; libllvm-polly = callPackage ./llvm { inherit llvm_meta; @@ -78,7 +78,7 @@ let inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; clang-polly-unwrapped = callPackage ./clang { inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index ffbce74a48220..67c6bcf44373a 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -69,13 +69,13 @@ let # `llvm` historically had the binaries. When choosing an output explicitly, # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm.out // { outputSpecified = false; }; + llvm = tools.libllvm; libclang = callPackage ./clang { inherit llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; llvm-manpages = lowPrio (tools.libllvm.override { enableManpages = true; |