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

This decision was made in a902d99 but just for LLVM 12. Now we apply it consitently.
NixOS · May 12, 2021 · e0d3c9d · e0d3c9d
1 parent 894f0c6
commit e0d3c9d
Show file tree

Hide file tree

Showing 43 changed files with 28 additions and 28 deletions.
diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix
@@ -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;

diff --git a/...ment/compilers/llvm/10/libc++/default.nix → ...ment/compilers/llvm/10/libcxx/default.nix b/...ment/compilers/llvm/10/libc++/default.nix → ...ment/compilers/llvm/10/libcxx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "0v78bfr6h2zifvdqnj2wlfk4pvxzrqn3hg1v6lqk3y12bx9p9xny";

diff --git a/...ers/llvm/10/libc++/gnu-install-dirs.patch → ...ers/llvm/10/libcxx/gnu-install-dirs.patch b/...ers/llvm/10/libc++/gnu-install-dirs.patch → ...ers/llvm/10/libcxx/gnu-install-dirs.patch
diff --git a/...t/compilers/llvm/10/libc++abi/default.nix → ...t/compilers/llvm/10/libcxxabi/default.nix b/...t/compilers/llvm/10/libc++abi/default.nix → ...t/compilers/llvm/10/libcxxabi/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++abi";
+  pname = "libcxxabi";
   inherit version;
 
   src = fetch "libcxxabi" "0yqs722y76cwvmfsq0lb917r9m3fci7bf5z3yzl71yz9n88ghzm9";

diff --git a/.../llvm/10/libc++abi/gnu-install-dirs.patch → .../llvm/10/libcxxabi/gnu-install-dirs.patch b/.../llvm/10/libc++abi/gnu-install-dirs.patch → .../llvm/10/libcxxabi/gnu-install-dirs.patch
diff --git a/...pilers/llvm/10/libc++abi/no-threads.patch → ...pilers/llvm/10/libcxxabi/no-threads.patch b/...pilers/llvm/10/libc++abi/no-threads.patch → ...pilers/llvm/10/libcxxabi/no-threads.patch
diff --git a/...nt/compilers/llvm/10/libc++abi/wasm.patch → ...nt/compilers/llvm/10/libcxxabi/wasm.patch b/...nt/compilers/llvm/10/libc++abi/wasm.patch → ...nt/compilers/llvm/10/libcxxabi/wasm.patch
diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix
@@ -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;

diff --git a/...ment/compilers/llvm/11/libc++/default.nix → ...ment/compilers/llvm/11/libcxx/default.nix b/...ment/compilers/llvm/11/libc++/default.nix → ...ment/compilers/llvm/11/libcxx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "1rgqsqpgi0vkga5d7hy0iyfsqgzfz7q1xy7afdfa1snp1qjks8xv";

diff --git a/...ers/llvm/11/libc++/gnu-install-dirs.patch → ...ers/llvm/11/libcxx/gnu-install-dirs.patch b/...ers/llvm/11/libc++/gnu-install-dirs.patch → ...ers/llvm/11/libcxx/gnu-install-dirs.patch
diff --git a/...t/compilers/llvm/11/libc++abi/default.nix → ...t/compilers/llvm/11/libcxxabi/default.nix b/...t/compilers/llvm/11/libc++abi/default.nix → ...t/compilers/llvm/11/libcxxabi/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++abi";
+  pname = "libcxxabi";
   inherit version;
 
   src = fetch "libcxxabi" "1azcf31mxw59hb1x17xncnm3dyw90ylh8rqx462lvypqh3nr6c8l";

