public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/staging-next' into staging

Browse Source
This commit is contained in:
John Ericson
2021-05-11 22:30:46 +00:00
parent 912c8262b4 ec97081437
commit cf02b24813
47 changed files with 566 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/llvm/6/default.nix
View File

@@ -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;