Skip to content

Commit cf29680

Browse files
committed
Remove iserv-proxy materialization
1 parent b849a92 commit cf29680

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

overlays/haskell.nix

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,6 @@ final: prev: {
10501050

10511051
src = sources.iserv-proxy;
10521052

1053-
index-state = final.haskell-nix.internalHackageIndexState;
10541053
modules = [{
10551054
config = {
10561055
# Prevent the iserve-proxy-interpreter from depending on itself
@@ -1059,22 +1058,11 @@ final: prev: {
10591058
setupBuildFlags = final.lib.mkForce [];
10601059
};
10611060
}];
1062-
} // (if __compareVersions final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.9" < 0
1063-
then {
1064-
materialized =../materialized/iserv-proxy + "/${
1065-
if pkgs.stdenv.hostPlatform.isWindows
1066-
then "windows"
1067-
else if pkgs.stdenv.hostPlatform.isGhcjs
1068-
then "ghcjs"
1069-
else if pkgs.haskell-nix.haskellLib.isCrossHost
1070-
then "cross"
1071-
else "default"}/${compiler-nix-name}";
1072-
}
1073-
else {
1061+
} // final.lib.optionalAttrs (__compareVersions final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.10" > 0) {
10741062
cabalProjectLocal = ''
10751063
allow-newer: *:base, *:bytestring
10761064
'';
1077-
}))).hsPkgs.iserv-proxy.components.exes;
1065+
})).hsPkgs.iserv-proxy.components.exes;
10781066
in {
10791067
# We need the proxy for the build system and the interpreter for the target
10801068
inherit (exes final.pkgsBuildBuild) iserv-proxy;

0 commit comments

Comments
 (0)