Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 37c26a396b2b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ec9708143759
Choose a head ref
  • 2 commits
  • 8 files changed
  • 1 contributor

Commits on May 11, 2021

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

    @vcunat
    vcunat committed May 11, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vbgl Vincent Laporte
    GPG key ID: EBD582ADDDB1F81F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6b3b794 View commit details

  2. Merge #122554: llvm*Packages: fix output selection

    @vcunat
    vcunat committed May 11, 2021
    Copy the full SHA
    ec97081 View commit details
8 changes: 4 additions & 4 deletions pkgs/development/compilers/llvm/10/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {
9 changes: 4 additions & 5 deletions pkgs/development/compilers/llvm/11/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
8 changes: 4 additions & 4 deletions pkgs/development/compilers/llvm/12/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {
10 changes: 5 additions & 5 deletions pkgs/development/compilers/llvm/5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
10 changes: 5 additions & 5 deletions pkgs/development/compilers/llvm/6/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
10 changes: 5 additions & 5 deletions pkgs/development/compilers/llvm/7/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
10 changes: 5 additions & 5 deletions pkgs/development/compilers/llvm/8/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
10 changes: 5 additions & 5 deletions pkgs/development/compilers/llvm/9/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;