diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-28 06:01:38 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-28 06:01:38 +0000 |
commit | 51c18e4be12fd2ff36f79abdbee0c6e1582cc466 (patch) | |
tree | 0c7e6f0d74e6dc7358e182433c2ecb8999f7504f /pkgs/development/compilers/llvm | |
parent | 387a5e220d4ddc69b31ec9b1c5f1f322ccd149a9 (diff) | |
parent | f610d5f5d6ecb7d74dc20d99bf97bf8ab5bfbf2a (diff) | |
download | nixlib-51c18e4be12fd2ff36f79abdbee0c6e1582cc466.tar nixlib-51c18e4be12fd2ff36f79abdbee0c6e1582cc466.tar.gz nixlib-51c18e4be12fd2ff36f79abdbee0c6e1582cc466.tar.bz2 nixlib-51c18e4be12fd2ff36f79abdbee0c6e1582cc466.tar.lz nixlib-51c18e4be12fd2ff36f79abdbee0c6e1582cc466.tar.xz nixlib-51c18e4be12fd2ff36f79abdbee0c6e1582cc466.tar.zst nixlib-51c18e4be12fd2ff36f79abdbee0c6e1582cc466.zip |
Merge staging-next into staging
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 f4120cb91cac..4d46863fea1a 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 c950beef0e8d..fdaba0ca2be4 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 da3beccbe325..73f53350206b 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 3fc459eb7f04..29dda832e449 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 5d14c2f5f933..314a882db8ef 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 0cef33ea61cc..d12e705702bd 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 3cfc89dac75f..d446608d3535 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 a0c4ba727185..e5b5094f05cc 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 7ddd14b60d3d..3fc0b359ad6c 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 29a2ee7ddc1e..d628eab46509 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 e2191a81e795..57187c5ecf1e 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 00581d542bb5..79cf81f0816e 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; |