summary refs log tree commit diff
path: root/pkgs/top-level/release-haskell.nix
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-07-13 15:19:36 +0200
committersternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-07-13 15:19:36 +0200
commit52acca72bff778d492aac4aceb144d12b2d7c771 (patch)
treeab4a00efb5771f5af19d582bf41d4aee9de87d8e /pkgs/top-level/release-haskell.nix
parentb7a0833e686e6d5dd9dca7e07ece90bf813ee3a9 (diff)
downloadnixpkgs-52acca72bff778d492aac4aceb144d12b2d7c771.tar
nixpkgs-52acca72bff778d492aac4aceb144d12b2d7c771.tar.gz
nixpkgs-52acca72bff778d492aac4aceb144d12b2d7c771.tar.bz2
nixpkgs-52acca72bff778d492aac4aceb144d12b2d7c771.tar.lz
nixpkgs-52acca72bff778d492aac4aceb144d12b2d7c771.tar.xz
nixpkgs-52acca72bff778d492aac4aceb144d12b2d7c771.tar.zst
nixpkgs-52acca72bff778d492aac4aceb144d12b2d7c771.zip
top-level/release-haskell.nix: test writers on all platforms
Since the rust writer doesn't seem to get fixed on darwin, we'll just
wrap the haskell writer test in our own derivation (which is possible
since tests.writers exposes a bunch of internals via passthru) and
expose it via tests.haskell which are already in mergeable.

Finally a way to test the (hopefully) working haskell writer on darwin
again!
Diffstat (limited to 'pkgs/top-level/release-haskell.nix')
-rw-r--r--pkgs/top-level/release-haskell.nix11
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 9cc5fb7e0a0..5ca21134275 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -89,12 +89,7 @@ let
       haskellPackages = packagePlatforms pkgs.haskellPackages;
       haskell.compiler = packagePlatforms pkgs.haskell.compiler;
 
-      tests = let
-        testPlatforms = packagePlatforms pkgs.tests;
-      in {
-        haskell = testPlatforms.haskell;
-        writers = testPlatforms.writers;
-      };
+      tests.haskell = packagePlatforms pkgs.tests.haskell;
 
       pkgsMusl.haskell.compiler = packagePlatforms pkgs.pkgsMusl.haskell.compiler // {
         # remove musl ghc865Binary since it is known to be broken and
@@ -255,10 +250,6 @@ let
         constituents = accumulateDerivations [
           # haskell specific tests
           jobs.tests.haskell
-          # writeHaskell and writeHaskellBin
-          # TODO: writeHaskell currently fails on darwin
-          jobs.tests.writers.x86_64-linux
-          jobs.tests.writers.aarch64-linux
           # important top-level packages
           jobs.cabal-install
           jobs.cabal2nix