From 6b3b7940ff3050aefc343dd0e855b5a7dc79f6d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 11 May 2021 10:35:41 +0200 Subject: [PATCH] llvm*Packages: fix output selection (lib.get*) --- pkgs/development/compilers/llvm/10/default.nix | 8 ++++---- pkgs/development/compilers/llvm/11/default.nix | 9 ++++----- pkgs/development/compilers/llvm/12/default.nix | 8 ++++---- pkgs/development/compilers/llvm/5/default.nix | 10 +++++----- pkgs/development/compilers/llvm/6/default.nix | 10 +++++----- pkgs/development/compilers/llvm/7/default.nix | 10 +++++----- pkgs/development/compilers/llvm/8/default.nix | 10 +++++----- pkgs/development/compilers/llvm/9/default.nix | 10 +++++----- 8 files changed, 37 insertions(+), 38 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 9bc79b58693..909a7ce6d21 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -31,15 +31,15 @@ let libllvm = callPackage ./llvm { }; - # `llvm` historically had the binaries. But this migration - # technique also impedes `lib.get*`. Perhaps we will revisit it. - llvm = tools.libllvm.out; + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; libclang = callPackage ./clang { inherit clang-tools-extra_src; }; - clang-unwrapped = tools.libclang.out; + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; # 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 cb5d08d9ff0..9d1aa1e77cb 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -33,16 +33,15 @@ let libllvm = callPackage ./llvm { }; - # `llvm` historically had the binaries. But this migration - # technique also impedes `lib.get*`. Perhaps we will revisit it. - llvm = tools.libllvm.out; + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; libclang = callPackage ./clang { inherit clang-tools-extra_src; }; - clang-unwrapped = tools.libclang.out; - + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; # disabled until recommonmark supports sphinx 3 #Llvm-manpages = lowPrio (tools.libllvm.override { # enableManpages = true; diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index bfdb65ee9ac..0df54540d2b 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -42,15 +42,15 @@ let inherit llvm_meta; }; - # `llvm` historically had the binaries. But this migration - # technique also impedes `lib.get*`. Perhaps we will revisit it. - llvm = tools.libllvm.out; + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; libclang = callPackage ./clang { inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out; + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; # disabled until recommonmark supports sphinx 3 #Llvm-manpages = lowPrio (tools.libllvm.override { diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 97a295d2d29..c416964b22a 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -30,19 +30,19 @@ let libllvm = callPackage ./llvm { }; - # `llvm` historically had the binaries. But this migration - # technique also impedes `lib.get*`. Perhaps we will revisit it. - llvm = tools.libllvm.out; + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; libllvm-polly = callPackage ./llvm { enablePolly = true; }; - llvm-polly = tools.libllvm-polly.lib; + llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; }; libclang = callPackage ./clang { inherit clang-tools-extra_src; }; - clang-unwrapped = tools.libclang.out; + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; 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 0fc49844b5d..b78f7a62506 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -30,19 +30,19 @@ let libllvm = callPackage ./llvm { }; - # `llvm` historically had the binaries. But this migration - # technique also impedes `lib.get*`. Perhaps we will revisit it. - llvm = tools.libllvm.out; + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; libllvm-polly = callPackage ./llvm { enablePolly = true; }; - llvm-polly = tools.libllvm-polly.lib; + llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; }; libclang = callPackage ./clang { inherit clang-tools-extra_src; }; - clang-unwrapped = tools.libclang.out; + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; 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 8a80c55d45a..6a51f9d4264 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -30,19 +30,19 @@ let libllvm = callPackage ./llvm { }; - # `llvm` historically had the binaries. But this migration - # technique also impedes `lib.get*`. Perhaps we will revisit it. - llvm = tools.libllvm.out; + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; libllvm-polly = callPackage ./llvm { enablePolly = true; }; - llvm-polly = tools.libllvm-polly.lib; + llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; }; libclang = callPackage ./clang { inherit clang-tools-extra_src; }; - clang-unwrapped = tools.libclang.out; + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; clang-polly-unwrapped = callPackage ./clang { inherit clang-tools-extra_src; diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index 3e7ef892e3d..251f0f8a8e9 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -30,19 +30,19 @@ let libllvm = callPackage ./llvm { }; - # `llvm` historically had the binaries. But this migration - # technique also impedes `lib.get*`. Perhaps we will revisit it. - llvm = tools.libllvm.out; + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; libllvm-polly = callPackage ./llvm { enablePolly = true; }; - llvm-polly = tools.libllvm-polly.lib; + llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; }; libclang = callPackage ./clang { inherit clang-tools-extra_src; }; - clang-unwrapped = tools.libclang.out; + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; clang-polly-unwrapped = callPackage ./clang { inherit clang-tools-extra_src; diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index 14157842537..c4a55e36094 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -30,19 +30,19 @@ let libllvm = callPackage ./llvm { }; - # `llvm` historically had the binaries. But this migration - # technique also impedes `lib.get*`. Perhaps we will revisit it. - llvm = tools.libllvm.out; + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputUnspecified = true; }; libllvm-polly = callPackage ./llvm { enablePolly = true; }; - llvm-polly = tools.libllvm-polly.lib; + llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; }; libclang = callPackage ./clang { inherit clang-tools-extra_src; }; - clang-unwrapped = tools.libclang.out; + clang-unwrapped = tools.libclang.out // { outputUnspecified = true; }; clang-polly-unwrapped = callPackage ./clang { inherit clang-tools-extra_src;