diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-09-24 21:18:23 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-09-24 21:18:23 +0200 |
| commit | 3a09a4b579612828277fa4b2c0e7cf84c16b3edf (patch) | |
| tree | 26cc5cc6fda1a3bd83045c590ae04e95847c86a0 /pkgs/test | |
| parent | cc2f6c866f1013cd0cf620f199bcdba0d8e2fbc2 (diff) | |
| parent | f9197b9f63da8b6d9244c5a8e99507fdd294dcc5 (diff) | |
| download | nixpkgs-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar nixpkgs-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar.gz nixpkgs-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar.bz2 nixpkgs-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar.lz nixpkgs-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar.xz nixpkgs-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar.zst nixpkgs-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1480463
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index eb7fd82b945..24948ce9aa4 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -17,6 +17,8 @@ with pkgs; cc-wrapper-libcxx-5 = callPackage ./cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; }; cc-wrapper-clang-6 = callPackage ./cc-wrapper { stdenv = llvmPackages_6.stdenv; }; cc-wrapper-libcxx-6 = callPackage ./cc-wrapper { stdenv = llvmPackages_6.libcxxStdenv; }; + cc-wrapper-clang-7 = callPackage ./cc-wrapper { stdenv = llvmPackages_7.stdenv; }; + cc-wrapper-libcxx-7 = callPackage ./cc-wrapper { stdenv = llvmPackages_7.libcxxStdenv; }; stdenv-inputs = callPackage ./stdenv-inputs { }; cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; |