diff --git a/.../llvm/11/libc++abi/gnu-install-dirs.patch → .../llvm/11/libcxxabi/gnu-install-dirs.patch b/.../llvm/11/libc++abi/gnu-install-dirs.patch → .../llvm/11/libcxxabi/gnu-install-dirs.patch
diff --git a/...pilers/llvm/11/libc++abi/no-threads.patch → ...pilers/llvm/11/libcxxabi/no-threads.patch b/...pilers/llvm/11/libc++abi/no-threads.patch → ...pilers/llvm/11/libcxxabi/no-threads.patch
diff --git a/...nt/compilers/llvm/11/libc++abi/wasm.patch → ...nt/compilers/llvm/11/libcxxabi/wasm.patch b/...nt/compilers/llvm/11/libc++abi/wasm.patch → ...nt/compilers/llvm/11/libcxxabi/wasm.patch
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
@@ -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 {};
   });

diff --git a/...pment/compilers/llvm/5/libc++/default.nix → ...pment/compilers/llvm/5/libcxx/default.nix b/...pment/compilers/llvm/5/libc++/default.nix → ...pment/compilers/llvm/5/libcxx/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf";

diff --git a/...lers/llvm/5/libc++/gnu-install-dirs.patch → ...lers/llvm/5/libcxx/gnu-install-dirs.patch b/...lers/llvm/5/libc++/gnu-install-dirs.patch → ...lers/llvm/5/libcxx/gnu-install-dirs.patch
diff --git a/...nt/compilers/llvm/5/libc++abi/default.nix → ...nt/compilers/llvm/5/libcxxabi/default.nix b/...nt/compilers/llvm/5/libc++abi/default.nix → ...nt/compilers/llvm/5/libcxxabi/default.nix
@@ -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";

diff --git a/...s/llvm/5/libc++abi/gnu-install-dirs.patch → ...s/llvm/5/libcxxabi/gnu-install-dirs.patch b/...s/llvm/5/libc++abi/gnu-install-dirs.patch → ...s/llvm/5/libcxxabi/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
@@ -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 {};
   });

diff --git a/...pment/compilers/llvm/6/libc++/default.nix → ...pment/compilers/llvm/6/libcxx/default.nix b/...pment/compilers/llvm/6/libc++/default.nix → ...pment/compilers/llvm/6/libcxx/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n";

diff --git a/...lers/llvm/6/libc++/gnu-install-dirs.patch → ...lers/llvm/6/libcxx/gnu-install-dirs.patch b/...lers/llvm/6/libc++/gnu-install-dirs.patch → ...lers/llvm/6/libcxx/gnu-install-dirs.patch
diff --git a/...nt/compilers/llvm/6/libc++abi/default.nix → ...nt/compilers/llvm/6/libcxxabi/default.nix b/...nt/compilers/llvm/6/libc++abi/default.nix → ...nt/compilers/llvm/6/libcxxabi/default.nix
@@ -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";

diff --git a/...s/llvm/6/libc++abi/gnu-install-dirs.patch → ...s/llvm/6/libcxxabi/gnu-install-dirs.patch b/...s/llvm/6/libc++abi/gnu-install-dirs.patch → ...s/llvm/6/libcxxabi/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
@@ -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;

diff --git a/...pment/compilers/llvm/7/libc++/default.nix → ...pment/compilers/llvm/7/libcxx/default.nix b/...pment/compilers/llvm/7/libc++/default.nix → ...pment/compilers/llvm/7/libcxx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "0kmhcapm2cjwalyiqasj9dmqbw59mcwdl8fgl951wg7ax84b8hj4";

diff --git a/...lers/llvm/7/libc++/gnu-install-dirs.patch → ...lers/llvm/7/libcxx/gnu-install-dirs.patch b/...lers/llvm/7/libc++/gnu-install-dirs.patch → ...lers/llvm/7/libcxx/gnu-install-dirs.patch
diff --git a/...nt/compilers/llvm/7/libc++abi/default.nix → ...nt/compilers/llvm/7/libcxxabi/default.nix b/...nt/compilers/llvm/7/libc++abi/default.nix → ...nt/compilers/llvm/7/libcxxabi/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++abi";
+  pname = "libcxxabi";
   inherit version;
 
   src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2";

