lol

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

This decision was made in a902d99422c6a522ffae7b8ad7711e23c7490d42 but
just for LLVM 12. Now we apply it consitently.

+28 -28
+2 -2
pkgs/development/compilers/llvm/10/default.nix
··· 177 177 178 178 libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; 179 179 180 - libcxx = callPackage ./libc++ ({} // 180 + libcxx = callPackage ./libcxx ({} // 181 181 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { 182 182 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; 183 183 })); 184 184 185 - libcxxabi = callPackage ./libc++abi ({} // 185 + libcxxabi = callPackage ./libcxxabi ({} // 186 186 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { 187 187 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; 188 188 libunwind = libraries.libunwind;
+1 -1
pkgs/development/compilers/llvm/10/libc++/default.nix pkgs/development/compilers/llvm/10/libcxx/default.nix
··· 3 3 }: 4 4 5 5 stdenv.mkDerivation { 6 - pname = "libc++"; 6 + pname = "libcxx"; 7 7 inherit version; 8 8 9 9 src = fetch "libcxx" "0v78bfr6h2zifvdqnj2wlfk4pvxzrqn3hg1v6lqk3y12bx9p9xny";
pkgs/development/compilers/llvm/10/libc++/gnu-install-dirs.patch pkgs/development/compilers/llvm/10/libcxx/gnu-install-dirs.patch
+1 -1
pkgs/development/compilers/llvm/10/libc++abi/default.nix pkgs/development/compilers/llvm/10/libcxxabi/default.nix
··· 3 3 }: 4 4 5 5 stdenv.mkDerivation { 6 - pname = "libc++abi"; 6 + pname = "libcxxabi"; 7 7 inherit version; 8 8 9 9 src = fetch "libcxxabi" "0yqs722y76cwvmfsq0lb917r9m3fci7bf5z3yzl71yz9n88ghzm9";
pkgs/development/compilers/llvm/10/libc++abi/gnu-install-dirs.patch pkgs/development/compilers/llvm/10/libcxxabi/gnu-install-dirs.patch
pkgs/development/compilers/llvm/10/libc++abi/no-threads.patch pkgs/development/compilers/llvm/10/libcxxabi/no-threads.patch
pkgs/development/compilers/llvm/10/libc++abi/wasm.patch pkgs/development/compilers/llvm/10/libcxxabi/wasm.patch
+2 -2
pkgs/development/compilers/llvm/11/default.nix
··· 178 178 179 179 libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; 180 180 181 - libcxx = callPackage ./libc++ ({} // 181 + libcxx = callPackage ./libcxx ({} // 182 182 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { 183 183 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; 184 184 })); 185 185 186 - libcxxabi = callPackage ./libc++abi ({} // 186 + libcxxabi = callPackage ./libcxxabi ({} // 187 187 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { 188 188 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; 189 189 libunwind = libraries.libunwind;
+1 -1
pkgs/development/compilers/llvm/11/libc++/default.nix pkgs/development/compilers/llvm/11/libcxx/default.nix
··· 3 3 }: 4 4 5 5 stdenv.mkDerivation { 6 - pname = "libc++"; 6 + pname = "libcxx"; 7 7 inherit version; 8 8 9 9 src = fetch "libcxx" "1rgqsqpgi0vkga5d7hy0iyfsqgzfz7q1xy7afdfa1snp1qjks8xv";
pkgs/development/compilers/llvm/11/libc++/gnu-install-dirs.patch pkgs/development/compilers/llvm/11/libcxx/gnu-install-dirs.patch
+1 -1
pkgs/development/compilers/llvm/11/libc++abi/default.nix pkgs/development/compilers/llvm/11/libcxxabi/default.nix
··· 3 3 }: 4 4 5 5 stdenv.mkDerivation { 6 - pname = "libc++abi"; 6 + pname = "libcxxabi"; 7 7 inherit version; 8 8 9 9 src = fetch "libcxxabi" "1azcf31mxw59hb1x17xncnm3dyw90ylh8rqx462lvypqh3nr6c8l";
pkgs/development/compilers/llvm/11/libc++abi/gnu-install-dirs.patch pkgs/development/compilers/llvm/11/libcxxabi/gnu-install-dirs.patch
pkgs/development/compilers/llvm/11/libc++abi/no-threads.patch pkgs/development/compilers/llvm/11/libcxxabi/no-threads.patch
pkgs/development/compilers/llvm/11/libc++abi/wasm.patch pkgs/development/compilers/llvm/11/libcxxabi/wasm.patch
+2 -2
pkgs/development/compilers/llvm/5/default.nix
··· 91 91 92 92 libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; 93 93 94 - libcxx = callPackage ./libc++ {}; 94 + libcxx = callPackage ./libcxx {}; 95 95 96 - libcxxabi = callPackage ./libc++abi {}; 96 + libcxxabi = callPackage ./libcxxabi {}; 97 97 98 98 openmp = callPackage ./openmp.nix {}; 99 99 });
+1 -1
pkgs/development/compilers/llvm/5/libc++/default.nix pkgs/development/compilers/llvm/5/libcxx/default.nix
··· 1 1 { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }: 2 2 3 3 stdenv.mkDerivation { 4 - pname = "libc++"; 4 + pname = "libcxx"; 5 5 inherit version; 6 6 7 7 src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf";
pkgs/development/compilers/llvm/5/libc++/gnu-install-dirs.patch pkgs/development/compilers/llvm/5/libcxx/gnu-install-dirs.patch
+1 -1
pkgs/development/compilers/llvm/5/libc++abi/default.nix pkgs/development/compilers/llvm/5/libcxxabi/default.nix
··· 1 1 { lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: 2 2 3 3 stdenv.mkDerivation { 4 - pname = "libc++abi"; 4 + pname = "libcxxabi"; 5 5 inherit version; 6 6 7 7 src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv";
pkgs/development/compilers/llvm/5/libc++abi/gnu-install-dirs.patch pkgs/development/compilers/llvm/5/libcxxabi/gnu-install-dirs.patch
+2 -2
pkgs/development/compilers/llvm/6/default.nix
··· 92 92 93 93 libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; 94 94 95 - libcxx = callPackage ./libc++ {}; 95 + libcxx = callPackage ./libcxx {}; 96 96 97 - libcxxabi = callPackage ./libc++abi {}; 97 + libcxxabi = callPackage ./libcxxabi {}; 98 98 99 99 openmp = callPackage ./openmp.nix {}; 100 100 });
+1 -1
pkgs/development/compilers/llvm/6/libc++/default.nix pkgs/development/compilers/llvm/6/libcxx/default.nix
··· 1 1 { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }: 2 2 3 3 stdenv.mkDerivation { 4 - pname = "libc++"; 4 + pname = "libcxx"; 5 5 inherit version; 6 6 7 7 src = fetch "libcxx" "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n";
pkgs/development/compilers/llvm/6/libc++/gnu-install-dirs.patch pkgs/development/compilers/llvm/6/libcxx/gnu-install-dirs.patch
+1 -1
pkgs/development/compilers/llvm/6/libc++abi/default.nix pkgs/development/compilers/llvm/6/libcxxabi/default.nix
··· 1 1 { lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: 2 2 3 3 stdenv.mkDerivation { 4 - pname = "libc++abi"; 4 + pname = "libcxxabi"; 5 5 inherit version; 6 6 7 7 src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0";
pkgs/development/compilers/llvm/6/libc++abi/gnu-install-dirs.patch pkgs/development/compilers/llvm/6/libcxxabi/gnu-install-dirs.patch
+2 -2
pkgs/development/compilers/llvm/7/default.nix
··· 180 180 181 181 libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; 182 182 183 - libcxx = callPackage ./libc++ ({} // 183 + libcxx = callPackage ./libcxx ({} // 184 184 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { 185 185 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; 186 186 })); 187 187 188 - libcxxabi = callPackage ./libc++abi ({} // 188 + libcxxabi = callPackage ./libcxxabi ({} // 189 189 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { 190 190 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; 191 191 libunwind = libraries.libunwind;
+1 -1
pkgs/development/compilers/llvm/7/libc++/default.nix pkgs/development/compilers/llvm/7/libcxx/default.nix
··· 3 3 }: 4 4 5 5 stdenv.mkDerivation { 6 - pname = "libc++"; 6 + pname = "libcxx"; 7 7 inherit version; 8 8 9 9 src = fetch "libcxx" "0kmhcapm2cjwalyiqasj9dmqbw59mcwdl8fgl951wg7ax84b8hj4";
pkgs/development/compilers/llvm/7/libc++/gnu-install-dirs.patch pkgs/development/compilers/llvm/7/libcxx/gnu-install-dirs.patch
+1 -1
pkgs/development/compilers/llvm/7/libc++abi/default.nix pkgs/development/compilers/llvm/7/libcxxabi/default.nix
··· 6 6 }: 7 7 8 8 stdenv.mkDerivation { 9 - pname = "libc++abi"; 9 + pname = "libcxxabi"; 10 10 inherit version; 11 11 12 12 src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2";
pkgs/development/compilers/llvm/7/libc++abi/gnu-install-dirs.patch pkgs/development/compilers/llvm/7/libcxxabi/gnu-install-dirs.patch
+2 -2
pkgs/development/compilers/llvm/8/default.nix
··· 180 180 181 181 libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; 182 182 183 - libcxx = callPackage ./libc++ ({} // 183 + libcxx = callPackage ./libcxx ({} // 184 184 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { 185 185 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; 186 186 })); 187 187 188 - libcxxabi = callPackage ./libc++abi ({} // 188 + libcxxabi = callPackage ./libcxxabi ({} // 189 189 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { 190 190 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; 191 191 libunwind = libraries.libunwind;
+1 -1
pkgs/development/compilers/llvm/8/libc++/default.nix pkgs/development/compilers/llvm/8/libcxx/default.nix
··· 3 3 }: 4 4 5 5 stdenv.mkDerivation { 6 - pname = "libc++"; 6 + pname = "libcxx"; 7 7 inherit version; 8 8 9 9 src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz";
pkgs/development/compilers/llvm/8/libc++/gnu-install-dirs.patch pkgs/development/compilers/llvm/8/libcxx/gnu-install-dirs.patch
+1 -1
pkgs/development/compilers/llvm/8/libc++abi/default.nix pkgs/development/compilers/llvm/8/libcxxabi/default.nix
··· 3 3 }: 4 4 5 5 stdenv.mkDerivation { 6 - pname = "libc++abi"; 6 + pname = "libcxxabi"; 7 7 inherit version; 8 8 9 9 src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp";
pkgs/development/compilers/llvm/8/libc++abi/gnu-install-dirs.patch pkgs/development/compilers/llvm/8/libcxxabi/gnu-install-dirs.patch
pkgs/development/compilers/llvm/8/libc++abi/no-threads.patch pkgs/development/compilers/llvm/8/libcxxabi/no-threads.patch
pkgs/development/compilers/llvm/8/libc++abi/wasm.patch pkgs/development/compilers/llvm/8/libcxxabi/wasm.patch
+2 -2
pkgs/development/compilers/llvm/9/default.nix
··· 180 180 181 181 libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; 182 182 183 - libcxx = callPackage ./libc++ ({} // 183 + libcxx = callPackage ./libcxx ({} // 184 184 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { 185 185 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; 186 186 })); 187 187 188 - libcxxabi = callPackage ./libc++abi ({} // 188 + libcxxabi = callPackage ./libcxxabi ({} // 189 189 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { 190 190 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; 191 191 libunwind = libraries.libunwind;
+1 -1
pkgs/development/compilers/llvm/9/libc++/default.nix pkgs/development/compilers/llvm/9/libcxx/default.nix
··· 3 3 }: 4 4 5 5 stdenv.mkDerivation { 6 - pname = "libc++"; 6 + pname = "libcxx"; 7 7 inherit version; 8 8 9 9 src = fetch "libcxx" "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089";
pkgs/development/compilers/llvm/9/libc++/gnu-install-dirs.patch pkgs/development/compilers/llvm/9/libcxx/gnu-install-dirs.patch
+1 -1
pkgs/development/compilers/llvm/9/libc++abi/default.nix pkgs/development/compilers/llvm/9/libcxxabi/default.nix
··· 3 3 }: 4 4 5 5 stdenv.mkDerivation { 6 - pname = "libc++abi"; 6 + pname = "libcxxabi"; 7 7 inherit version; 8 8 9 9 src = fetch "libcxxabi" "1b4aiaa8cirx52vk2p5kfk57qmbqf1ipb4nqnjhdgqps9jm7iyg8";
pkgs/development/compilers/llvm/9/libc++abi/gnu-install-dirs.patch pkgs/development/compilers/llvm/9/libcxxabi/gnu-install-dirs.patch
pkgs/development/compilers/llvm/9/libc++abi/no-threads.patch pkgs/development/compilers/llvm/9/libcxxabi/no-threads.patch
pkgs/development/compilers/llvm/9/libc++abi/wasm.patch pkgs/development/compilers/llvm/9/libcxxabi/wasm.patch