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

Merge pull request #96193 from dhruvio/haskell-updates 

Fix ghcjs 8.6 [haskell-updates]
This commit is contained in:
Dennis Gosnell 2020-08-26 09:07:03 +09:00 committed by GitHub
parent 89aade0ffa 991527b169
commit 1fc3d9f7fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
View File

@ -1,11 +1,14 @@
{ haskellLib }: { haskellLib }:
let inherit (haskellLib) doJailbreak dontHaddock; let inherit (haskellLib) doJailbreak dontHaddock dontCheck;
in self: super: { in self: super: {
ghcjs = super.ghcjs.override {
shelly = super.shelly_1_8_1;
};
ghc-api-ghcjs = super.ghc-api-ghcjs.override ghc-api-ghcjs = super.ghc-api-ghcjs.override
{ {
happy = self.happy_1_19_5; happy = self.happy_1_19_5;
}; };
haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs; haddock-library-ghcjs = doJailbreak (dontCheck super.haddock-library-ghcjs);
haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs); haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs);
} }

3
pkgs/development/compilers/ghcjs-ng/default.nix
View File

@ -102,7 +102,6 @@ in stdenv.mkDerivation {
inherit passthru; inherit passthru;
meta.broken = true; # build does not succeed meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
meta.platforms = lib.platforms.none; # passthru.bootPkgs.ghc.meta.platforms;
meta.maintainers = [lib.maintainers.elvishjerricco]; meta.maintainers = [lib.maintainers.elvishjerricco];
} }

3
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -64,7 +64,7 @@ core-packages:
# #
# WARNING: This list is generated semiautomatically based on the most recent # WARNING: This list is generated semiautomatically based on the most recent
# LTS package set. If you want to add entries to it, you must do so before the # LTS package set. If you want to add entries to it, you must do so before the
# comment saying "# LTS Haskell x.y". Any changes after that commend will be # comment saying "# LTS Haskell x.y". Any changes after that comment will be
# lost the next time `update-stackage.sh` runs. # lost the next time `update-stackage.sh` runs.
default-package-overrides: default-package-overrides:
# This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag
@ -2604,6 +2604,7 @@ extra-packages:
- resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227 - resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227
- seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
- seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
- shelly ==1.8.1 # ghcjs depends on shelly < 1.9
- split < 0.2 # newer versions don't work with GHC 6.12.3 - split < 0.2 # newer versions don't work with GHC 6.12.3
- tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x
- transformers == 0.4.3.* # the latest version isn't supported by mtl yet - transformers == 0.4.3.* # the latest version isn't supported by mtl yet