llvmPackages*.libcxx*: Always use the attribute name for pname

This decision was made in a902d99422 but
just for LLVM 12. Now we apply it consitently.
This commit is contained in:
John Ericson 2021-05-11 19:43:21 +00:00
parent 894f0c6ec8
commit e0d3c9d031
43 changed files with 28 additions and 28 deletions

View file

@ -177,12 +177,12 @@ let
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
libcxx = callPackage ./libc++ ({} //
libcxx = callPackage ./libcxx ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
}));
libcxxabi = callPackage ./libc++abi ({} //
libcxxabi = callPackage ./libcxxabi ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
libunwind = libraries.libunwind;

View file

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation {
pname = "libc++";
pname = "libcxx";
inherit version;
src = fetch "libcxx" "0v78bfr6h2zifvdqnj2wlfk4pvxzrqn3hg1v6lqk3y12bx9p9xny";

View file

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation {
pname = "libc++abi";
pname = "libcxxabi";
inherit version;
src = fetch "libcxxabi" "0yqs722y76cwvmfsq0lb917r9m3fci7bf5z3yzl71yz9n88ghzm9";

View file

@ -178,12 +178,12 @@ let
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
libcxx = callPackage ./libc++ ({} //
libcxx = callPackage ./libcxx ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
}));
libcxxabi = callPackage ./libc++abi ({} //
libcxxabi = callPackage ./libcxxabi ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
libunwind = libraries.libunwind;

View file

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation {
pname = "libc++";
pname = "libcxx";
inherit version;
src = fetch "libcxx" "1rgqsqpgi0vkga5d7hy0iyfsqgzfz7q1xy7afdfa1snp1qjks8xv";

View file

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation {
pname = "libc++abi";
pname = "libcxxabi";
inherit version;
src = fetch "libcxxabi" "1azcf31mxw59hb1x17xncnm3dyw90ylh8rqx462lvypqh3nr6c8l";

View file

@ -91,9 +91,9 @@ let
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
libcxx = callPackage ./libc++ {};
libcxx = callPackage ./libcxx {};
libcxxabi = callPackage ./libc++abi {};
libcxxabi = callPackage ./libcxxabi {};
openmp = callPackage ./openmp.nix {};
});

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }:
stdenv.mkDerivation {
pname = "libc++";
pname = "libcxx";
inherit version;
src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf";

View file

@ -1,7 +1,7 @@
{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
stdenv.mkDerivation {
pname = "libc++abi";
pname = "libcxxabi";
inherit version;
src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv";

View file

@ -92,9 +92,9 @@ let
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
libcxx = callPackage ./libc++ {};
libcxx = callPackage ./libcxx {};
libcxxabi = callPackage ./libc++abi {};
libcxxabi = callPackage ./libcxxabi {};
openmp = callPackage ./openmp.nix {};
});

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }:
stdenv.mkDerivation {
pname = "libc++";
pname = "libcxx";
inherit version;
src = fetch "libcxx" "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n";

View file

@ -1,7 +1,7 @@
{ lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
stdenv.mkDerivation {
pname = "libc++abi";
pname = "libcxxabi";
inherit version;
src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0";

View file

@ -180,12 +180,12 @@ let
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
libcxx = callPackage ./libc++ ({} //
libcxx = callPackage ./libcxx ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
}));
libcxxabi = callPackage ./libc++abi ({} //
libcxxabi = callPackage ./libcxxabi ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
libunwind = libraries.libunwind;

View file

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation {
pname = "libc++";
pname = "libcxx";
inherit version;
src = fetch "libcxx" "0kmhcapm2cjwalyiqasj9dmqbw59mcwdl8fgl951wg7ax84b8hj4";

View file

@ -6,7 +6,7 @@
}:
stdenv.mkDerivation {
pname = "libc++abi";
pname = "libcxxabi";
inherit version;
src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2";

View file

@ -180,12 +180,12 @@ let
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
libcxx = callPackage ./libc++ ({} //
libcxx = callPackage ./libcxx ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
}));
libcxxabi = callPackage ./libc++abi ({} //
libcxxabi = callPackage ./libcxxabi ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
libunwind = libraries.libunwind;

View file

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation {
pname = "libc++";
pname = "libcxx";
inherit version;
src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz";

View file

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation {
pname = "libc++abi";
pname = "libcxxabi";
inherit version;
src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp";

View file

@ -180,12 +180,12 @@ let
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
libcxx = callPackage ./libc++ ({} //
libcxx = callPackage ./libcxx ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
}));
libcxxabi = callPackage ./libc++abi ({} //
libcxxabi = callPackage ./libcxxabi ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
libunwind = libraries.libunwind;

View file

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation {
pname = "libc++";
pname = "libcxx";
inherit version;
src = fetch "libcxx" "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089";

View file

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation {
pname = "libc++abi";
pname = "libcxxabi";
inherit version;
src = fetch "libcxxabi" "1b4aiaa8cirx52vk2p5kfk57qmbqf1ipb4nqnjhdgqps9jm7iyg8";