From 52acca72bff778d492aac4aceb144d12b2d7c771 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 13 Jul 2021 15:19:36 +0200
Subject: [PATCH] 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!
---
 pkgs/test/haskell/default.nix         |  1 +
 pkgs/test/haskell/writers/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/release-haskell.nix    | 11 +----------
 3 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/test/haskell/writers/default.nix

diff --git a/pkgs/test/haskell/default.nix b/pkgs/test/haskell/default.nix
index eb389f4051f8..03e4f3461558 100644
--- a/pkgs/test/haskell/default.nix
+++ b/pkgs/test/haskell/default.nix
@@ -4,4 +4,5 @@ lib.recurseIntoAttrs {
   shellFor = callPackage ./shellFor { };
   documentationTarball = callPackage ./documentationTarball { };
   setBuildTarget = callPackage ./setBuildTarget { };
+  writers = callPackage ./writers { };
 }
diff --git a/pkgs/test/haskell/writers/default.nix b/pkgs/test/haskell/writers/default.nix
new file mode 100644
index 000000000000..aa99e2c3c052
--- /dev/null
+++ b/pkgs/test/haskell/writers/default.nix
@@ -0,0 +1,20 @@
+# Wrap only the haskell-related tests from tests.writers
+# in their own derivation for Hydra CI in the haskell-updates
+# jobset. Can presumably removed as soon as tests.writers is
+# always green on darwin as well:
+# https://github.com/NixOS/nixpkgs/issues/126182
+{ runCommand, tests }:
+
+let
+  inherit (tests.writers)
+    writeTest
+    bin
+    simple
+    ;
+in
+
+runCommand "test-haskell-writers" {} ''
+  ${writeTest "success" "test-haskell-bin-writer" "${bin.haskell}/bin/${bin.haskell.name}"}
+  ${writeTest "success" "test-haskell-simple-writer" simple.haskell}
+  touch $out
+''
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 9cc5fb7e0a06..5ca21134275d 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