From 0ae11824896c7a172bd60566900529bb4c154404 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 26 Mar 2021 05:06:15 +0000 Subject: [PATCH] llvmPackages_*.libunwind: Move into own directory I expect to soon give it some patches that would go in there too, but either way it's good to match the others. --- pkgs/development/compilers/llvm/10/default.nix | 2 +- .../compilers/llvm/10/{libunwind.nix => libunwind/default.nix} | 0 pkgs/development/compilers/llvm/11/default.nix | 2 +- .../compilers/llvm/11/{libunwind.nix => libunwind/default.nix} | 0 pkgs/development/compilers/llvm/8/default.nix | 2 +- .../compilers/llvm/8/{libunwind.nix => libunwind/default.nix} | 0 pkgs/development/compilers/llvm/9/default.nix | 2 +- .../compilers/llvm/9/{libunwind.nix => libunwind/default.nix} | 0 8 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/compilers/llvm/10/{libunwind.nix => libunwind/default.nix} (100%) rename pkgs/development/compilers/llvm/11/{libunwind.nix => libunwind/default.nix} (100%) rename pkgs/development/compilers/llvm/8/{libunwind.nix => libunwind/default.nix} (100%) rename pkgs/development/compilers/llvm/9/{libunwind.nix => libunwind/default.nix} (100%) diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 9663c512d86..3fa91cd8374 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -185,7 +185,7 @@ let openmp = callPackage ./openmp.nix {}; - libunwind = callPackage ./libunwind.nix ({} // + libunwind = callPackage ./libunwind ({} // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/10/libunwind.nix rename to pkgs/development/compilers/llvm/10/libunwind/default.nix diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index 88e1850059a..22209ffb647 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -187,7 +187,7 @@ let openmp = callPackage ./openmp.nix {}; - libunwind = callPackage ./libunwind.nix ({} // + libunwind = callPackage ./libunwind ({} // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); diff --git a/pkgs/development/compilers/llvm/11/libunwind.nix b/pkgs/development/compilers/llvm/11/libunwind/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/11/libunwind.nix rename to pkgs/development/compilers/llvm/11/libunwind/default.nix diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index 2e3bf61099d..6d6d8b4f783 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -185,7 +185,7 @@ let openmp = callPackage ./openmp.nix {}; - libunwind = callPackage ./libunwind.nix ({} // + libunwind = callPackage ./libunwind ({} // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/8/libunwind.nix rename to pkgs/development/compilers/llvm/8/libunwind/default.nix diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index 4989c9bfad7..1b8bdad07bb 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -185,7 +185,7 @@ let openmp = callPackage ./openmp.nix {}; - libunwind = callPackage ./libunwind.nix ({} // + libunwind = callPackage ./libunwind ({} // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); diff --git a/pkgs/development/compilers/llvm/9/libunwind.nix b/pkgs/development/compilers/llvm/9/libunwind/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/9/libunwind.nix rename to pkgs/development/compilers/llvm/9/libunwind/default.nix