File tree Expand file tree Collapse file tree 1 file changed +2
-14
lines changed Expand file tree Collapse file tree 1 file changed +2
-14
lines changed Original file line number Diff line number Diff line change @@ -1050,7 +1050,6 @@ final: prev: {
1050
1050
1051
1051
src = sources . iserv-proxy ;
1052
1052
1053
- index-state = final . haskell-nix . internalHackageIndexState ;
1054
1053
modules = [ {
1055
1054
config = {
1056
1055
# Prevent the iserve-proxy-interpreter from depending on itself
@@ -1059,22 +1058,11 @@ final: prev: {
1059
1058
setupBuildFlags = final . lib . mkForce [ ] ;
1060
1059
} ;
1061
1060
} ] ;
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 ) {
1074
1062
cabalProjectLocal = ''
1075
1063
allow-newer: *:base, *:bytestring
1076
1064
'' ;
1077
- } ) ) ) . hsPkgs . iserv-proxy . components . exes ;
1065
+ } ) ) . hsPkgs . iserv-proxy . components . exes ;
1078
1066
in {
1079
1067
# We need the proxy for the build system and the interpreter for the target
1080
1068
inherit ( exes final . pkgsBuildBuild ) iserv-proxy ;
You can’t perform that action at this time.
0 commit comments