Merge #122554: llvm*Packages: fix output selection

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 {

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;

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 {

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;

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;

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;

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;

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;