diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-02-19 19:01:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-19 19:01:17 +0100 |
| commit | b5aabb698e0a52f09831ee36080758e5208871dc (patch) | |
| tree | 13dd48725a3bcbdbfd6a68bab6232b0dcfd55a02 /pkgs | |
| parent | e38cb9b9267d55a15ec6f0eb146860e8fd3bba3b (diff) | |
| parent | 98215e10e044c29f44f88435e7503dc1657daa9a (diff) | |
| download | nixlib-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')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 8 |
2 files changed, 10 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 { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 5358738acb66..e7f8d3f2e4ca 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -112,6 +112,14 @@ let jobs.tests.cc-wrapper-clang-39.x86_64-darwin jobs.tests.cc-wrapper-libcxx-39.x86_64-linux jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin + jobs.tests.cc-wrapper-clang-4.x86_64-linux + jobs.tests.cc-wrapper-clang-4.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-4.x86_64-linux + jobs.tests.cc-wrapper-libcxx-4.x86_64-darwin + jobs.tests.cc-wrapper-clang-5.x86_64-linux + jobs.tests.cc-wrapper-clang-5.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-5.x86_64-linux + jobs.tests.cc-wrapper-libcxx-5.x86_64-darwin jobs.tests.cc-multilib-gcc.x86_64-linux jobs.tests.cc-multilib-clang.x86_64-linux jobs.tests.stdenv-inputs.x86_64-linux |