diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-10 20:08:26 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-10 23:58:12 -0500 |
| commit | 4d141bd463ad39c3a783ce9bd725495ceab2a97c (patch) | |
| tree | 5a919ad07d2b9b4f8d4e9312e231b7d34d0f6497 /pkgs | |
| parent | 352f8cb6b6dd402107e7d26f4b2cba8c56b9818a (diff) | |
| download | nixpkgs-4d141bd463ad39c3a783ce9bd725495ceab2a97c.tar nixpkgs-4d141bd463ad39c3a783ce9bd725495ceab2a97c.tar.gz nixpkgs-4d141bd463ad39c3a783ce9bd725495ceab2a97c.tar.bz2 nixpkgs-4d141bd463ad39c3a783ce9bd725495ceab2a97c.tar.lz nixpkgs-4d141bd463ad39c3a783ce9bd725495ceab2a97c.tar.xz nixpkgs-4d141bd463ad39c3a783ce9bd725495ceab2a97c.tar.zst nixpkgs-4d141bd463ad39c3a783ce9bd725495ceab2a97c.zip | |
tests: move to attribute set
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/test/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 26 |
2 files changed, 28 insertions, 24 deletions
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix new file mode 100644 index 00000000000..38f6cb8e564 --- /dev/null +++ b/pkgs/test/default.nix @@ -0,0 +1,26 @@ +{ pkgs, callPackage }: + +with pkgs; + +{ + cc-wrapper = callPackage ./cc-wrapper { }; + cc-wrapper-gcc = callPackage ./cc-wrapper { stdenv = gccStdenv; }; + cc-wrapper-gcc7 = callPackage ./cc-wrapper { stdenv = gcc7Stdenv; }; + cc-wrapper-gcc8 = callPackage ./cc-wrapper { stdenv = gcc8Stdenv; }; + cc-wrapper-clang = callPackage ./cc-wrapper { stdenv = llvmPackages.stdenv; }; + cc-wrapper-libcxx = callPackage ./cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; + cc-wrapper-clang-39 = callPackage ./cc-wrapper { stdenv = llvmPackages_39.stdenv; }; + cc-wrapper-libcxx-39 = callPackage ./cc-wrapper { stdenv = llvmPackages_39.libcxxStdenv; }; + cc-wrapper-clang-4 = callPackage ./cc-wrapper { stdenv = llvmPackages_4.stdenv; }; + cc-wrapper-libcxx-4 = callPackage ./cc-wrapper { stdenv = llvmPackages_4.libcxxStdenv; }; + cc-wrapper-clang-5 = callPackage ./cc-wrapper { stdenv = llvmPackages_5.stdenv; }; + 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; }; + stdenv-inputs = callPackage ./stdenv-inputs { }; + + cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; + cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; + + macOSSierraShared = callPackage ./macos-sierra-shared {}; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e445747be1..a83e4f5fa7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -61,6 +61,8 @@ with pkgs; by Hydra. ''; + tests = recurseIntoAttrs (callPackages ../test {}); + ### Nixpkgs maintainer tools nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { }; @@ -21470,30 +21472,6 @@ with pkgs; openfst = callPackage ../development/libraries/openfst {}; - # `recurseIntoAttrs` for sake of hydra, not nix-env - tests = recurseIntoAttrs { - cc-wrapper = callPackage ../test/cc-wrapper { }; - cc-wrapper-gcc = callPackage ../test/cc-wrapper { stdenv = gccStdenv; }; - cc-wrapper-gcc7 = callPackage ../test/cc-wrapper { stdenv = gcc7Stdenv; }; - cc-wrapper-gcc8 = callPackage ../test/cc-wrapper { stdenv = gcc8Stdenv; }; - cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = llvmPackages.stdenv; }; - 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; }; - cc-wrapper-clang-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.stdenv; }; - cc-wrapper-libcxx-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.libcxxStdenv; }; - stdenv-inputs = callPackage ../test/stdenv-inputs { }; - - cc-multilib-gcc = callPackage ../test/cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; - cc-multilib-clang = callPackage ../test/cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; - - macOSSierraShared = callPackage ../test/macos-sierra-shared {}; - }; - duti = callPackage ../os-specific/darwin/duti {}; dnstracer = callPackage ../tools/networking/dnstracer { |