summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2018-02-19 19:01:17 +0100
committerGitHub <noreply@github.com>2018-02-19 19:01:17 +0100
commitb5aabb698e0a52f09831ee36080758e5208871dc (patch)
tree13dd48725a3bcbdbfd6a68bab6232b0dcfd55a02 /pkgs/top-level/all-packages.nix
parente38cb9b9267d55a15ec6f0eb146860e8fd3bba3b (diff)
parent98215e10e044c29f44f88435e7503dc1657daa9a (diff)
downloadnixlib-b5aabb698e0a52f09831ee36080758e5208871dc.tar
nixlib-b5aabb698e0a52f09831ee36080758e5208871dc.tar.gz
nixlib-b5aabb698e0a52f09831ee36080758e5208871dc.tar.bz2
nixlib-b5aabb698e0a52f09831ee36080758e5208871dc.tar.lz
nixlib-b5aabb698e0a52f09831ee36080758e5208871dc.tar.xz
nixlib-b5aabb698e0a52f09831ee36080758e5208871dc.tar.zst
nixlib-b5aabb698e0a52f09831ee36080758e5208871dc.zip
Merge pull request #35167 from dtzWill/fix/clang-libcxx-4-5-tests
cc-wrapper tests: 4 and 5 regardless of default
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a60250d6e1d..3b6f28a66b33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20675,6 +20675,8 @@ with pkgs;
     cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; };
     cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; };
     cc-wrapper-libcxx-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.libcxxStdenv; };
+    cc-wrapper-clang-4 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_4.stdenv; };
+    cc-wrapper-libcxx-4 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_4.libcxxStdenv; };
     cc-wrapper-clang-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.stdenv; };
     cc-wrapper-libcxx-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; };
     stdenv-inputs = callPackage ../test/stdenv-inputs { };