diff options
author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-07-13 15:37:22 +0200 |
---|---|---|
committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-07-13 15:37:22 +0200 |
commit | 3e19234f34b4ac3090771e9b72e24870e820486a (patch) | |
tree | a6dd53225fb3418774b1799047c5695ba4f07fb3 /pkgs/test | |
parent | 6bd0c16f89c88abca07c684d30584124cd979224 (diff) | |
download | nixpkgs-3e19234f34b4ac3090771e9b72e24870e820486a.tar nixpkgs-3e19234f34b4ac3090771e9b72e24870e820486a.tar.gz nixpkgs-3e19234f34b4ac3090771e9b72e24870e820486a.tar.bz2 nixpkgs-3e19234f34b4ac3090771e9b72e24870e820486a.tar.lz nixpkgs-3e19234f34b4ac3090771e9b72e24870e820486a.tar.xz nixpkgs-3e19234f34b4ac3090771e9b72e24870e820486a.tar.zst nixpkgs-3e19234f34b4ac3090771e9b72e24870e820486a.zip |
tests.haskell: set meta.platforms
This allows packagePlatforms to pick up on the overall supported platforms and schedule builds on Hydra for more than the evaluation platform (usually x86_64-linux).
Diffstat (limited to 'pkgs/test')
-rw-r--r-- | pkgs/test/haskell/documentationTarball/default.nix | 6 | ||||
-rw-r--r-- | pkgs/test/haskell/setBuildTarget/default.nix | 7 | ||||
-rw-r--r-- | pkgs/test/haskell/shellFor/default.nix | 5 | ||||
-rw-r--r-- | pkgs/test/haskell/writers/default.nix | 6 |
4 files changed, 20 insertions, 4 deletions
diff --git a/pkgs/test/haskell/documentationTarball/default.nix b/pkgs/test/haskell/documentationTarball/default.nix index aec3dc41f26..e3214fb49fe 100644 --- a/pkgs/test/haskell/documentationTarball/default.nix +++ b/pkgs/test/haskell/documentationTarball/default.nix @@ -4,7 +4,11 @@ let drv = haskellPackages.vector; docs = pkgs.haskell.lib.documentationTarball drv; -in pkgs.runCommand "test haskell.lib.documentationTarball" { } '' +in pkgs.runCommand "test haskell.lib.documentationTarball" { + meta = { + inherit (docs.meta) platforms; + }; +} '' tar xvzf "${docs}/${drv.name}-docs.tar.gz" # Check for Haddock html diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix index b1335e2a74c..5a8391d0886 100644 --- a/pkgs/test/haskell/setBuildTarget/default.nix +++ b/pkgs/test/haskell/setBuildTarget/default.nix @@ -30,7 +30,12 @@ let fi ''; -in pkgs.runCommand "test haskell.lib.setBuildTarget" {} '' +in +pkgs.runCommand "test haskell.lib.setBuildTarget" { + meta = { + inherit (drv.meta) platforms; + }; +} '' ${test "foo" "bar"} ${test "bar" "foo"} touch "$out" diff --git a/pkgs/test/haskell/shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix index 37ad2e90d89..04f5e045361 100644 --- a/pkgs/test/haskell/shellFor/default.nix +++ b/pkgs/test/haskell/shellFor/default.nix @@ -29,5 +29,8 @@ additionalMaintainers = with lib.maintainers; [ cdepillabout ]; allMaintainers = oldMaintainers ++ additionalMaintainers; in - oldMeta // { maintainers = allMaintainers; }; + oldMeta // { + maintainers = allMaintainers; + inherit (cabal-install.meta) platforms; + }; }) diff --git a/pkgs/test/haskell/writers/default.nix b/pkgs/test/haskell/writers/default.nix index 1d8f4b2b79c..f05fda4bc73 100644 --- a/pkgs/test/haskell/writers/default.nix +++ b/pkgs/test/haskell/writers/default.nix @@ -14,7 +14,11 @@ let ; in -runCommand "test-haskell-writers" {} '' +runCommand "test-haskell-writers" { + meta = { + inherit (tests.writers.meta) platforms; + }; +} '' ${writeTest "success" "test-haskell-bin-writer" "${bin.haskell}/bin/${bin.haskell.name}"} ${writeTest "success" "test-haskell-simple-writer" simple.haskell} ${writeTest "success" "test-haskell-path-writer" path.haskell} |