diff --git a/...s/llvm/7/libc++abi/gnu-install-dirs.patch → ...s/llvm/7/libcxxabi/gnu-install-dirs.patch b/...s/llvm/7/libc++abi/gnu-install-dirs.patch → ...s/llvm/7/libcxxabi/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix
@@ -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;

diff --git a/...pment/compilers/llvm/8/libc++/default.nix → ...pment/compilers/llvm/8/libcxx/default.nix b/...pment/compilers/llvm/8/libc++/default.nix → ...pment/compilers/llvm/8/libcxx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz";

diff --git a/...lers/llvm/8/libc++/gnu-install-dirs.patch → ...lers/llvm/8/libcxx/gnu-install-dirs.patch b/...lers/llvm/8/libc++/gnu-install-dirs.patch → ...lers/llvm/8/libcxx/gnu-install-dirs.patch
diff --git a/...nt/compilers/llvm/8/libc++abi/default.nix → ...nt/compilers/llvm/8/libcxxabi/default.nix b/...nt/compilers/llvm/8/libc++abi/default.nix → ...nt/compilers/llvm/8/libcxxabi/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++abi";
+  pname = "libcxxabi";
   inherit version;
 
   src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp";

diff --git a/...s/llvm/8/libc++abi/gnu-install-dirs.patch → ...s/llvm/8/libcxxabi/gnu-install-dirs.patch b/...s/llvm/8/libc++abi/gnu-install-dirs.patch → ...s/llvm/8/libcxxabi/gnu-install-dirs.patch
diff --git a/...mpilers/llvm/8/libc++abi/no-threads.patch → ...mpilers/llvm/8/libcxxabi/no-threads.patch b/...mpilers/llvm/8/libc++abi/no-threads.patch → ...mpilers/llvm/8/libcxxabi/no-threads.patch
diff --git a/...ent/compilers/llvm/8/libc++abi/wasm.patch → ...ent/compilers/llvm/8/libcxxabi/wasm.patch b/...ent/compilers/llvm/8/libc++abi/wasm.patch → ...ent/compilers/llvm/8/libcxxabi/wasm.patch
diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix
@@ -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;

diff --git a/...pment/compilers/llvm/9/libc++/default.nix → ...pment/compilers/llvm/9/libcxx/default.nix b/...pment/compilers/llvm/9/libc++/default.nix → ...pment/compilers/llvm/9/libcxx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089";

diff --git a/...lers/llvm/9/libc++/gnu-install-dirs.patch → ...lers/llvm/9/libcxx/gnu-install-dirs.patch b/...lers/llvm/9/libc++/gnu-install-dirs.patch → ...lers/llvm/9/libcxx/gnu-install-dirs.patch
diff --git a/...nt/compilers/llvm/9/libc++abi/default.nix → ...nt/compilers/llvm/9/libcxxabi/default.nix b/...nt/compilers/llvm/9/libc++abi/default.nix → ...nt/compilers/llvm/9/libcxxabi/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++abi";
+  pname = "libcxxabi";
   inherit version;
 
   src = fetch "libcxxabi" "1b4aiaa8cirx52vk2p5kfk57qmbqf1ipb4nqnjhdgqps9jm7iyg8";

diff --git a/...s/llvm/9/libc++abi/gnu-install-dirs.patch → ...s/llvm/9/libcxxabi/gnu-install-dirs.patch b/...s/llvm/9/libc++abi/gnu-install-dirs.patch → ...s/llvm/9/libcxxabi/gnu-install-dirs.patch
diff --git a/...mpilers/llvm/9/libc++abi/no-threads.patch → ...mpilers/llvm/9/libcxxabi/no-threads.patch b/...mpilers/llvm/9/libc++abi/no-threads.patch → ...mpilers/llvm/9/libcxxabi/no-threads.patch
diff --git a/...ent/compilers/llvm/9/libc++abi/wasm.patch → ...ent/compilers/llvm/9/libcxxabi/wasm.patch b/...ent/compilers/llvm/9/libc++abi/wasm.patch → ...ent/compilers/llvm/9/libcxxabi/wasm.patch