From 10b771c61a02fc9db2047e880388ac9dcefe8f8c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 1 May 2021 13:24:25 +0200 Subject: [PATCH] tests.haskell*: move into tests.haskell set This will make it easier to add all haskell related tests to the haskell hydra jobset without updating a list of tests in two places. --- pkgs/test/default.nix | 3 +-- pkgs/test/haskell/default.nix | 6 ++++++ .../documentationTarball}/default.nix | 0 .../test/{haskell-shellFor => haskell/shellFor}/default.nix | 0 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 pkgs/test/haskell/default.nix rename pkgs/test/{haskell-documentationTarball => haskell/documentationTarball}/default.nix (100%) rename pkgs/test/{haskell-shellFor => haskell/shellFor}/default.nix (100%) 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 similarity index 100% rename from pkgs/test/haskell-documentationTarball/default.nix rename to pkgs/test/haskell/documentationTarball/default.nix diff --git a/pkgs/test/haskell-shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix similarity index 100% rename from pkgs/test/haskell-shellFor/default.nix rename to pkgs/test/haskell/shellFor/default.nix