From a902d99422c6a522ffae7b8ad7711e23c7490d42 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 24 Apr 2021 11:31:11 +0200 Subject: [PATCH 1/2] llvmPackages_12: Always use the attribute name for pname This might be a bit debatable but upstream uses "xx" instead of "++" when using it as identifier / in the code (file/directory names, build scripts, website URLs, etc.) so we should probably too. And at least the attribute name and pname will be consistent now. --- pkgs/development/compilers/llvm/12/default.nix | 4 ++-- .../compilers/llvm/12/{libc++ => libcxx}/default.nix | 2 +- .../compilers/llvm/12/{libc++abi => libcxxabi}/default.nix | 2 +- .../llvm/12/{libc++abi => libcxxabi}/libcxxabi-wasm.patch | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/compilers/llvm/12/{libc++ => libcxx}/default.nix (98%) rename pkgs/development/compilers/llvm/12/{libc++abi => libcxxabi}/default.nix (99%) rename pkgs/development/compilers/llvm/12/{libc++abi => libcxxabi}/libcxxabi-wasm.patch (100%) diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 00922ed96e2..5b25f37bc2c 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -192,12 +192,12 @@ let libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - libcxx = callPackage ./libc++ ({ inherit llvm_meta; } // + libcxx = callPackage ./libcxx ({ inherit llvm_meta; } // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); - libcxxabi = callPackage ./libc++abi ({ inherit llvm_meta; } // + libcxxabi = callPackage ./libcxxabi ({ inherit llvm_meta; } // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; libunwind = libraries.libunwind; diff --git a/pkgs/development/compilers/llvm/12/libc++/default.nix b/pkgs/development/compilers/llvm/12/libcxx/default.nix similarity index 98% rename from pkgs/development/compilers/llvm/12/libc++/default.nix rename to pkgs/development/compilers/llvm/12/libcxx/default.nix index d85d890879e..7b3b26b959e 100644 --- a/pkgs/development/compilers/llvm/12/libc++/default.nix +++ b/pkgs/development/compilers/llvm/12/libcxx/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation { - pname = "libc++"; + pname = "libcxx"; inherit version; src = fetch "libcxx" "1wf3ww29xkx7prs7pdwicy5qqfapib26110jgmkjrbka9z57bjvx"; diff --git a/pkgs/development/compilers/llvm/12/libc++abi/default.nix b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix similarity index 99% rename from pkgs/development/compilers/llvm/12/libc++abi/default.nix rename to pkgs/development/compilers/llvm/12/libcxxabi/default.nix index 22ec211a3b0..dab6c583e88 100644 --- a/pkgs/development/compilers/llvm/12/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation { - pname = "libc++abi"; + pname = "libcxxabi"; inherit version; src = fetch "libcxxabi" "1cbmzspwjlr8f6sp73pw6ivf4dpg6rpc61by0q1m2zca2k6yif3a"; diff --git a/pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch b/pkgs/development/compilers/llvm/12/libcxxabi/libcxxabi-wasm.patch similarity index 100% rename from pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch rename to pkgs/development/compilers/llvm/12/libcxxabi/libcxxabi-wasm.patch From e4f8498c0bc5add1d704f2c8cc7fd39a48088f0b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 24 Apr 2021 11:40:28 +0200 Subject: [PATCH 2/2] llvmPackages_12: Create subdirectories for the last two packages For consistency. Now all packages will have their own subdirectory (continuation of 781e69d19c4). --- .../compilers/llvm/12/{bintools.nix => bintools/default.nix} | 0 pkgs/development/compilers/llvm/12/default.nix | 4 ++-- .../compilers/llvm/12/{openmp.nix => openmp/default.nix} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/compilers/llvm/12/{bintools.nix => bintools/default.nix} (100%) rename pkgs/development/compilers/llvm/12/{openmp.nix => openmp/default.nix} (100%) diff --git a/pkgs/development/compilers/llvm/12/bintools.nix b/pkgs/development/compilers/llvm/12/bintools/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/12/bintools.nix rename to pkgs/development/compilers/llvm/12/bintools/default.nix diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 5b25f37bc2c..a6d68d2e2a4 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -108,7 +108,7 @@ let # doesn’t support like LLVM. Probably we should move to some other # file. - bintools = callPackage ./bintools.nix {}; + bintools = callPackage ./bintools {}; lldClang = wrapCCWith rec { cc = tools.clang-unwrapped; @@ -203,7 +203,7 @@ let libunwind = libraries.libunwind; })); - openmp = callPackage ./openmp.nix { inherit llvm_meta; }; + openmp = callPackage ./openmp { inherit llvm_meta; }; libunwind = callPackage ./libunwind ({ inherit llvm_meta; } // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { diff --git a/pkgs/development/compilers/llvm/12/openmp.nix b/pkgs/development/compilers/llvm/12/openmp/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/12/openmp.nix rename to pkgs/development/compilers/llvm/12/openmp/default.nix