File tree Expand file tree Collapse file tree 2 files changed +4
-20
lines changed Expand file tree Collapse file tree 2 files changed +4
-20
lines changed Original file line number Diff line number Diff line change 75
75
libiserv = "libraries/libiserv" ;
76
76
} // final . lib . optionalAttrs ( ! final . stdenv . hostPlatform . isGhcjs || builtins . compareVersions ghcVersion "9" > 0 ) {
77
77
ghc = "compiler" ;
78
- } // (
79
- if builtins . compareVersions ghcVersion "9.4" < 0
80
- then {
81
- # As of GHC 9.4 this has been split out of the GHC repo and
82
- # is now in the iserv-proxy flake input
83
- iserv-proxy = "utils/iserv-proxy" ;
84
- }
85
- else {
86
- genprimopcode = "utils/genprimopcode" ;
87
- deriveConstants = "utils/deriveConstants" ;
88
- }
89
- ) // final . lib . optionalAttrs ( ! final . stdenv . hostPlatform . isGhcjs || builtins . compareVersions ghcVersion "8.10.5" >= 0 ) {
78
+ } // final . lib . optionalAttrs ( builtins . compareVersions ghcVersion "9.4" >= 0 ) {
79
+ genprimopcode = "utils/genprimopcode" ;
80
+ deriveConstants = "utils/deriveConstants" ;
81
+ } // final . lib . optionalAttrs ( ! final . stdenv . hostPlatform . isGhcjs || builtins . compareVersions ghcVersion "8.10.5" >= 0 ) {
90
82
# Not sure why, but this is missing from older ghcjs versions
91
83
remote-iserv = "utils/remote-iserv" ;
92
84
} // final . lib . optionalAttrs ( builtins . compareVersions ghcVersion "9.0.1" >= 0 ) {
Original file line number Diff line number Diff line change @@ -1035,14 +1035,6 @@ final: prev: {
1035
1035
withInputs = final . recurseIntoAttrs ;
1036
1036
1037
1037
iserv-proxy-exes = __mapAttrs ( compiler-nix-name : _ghc :
1038
- if __compareVersions final . buildPackages . haskell-nix . compiler . ${ compiler-nix-name } . version "9.4" < 0
1039
- then {
1040
- inherit ( final . buildPackages . ghc-extra-packages . ${ compiler-nix-name } . iserv-proxy . components . exes ) iserv-proxy ;
1041
- # remote-iserv however needs to come from the regular packages as it has to
1042
- # run on the target host.
1043
- iserv-proxy-interpreter = final . ghc-extra-packages . ${ compiler-nix-name } . remote-iserv . components . exes . remote-iserv ;
1044
- }
1045
- else
1046
1038
let
1047
1039
exes = pkgs : ( pkgs . haskell-nix . cabalProject' ( { pkgs , ...} : {
1048
1040
name = "iserv-proxy" ;
You can’t perform that action at this time.
0 commit comments