Fix ghcjs 8.6 #96141
Fix ghcjs 8.6 #96141
Conversation
Mlterm: Wrap as GTK app
Undervolt: Make timer optional
moolticute: 0.43.19 -> 0.44.0
ZODB: 3.5.1 -> 3.6.0
csound: 6.13.0 -> 6.14.0
wiimms-iso-tools: init at 3.02a
crawl: 0.24.1 -> 0.25.0
Update ROCm to 3.7.0
lattice-diamond: add libusb-compat-0_1 dependency
star: 2.7.3a -> 2.7.4a
sickgear: 0.21.33 -> 0.21.36
logstash: fix support for multiple plugin paths
vscode, vscodium: 1.48.0 -> 1.48.1
go-migrate: init at 4.11.0
nixos/acme: extra lego flags
ashuffle: init at version 3.4.0
hyperrogue: 11.3l -> 11.3o
Signed-off-by: Sirio Balmelli <sirio@b-ad.ch> Co-Authored-By: Doron Behar <doron.behar@gmail.com>
perlPackages.Apprainbarf: init at 1.4
| ghc-api-ghcjs = super.ghc-api-ghcjs.override | ||
| { | ||
| happy = self.happy_1_19_5; | ||
| }; | ||
| haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs; | ||
| haddock-library-ghcjs = doJailbreak (dontCheck super.haddock-library-ghcjs); |
There was a problem hiding this comment.
Tests were failing, addresses #84563
| in self: super: { | ||
| ghcjs = super.ghcjs.override { | ||
| shelly = super.shelly_1_8_1; | ||
| }; |
There was a problem hiding this comment.
GHC 8.6.5 is used as the "boot" GHC for GHCJS. At some point, the shelly dependency was upgraded to 1.9.0, which introduced a breaking change in the API. ghcjs works fine with shelly 1.8.1.
| @@ -102,7 +102,6 @@ in stdenv.mkDerivation { | |||
|
|
|||
| inherit passthru; | |||
|
|
|||
| meta.broken = true; # build does not succeed | |||
| meta.platforms = lib.platforms.none; # passthru.bootPkgs.ghc.meta.platforms; | |||
| meta.platforms = passthru.bootPkgs.ghc.meta.platforms; | |||
There was a problem hiding this comment.
Revert flags to indicate package is no longer broken.
| # ghcjs 8.6.x relies on shelly < 1.9.0 (default is 1.9.0 in current package set, adding 1.8.1). | ||
| shelly_1_8_1 = super.callCabal2nix "shelly" (pkgs.fetchFromGitHub { | ||
| owner = "gregwebs"; | ||
| repo = "Shelly.hs"; | ||
| rev = "d0a185c7dee96820fc3652e7603d81a28276d76c"; | ||
| sha256 = "173msjlq6yxpvd3900ajmd8znyg9kfg5csbxbiz4m7hvxkg8kbkn"; | ||
| }) {}; |
There was a problem hiding this comment.
Added shelly 1.8.1 to the GHC 8.6.x package set.
There was a problem hiding this comment.
Unfortunately we can't use callCabal2nix in nixpkgs because it uses IFD.
You can see the evaluation error from ofborg because of this: https://gist.github.com/GrahamcOfBorg/cb6535e42601174683b297b6d80b9fcd
Instead, you'll have to add shell ==1.8.1 as an extra-package in pkgs/development/haskell-modules/configuration-hackage2nix.yaml. You'll also have to submit this PR to the haskell-updates branch instead of master.
There was a problem hiding this comment.
Thanks, @cdepillabout . Will do.
dhruvio
requested review from
alyssais,
edolstra,
FRidh,
infinisil,
joachifm,
jonringer,
matthewbauer,
mmahut,
nbp and
tfc
as code owners
|
Ugh, sorry everyone, I originally branched off |
|
Closing this PR in favour of #96141 which is correctly branched off |
You have closed this PR in favor of itself. That doesn't seem right? |
|
Ah, I've now discovered #96193. I think that's what you meant. OK then, no worries. |
My apologies, yes that is what I meant. 😄 |
Fixes #84563 and #95931
I have added inline comments in this PR to explain the changes.
Tested by building
haskell.compiler.ghcjs86without any overrides.cc @cdepillabout @maralorn @ElvishJerricco