Move iserv-proxy-interpreter overrides into overlays/haskell.nix

Author: hamishmack

overlays/armv6l-linux.nix

@@ -18,7 +18,7 @@ final: prev:
           inherit (pkgs) gmp;
           # iserv-proxy needs to come from the buildPackages, as it needs to run on the
           # build host.
-          inherit (final.haskell-nix.iserv-proxy-exes.${config.compiler.nix-name}) iserv-proxy iserv-proxy-interpreter;
+          inherit (final.haskell-nix.iserv-proxy-exes.${config.compiler.nix-name}) iserv-proxy iserv-proxy-interpreter iserv-proxy-interpreter-prof;
         } // {
           # we can perform testing of cross compiled test-suites by using wine.
           # Therefore let's enable doCrossCheck here!

overlays/haskell.nix

@@ -1056,10 +1056,20 @@ final: prev: {
                     allow-newer: *:base, *:bytestring
                   '';
                 })).hsPkgs.iserv-proxy.components.exes;
-            in {
+            in rec {
               # We need the proxy for the build system and the interpreter for the target
               inherit (exes final.pkgsBuildBuild) iserv-proxy;
-              inherit (exes final) iserv-proxy-interpreter;
+              iserv-proxy-interpreter = (exes final).iserv-proxy-interpreter.override
+                (lib.optionalAttrs hostPlatform.isAndroid {
+                  setupBuildFlags = ["--ghc-option=-optl-static" ] ++ lib.optional hostPlatform.isAarch32 "--ghc-option=-optl-no-pie";
+                  enableDebugRTS = true;
+                } // lib.optionalAttrs hostPlatform.isWindows {
+                  setupBuildFlags = ["--ghc-option=-optl-Wl,--disable-dynamicbase,--disable-high-entropy-va,--image-base=0x400000" ];
+                  enableDebugRTS = true;
+                });
+              iserv-proxy-interpreter-prof = iserv-proxy-interpreter.override {
+                enableProfiling = true;
+              };
             }) final.haskell-nix.compiler;
 
         # Add this to your tests to make all the dependencies of haskell.nix

overlays/linux-cross.nix

@@ -6,6 +6,7 @@
 , qemuSuffix ? (haskellLib.qemuByHostPlatform hostPlatform)
 , iserv-proxy
 , iserv-proxy-interpreter
+, iserv-proxy-interpreter-prof
 , gmp
 , buildPlatform
 , hostPlatform
@@ -36,7 +37,7 @@ let
     let
       interpreter =
         if enableProfiling
-          then iserv-proxy-interpreter.override { inherit enableProfiling; }
+          then iserv-proxy-interpreter-prof
           else iserv-proxy-interpreter;
     in
       writeShellScriptBin ("iserv-wrapper" + lib.optionalString enableProfiling "-prof") ''
@@ -48,11 +49,7 @@ let
     unset configureFlags
     PORT=$((5000 + $RANDOM % 5000))
     (>&2 echo "---> Starting ${interpreter.exeName} on port $PORT")
-    ${qemu}/bin/qemu-${qemuSuffix} ${interpreter.override
-      (lib.optionalAttrs hostPlatform.isAndroid {
-        setupBuildFlags = ["--ghc-option=-optl-static" ] ++ lib.optional hostPlatform.isAarch32 "--ghc-option=-optl-no-pie";
-        enableDebugRTS = true;
-       })}/bin/${interpreter.exeName} tmp $PORT $ISERV_ARGS &
+    ${qemu}/bin/qemu-${qemuSuffix} ${interpreter}/bin/${interpreter.exeName} tmp $PORT $ISERV_ARGS &
     (>&2 echo "---| ${interpreter.exeName} should have started on $PORT")
     RISERV_PID="$!"
     ${iserv-proxy}/bin/iserv-proxy $@ 127.0.0.1 "$PORT" $PROXY_ARGS

overlays/mingw_w64.nix

@@ -6,6 +6,7 @@
 , mingw_w64_pthreads
 , iserv-proxy
 , iserv-proxy-interpreter
+, iserv-proxy-interpreter-prof
 , gmp
 , hostPlatform
 , symlinkJoin
@@ -18,7 +19,7 @@ let
     let
       interpreter =
         if enableProfiling
-          then iserv-proxy-interpreter.override { inherit enableProfiling; }
+          then iserv-proxy-interpreter-prof
           else iserv-proxy-interpreter;
       no-load-call = lib.optionalString (interpreter.exeName != "remote-iserv.exe") "--no-load-call";
     in
@@ -37,11 +38,7 @@ let
         PORT=$((5000 + $RANDOM % 5000))
         (>&2 echo "---> Starting ${interpreter.exeName} on port $PORT")
         REMOTE_ISERV=$(mktemp -d)
-        ln -s ${interpreter.override
-          {
-            enableDebugRTS = true;
-            setupBuildFlags = ["--ghc-option=-optl-Wl,--disable-dynamicbase,--disable-high-entropy-va,--image-base=0x400000" ];
-          }}/bin/* $REMOTE_ISERV
+        ln -s ${interpreter}/bin/* $REMOTE_ISERV
         # See coment in comp-builder.nix for where this comes from and why it's here
         # TODO use `LINK_DLL_FOLDERS` here once it is in all the nixpkgs we want to support.
         for p in $pkgsHostTargetAsString; do

overlays/windows.nix

@@ -50,7 +50,7 @@ final: prev:
           inherit (pkgs.pkgsBuildBuild) symlinkJoin;
           # iserv-proxy needs to come from the buildPackages, as it needs to run on the
           # build host.
-          inherit (final.haskell-nix.iserv-proxy-exes.${config.compiler.nix-name}) iserv-proxy iserv-proxy-interpreter;
+          inherit (final.haskell-nix.iserv-proxy-exes.${config.compiler.nix-name}) iserv-proxy iserv-proxy-interpreter iserv-prox-interpreter-prof;
         } // {
           # we can perform testing of cross compiled test-suites by using wine.
           # Therefore let's enable doCrossCheck here!