Skip to content

Commit cbf3ebe

Browse files
committed
Use stable-haskell/iserv-proxy?ref=iserv-syms for ghc <9.4
1 parent a191d75 commit cbf3ebe

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

overlays/ghc-packages.nix

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,10 @@ let
7575
libiserv = "libraries/libiserv";
7676
} // final.lib.optionalAttrs (!final.stdenv.hostPlatform.isGhcjs || builtins.compareVersions ghcVersion "9" > 0) {
7777
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) {
9082
# Not sure why, but this is missing from older ghcjs versions
9183
remote-iserv = "utils/remote-iserv";
9284
} // final.lib.optionalAttrs (builtins.compareVersions ghcVersion "9.0.1" >= 0) {

overlays/haskell.nix

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,14 +1035,6 @@ final: prev: {
10351035
withInputs = final.recurseIntoAttrs;
10361036

10371037
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
10461038
let
10471039
exes = pkgs: (pkgs.haskell-nix.cabalProject' ({pkgs, ...}: {
10481040
name = "iserv-proxy";

0 commit comments

Comments
 (0)