public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38314 from ElvishJerricco/fix-ghcjs-7.10

Browse Source 
Fix GHCJS 7.10
This commit is contained in:
Peter Simons 2018-04-03 18:15:44 +02:00 committed by GitHub
commit 97e891aee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/compilers/ghcjs/default.nix
View File

@ -2,5 +2,4 @@
bootPkgs.callPackage ./base.nix { bootPkgs.callPackage ./base.nix {
inherit bootPkgs cabal-install; inherit bootPkgs cabal-install;
broken = true; # https://hydra.nixos.org/build/70552553
} }

11
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -219,4 +219,15 @@ self: super: {
chr-pretty = doJailbreak super.chr-pretty; chr-pretty = doJailbreak super.chr-pretty;
chr-parse = doJailbreak super.chr-parse; chr-parse = doJailbreak super.chr-parse;
# The autogenerated Nix expressions don't take into
# account `if impl(ghc >= x.y)`, which is a common method to depend
# on `semigroups` or `fail` when building with GHC < 8.0.
system-filepath = addBuildDepend super.system-filepath self.semigroups;
haskell-src-exts = addBuildDepend super.haskell-src-exts self.semigroups;
free = addBuildDepend super.free self.fail;
# Newer versions don't build without base-4.9
resourcet = self.resourcet_1_1_11;
conduit = self.conduit_1_2_13_1;
} }

13
pkgs/development/haskell-modules/configuration-ghcjs.nix
View File

@ -53,19 +53,6 @@ self: super:
terminfo = self.terminfo_0_4_0_2; terminfo = self.terminfo_0_4_0_2;
xhtml = self.xhtml_3000_2_1; xhtml = self.xhtml_3000_2_1;
# Cabal isn't part of the stage1 packages which form the default package-db
# that GHCJS provides.
# Almost all packages require Cabal to build their Setup.hs,
# but usually they don't declare it explicitly as they don't need to for normal GHC.
# To account for that we add Cabal by default.
mkDerivation = args: super.mkDerivation (args // {
setupHaskellDepends = (args.setupHaskellDepends or []) ++
(if args.pname == "Cabal" then [ ]
# Break the dependency cycle between Cabal and hscolour
else if args.pname == "hscolour" then [ (dontHyperlinkSource self.Cabal) ]
else [ self.Cabal ]);
});
## OTHER PACKAGES ## OTHER PACKAGES
# haddock throws the error: No input file(s). # haddock throws the error: No input file(s).