-
-
Notifications
You must be signed in to change notification settings - Fork 15.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixed GHCJS #34037
Fixed GHCJS #34037
Conversation
# Newer versions require Cabal-2.0, and overrideScope is | ||
# inappropriate for libraries. | ||
haddock-api = self.haddock-api_2_17_4; | ||
haddock = self.callHackage "haddock" "2.17.4" {}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the right way to do this? How can I get self.haddock_2_17_4
into hackage-packages.nix
? /cc @peti
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add the package into the extra-packages
section of pkgs/development/haskell-modules/configuration-hackage2nix.yaml
. Then the package will show up the next time haskell-updates
is merged.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got it. Do I leave this as is in the meantime, or switch it to something that would fail e.g. leaving it un-overriden or referencing the version that won't exist until the next haskell-updates
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me! There are 2 minor glitches; I added comments.
@@ -943,4 +943,6 @@ self: super: { | |||
# Add support for https://github.com/haskell-hvr/multi-ghc-travis. | |||
multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis { ShellCheck = self.ShellCheck_0_4_6; }; | |||
|
|||
shelly = dontCheck super.shelly; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Has the issue that causes the tests to fail been reported to upstream? If it has, then please add a link to the upstream ticket before that line so that other people can figure out what is going on.
# Newer versions require Cabal-2.0, and overrideScope is | ||
# inappropriate for libraries. | ||
haddock-api = self.haddock-api_2_17_4; | ||
haddock = self.callHackage "haddock" "2.17.4" {}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add the package into the extra-packages
section of pkgs/development/haskell-modules/configuration-hackage2nix.yaml
. Then the package will show up the next time haskell-updates
is merged.
@ElvishJerricco, we already have |
@peti Oh I hadn't noticed that somehow. I'll give it a shot |
2ced817
to
fcc8cae
Compare
@peti I have made the requested changes. |
I'm imminently going to get into GHCjs (never touched it before). Should I wait for this PR to go through? |
@fosskers GHCJS is currently broken on unstable (which this PR will fix), but it works fine on the 17.09 channel. |
Cool, I'll be patient then. |
Motivation for this change
haddock
library in the package set depends on GHC 8.2'sCabal
version, so needs to be downgraded.ghcjsHEAD
has a library dependency onCabal
(< 2.0), but needscabal-install
(>= 2.0) as a build tool. I think the best way to satisfy this is to just passpkgs.cabal-install
as the tool.We should fix the bindists issue, but that's orthogonal to this PR.
Things done
build-use-sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)