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

Make GHCJS 8.4 the default, in line with LTS 12.x

Browse Source
This commit is contained in:
Will Fancher 2018-07-15 22:13:52 -04:00
parent f1fbf818c4
commit 682ef85c6f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/ghcjs-ng/README.md
View File

@ -12,9 +12,9 @@ Updating
--- ---
``` ```
$ nix-prefetch-git https://github.com/ghcjs/ghcjs --rev refs/heads/ghc-8.2 \ $ nix-prefetch-git https://github.com/ghcjs/ghcjs --rev refs/heads/ghc-8.4 \
| jq '{ url, rev, fetchSubmodules, sha256 }' \ | jq '{ url, rev, fetchSubmodules, sha256 }' \
> 8.2/git.json > 8.4/git.json
$ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.2/stage0.nix $ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.4/stage0.nix
``` ```

4
pkgs/top-level/haskell-packages.nix
View File

@ -84,7 +84,7 @@ in rec {
buildLlvmPackages = buildPackages.llvmPackages_5; buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5;
}; };
ghcjs = compiler.ghcjs82; ghcjs = compiler.ghcjs84;
ghcjs710 = packages.ghc7103.callPackage ../development/compilers/ghcjs { ghcjs710 = packages.ghc7103.callPackage ../development/compilers/ghcjs {
bootPkgs = packages.ghc7103; bootPkgs = packages.ghc7103;
inherit (pkgs) cabal-install; inherit (pkgs) cabal-install;
@ -166,7 +166,7 @@ in rec {
ghc = bh.compiler.ghcHEAD; ghc = bh.compiler.ghcHEAD;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
}; };
ghcjs = packages.ghcjs82; ghcjs = packages.ghcjs84;
ghcjs710 = callPackage ../development/haskell-modules rec { ghcjs710 = callPackage ../development/haskell-modules rec {
buildHaskellPackages = ghc.bootPkgs; buildHaskellPackages = ghc.bootPkgs;
ghc = bh.compiler.ghcjs710; ghc = bh.compiler.ghcjs710;