diff options
| -rw-r--r-- | pkgs/test/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/test/haskell/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/test/haskell/documentationTarball/default.nix (renamed from pkgs/test/haskell-documentationTarball/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/test/haskell/shellFor/default.nix (renamed from pkgs/test/haskell-shellFor/default.nix) | 0 |
4 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index b24fc539c93..89656dde292 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -22,8 +22,7 @@ with pkgs; cc-wrapper-libcxx-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.libcxxStdenv; }; stdenv-inputs = callPackage ./stdenv-inputs { }; - haskell-shellFor = callPackage ./haskell-shellFor { }; - haskell-documentationTarball = callPackage ./haskell-documentationTarball { }; + haskell = callPackage ./haskell { }; cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; diff --git a/pkgs/test/haskell/default.nix b/pkgs/test/haskell/default.nix new file mode 100644 index 00000000000..8171f929311 --- /dev/null +++ b/pkgs/test/haskell/default.nix @@ -0,0 +1,6 @@ +{ lib, callPackage }: + +lib.recurseIntoAttrs { + shellFor = callPackage ./shellFor { }; + documentationTarball = callPackage ./documentationTarball { }; +} diff --git a/pkgs/test/haskell-documentationTarball/default.nix b/pkgs/test/haskell/documentationTarball/default.nix index aec3dc41f26..aec3dc41f26 100644 --- a/pkgs/test/haskell-documentationTarball/default.nix +++ b/pkgs/test/haskell/documentationTarball/default.nix diff --git a/pkgs/test/haskell-shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix index 9d13e1112cc..9d13e1112cc 100644 --- a/pkgs/test/haskell-shellFor/default.nix +++ b/pkgs/test/haskell/shellFor/default.nix |