Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

llvm*Packages: fix output selection (lib.get*) #122554

Merged
merged 1 commit into from
May 11, 2021
Merged

llvm*Packages: fix output selection (lib.get*) #122554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/development/compilers/llvm/10/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 4 additions & 5 deletions pkgs/development/compilers/llvm/11/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions pkgs/development/compilers/llvm/12/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/compilers/llvm/5/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/compilers/llvm/6/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/compilers/llvm/7/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/compilers/llvm/8/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/compilers/llvm/9/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down