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

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

@@ -33,15 +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 {

9
pkgs/development/compilers/llvm/11/default.nix
View File

@@ -35,16 +35,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
pkgs/development/compilers/llvm/12/default.nix
View File

@@ -44,15 +44,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
pkgs/development/compilers/llvm/5/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;

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;

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

@@ -32,19 +32,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
pkgs/development/compilers/llvm/8/default.nix
View File

@@ -32,19 +32,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
pkgs/development/compilers/llvm/9/default.nix
View File

@@ -32,19 +32,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;

6
pkgs/development/compilers/z88dk/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "z88dk";
version = "2.0";
version = "2.1";
src = fetchFromGitHub {
owner = "z88dk";
repo = "z88dk";
rev = "v${version}";
sha256 = "14r9bjw6lgz85a59a4ajspvg12swiqxi17zicl8r7p29pi9lsibp";
sha256 = "sha256-NgO8rbM31IX4nrJRU0p1DUafHPagMQepKLLoOLuGlT8=";
fetchSubmodules = true;
};
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"git_rev=${short_rev}"
"version=${version}"
"prefix=$(out)"
"DESTDIR=$(out)"
"git_count=0"
];