Merge pull request #143629 from sternenseemann/writers-fixes

writers: fix writeHaskell* for darwin, bintools-related cleanup

pkgs/build-support/writers/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, gawk, gnused, gixy }:
+{ pkgs, buildPackages, lib, gawk, gnused, gixy }:
 
 with lib;
 rec {
@@ -77,7 +77,11 @@ rec {
     }) ''
       ${compileScript}
       ${lib.optionalString strip
-         "${pkgs.binutils-unwrapped}/bin/strip --strip-unneeded $out"}
+          "${lib.getBin buildPackages.bintools-unwrapped}/bin/${buildPackages.bintools-unwrapped.targetPrefix}strip -S $out"}
+      # Sometimes binaries produced for darwin (e. g. by GHC) won't be valid
+      # mach-o executables from the get-go, but need to be corrected somehow
+      # which is done by fixupPhase.
+      ${lib.optionalString pkgs.stdenvNoCC.hostPlatform.isDarwin "fixupPhase"}
       ${optionalString (types.path.check nameOrPath) ''
         mv $out tmp
         mkdir -p $out/$(dirname "${nameOrPath}")

pkgs/top-level/release-haskell.nix

@@ -330,10 +330,7 @@ let
         };
         constituents = accumulateDerivations [
           # haskell specific tests
-          #
-          # TODO: The writers test appears to be failing on darwin for unknown
-          # reasons.  See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881307871.
-          (lib.recursiveUpdate jobs.tests.haskell { writers.x86_64-darwin = null; })
+          jobs.tests.haskell
           # important top-level packages
           jobs.cabal-install
           jobs.cabal2nix