git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #53978 from ElvishJerricco/ghcjs-8.4-8.6-fixes

GHCJS: Fix 8.4 and add 8.6

commit5649eb713ea9f57e7bae49aaf17a46557776806d authorPeter Simons <simons@cryp.to> dateFri 1 Feb 2019, 13:37 (8 years ago) parent0c4786c0969e91
9 files changed+63−54
pkgs/development/compilers/ghcjs-ng/8.2/git.json−6 pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix+3−1 pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix+7 pkgs/development/compilers/ghcjs-ng/8.6/git.json+6 pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix → pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix+26−18 pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix+2 pkgs/development/compilers/ghcjs-ng/default.nix+1−3 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix+3 pkgs/top-level/haskell-packages.nix+15−26
pkgs/development/compilers/ghcjs-ng/8.2/git.jsondeleted−6
@@ -1,6 +0,0 @@
1−{
2− "url": "https://github.com/ghcjs/ghcjs",
3− "rev": "0cff73c3ee13b464adba90f308b77751c75b9f26",
4− "sha256": "1shg34zi6ryaihar62qdkkalv8dsrsqbv58jzkhk9in38sdfkjxv",
5− "fetchSubmodules": true
6−}
pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix+3−1
@@ -2,6 +2,8 @@
22
33let inherit (haskellLib) dontCheck doJailbreak;
44in self: super: {
5− haddock-library-ghcjs = dontCheck super.haddock-library-ghcjs;
5+ haddock-library-ghcjs = doJailbreak (dontCheck super.haddock-library-ghcjs);
66 haddock-api-ghcjs = doJailbreak super.haddock-api-ghcjs;
7+
8+ template-haskell-ghcjs = doJailbreak super.template-haskell-ghcjs;
79}
pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nixnew file+7
@@ -0,0 +1,7 @@
1+{ haskellLib }:
2+
3+let inherit (haskellLib) dontCheck doJailbreak dontHaddock;
4+in self: super: {
5+ haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs;
6+ haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs);
7+}
pkgs/development/compilers/ghcjs-ng/8.6/git.jsonnew file+6
@@ -0,0 +1,6 @@
1+{
2+ "url": "https://github.com/ghcjs/ghcjs",
3+ "rev": "75c61af32d73def4409d1fe7b64659c1d28cd075",
4+ "sha256": "18pixn6xdz6qp941yhxfnmwi463jnpskmg473lv07vvgy4hpgjhj",
5+ "fetchSubmodules": true
6+}
pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix → pkgs/development/compilers/ghcjs-ng/8.6/stage0.nixrenamed+26−18
@@ -20,7 +20,7 @@
2020 }:
2121 mkDerivation {
2222 pname = "ghcjs";
23− version = "8.2.0.1";
23+ version = "8.6.0.1";
2424 src = configuredSrc + /.;
2525 isLibrary = true;
2626 isExecutable = true;
@@ -60,17 +60,17 @@
6060
6161 ghc-api-ghcjs = callPackage
6262 ({ mkDerivation, array, base, binary, bytestring, containers
63− , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci-ghcjs
64− , hoopl, hpc, process, stdenv, template-haskell-ghcjs, terminfo
65− , time, transformers, unix
63+ , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap
64+ , ghci-ghcjs, hpc, process, stdenv, template-haskell-ghcjs
65+ , terminfo, time, transformers, unix
6666 }:
6767 mkDerivation {
6868 pname = "ghc-api-ghcjs";
69− version = "8.2.2";
69+ version = "8.6.2";
7070 src = configuredSrc + /lib/ghc-api-ghcjs;
7171 libraryHaskellDepends = [
7272 array base binary bytestring containers deepseq directory filepath
73− ghc-boot ghc-boot-th ghci-ghcjs hoopl hpc process
73+ ghc-boot ghc-boot-th ghc-heap ghci-ghcjs hpc process
7474 template-haskell-ghcjs terminfo time transformers unix
7575 ];
7676 homepage = "http://www.haskell.org/ghc/";
@@ -80,16 +80,16 @@
8080
8181 ghci-ghcjs = callPackage
8282 ({ mkDerivation, array, base, binary, bytestring, containers
83− , deepseq, filepath, ghc-boot, ghc-boot-th, stdenv
83+ , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap, stdenv
8484 , template-haskell-ghcjs, transformers, unix
8585 }:
8686 mkDerivation {
8787 pname = "ghci-ghcjs";
88− version = "8.2.2";
88+ version = "8.6.1";
8989 src = configuredSrc + /lib/ghci-ghcjs;
9090 libraryHaskellDepends = [
9191 array base binary bytestring containers deepseq filepath ghc-boot
92− ghc-boot-th template-haskell-ghcjs transformers unix
92+ ghc-boot-th ghc-heap template-haskell-ghcjs transformers unix
9393 ];
9494 description = "The library supporting GHC's interactive interpreter (customized for GHCJS)";
9595 license = stdenv.lib.licenses.bsd3;
@@ -119,7 +119,7 @@
119119 }:
120120 mkDerivation {
121121 pname = "haddock-api-ghcjs";
122− version = "2.18.1";
122+ version = "2.20.0";
123123 src = configuredSrc + /lib/haddock-api-ghcjs;
124124 enableSeparateDataOutput = true;
125125 libraryHaskellDepends = [
@@ -128,25 +128,33 @@
128128 xhtml
129129 ];
130130 testHaskellDepends = [
131− base containers ghc-api-ghcjs hspec QuickCheck
131+ array base bytestring Cabal containers deepseq directory filepath
132+ ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs hspec
133+ QuickCheck transformers xhtml
132134 ];
133135 testToolDepends = [ hspec-discover ];
134136 homepage = "http://www.haskell.org/haddock/";
135− description = "A documentation-generation tool for Haskell libraries (customized for GHCJS)";
137+ description = "A documentation-generation tool for Haskell libraries";
136138 license = stdenv.lib.licenses.bsd3;
137139 }) {};
138140
139141 haddock-library-ghcjs = callPackage
140− ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
141− , hspec-discover, QuickCheck, stdenv, transformers
142+ ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
143+ , directory, filepath, haddock-library, hspec, hspec-discover
144+ , optparse-applicative, parsec, QuickCheck, stdenv, text
145+ , transformers, tree-diff
142146 }:
143147 mkDerivation {
144148 pname = "haddock-library-ghcjs";
145− version = "1.4.4";
149+ version = "1.6.0";
146150 src = configuredSrc + /lib/haddock-library-ghcjs;
147− libraryHaskellDepends = [ base bytestring deepseq transformers ];
151+ libraryHaskellDepends = [
152+ base bytestring containers parsec text transformers
153+ ];
148154 testHaskellDepends = [
149− base base-compat bytestring deepseq hspec QuickCheck transformers
155+ base base-compat bytestring containers deepseq directory filepath
156+ haddock-library hspec optparse-applicative parsec QuickCheck text
157+ transformers tree-diff
150158 ];
151159 testToolDepends = [ hspec-discover ];
152160 homepage = "http://www.haskell.org/haddock/";
@@ -158,7 +166,7 @@
158166 ({ mkDerivation, base, ghc-boot-th, pretty, stdenv }:
159167 mkDerivation {
160168 pname = "template-haskell-ghcjs";
161− version = "2.12.0.0";
169+ version = "2.14.0.0";
162170 src = configuredSrc + /lib/template-haskell-ghcjs;
163171 libraryHaskellDepends = [ base ghc-boot-th pretty ];
164172 description = "Support library for Template Haskell (customized for GHCJS)";
pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix+2
@@ -43,6 +43,8 @@ runCommand "configured-ghcjs-src" {
4343 # TODO: How to actually fix this?
4444 # Seems to work fine and produce the right files.
4545 touch ghc/includes/ghcautoconf.h
46+ mkdir -p ghc/compiler/vectorise
47+ mkdir -p ghc/utils/haddock/haddock-library/vendor
4648
4749 patchShebangs .
4850 ./utils/makePackages.sh copy
pkgs/development/compilers/ghcjs-ng/default.nix+1−3
@@ -104,7 +104,5 @@ in stdenv.mkDerivation {
104104 inherit passthru;
105105
106106 meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
107− meta.hydraPlatforms = [];
108− meta.broken = true; # does not compile: https://hydra.nixos.org/build/88052615
109−
107+ meta.maintainers = [lib.maintainers.elvishjerricco];
110108 }
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix+3
@@ -76,4 +76,7 @@ self: super: {
7676 haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
7777 }));
7878
79+ # cabal2nix doesn't list this because of a conditional on the GHC version.
80+ aeson = addBuildDepend super.aeson self.contravariant;
81+
7982}
pkgs/top-level/haskell-packages.nix+15−26
@@ -9,8 +9,8 @@ let
99 "ghc863Binary"
1010 "ghc844"
1111 "ghcjs"
12− "ghcjs82"
1312 "ghcjs84"
13+ "ghcjs86"
1414 "integer-simple"
1515 ];
1616
@@ -83,18 +83,19 @@ in {
8383 buildLlvmPackages = buildPackages.llvmPackages_6;
8484 llvmPackages = pkgs.llvmPackages_6;
8585 };
86− ghcjs = compiler.ghcjs84;
87− ghcjs82 = callPackage ../development/compilers/ghcjs-ng {
88− bootPkgs = packages.ghc822;
89− ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json;
90− stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
91− };
86+ ghcjs = compiler.ghcjs86;
9287 ghcjs84 = callPackage ../development/compilers/ghcjs-ng {
9388 bootPkgs = packages.ghc844;
9489 ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json;
9590 stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix;
9691 ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {};
9792 };
93+ ghcjs86 = callPackage ../development/compilers/ghcjs-ng {
94+ bootPkgs = packages.ghc863;
95+ ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.6/git.json;
96+ stage0 = ../development/compilers/ghcjs-ng/8.6/stage0.nix;
97+ ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.6/dep-overrides.nix {};
98+ };
9899
99100 # The integer-simple attribute set contains all the GHC compilers
100101 # build with integer-simple instead of integer-gmp.
@@ -155,31 +156,19 @@ in {
155156 ghc = bh.compiler.ghcHEAD;
156157 compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
157158 };
158− ghcjs = packages.ghcjs84;
159− ghcjs710 = callPackage ../development/haskell-modules rec {
160− buildHaskellPackages = ghc.bootPkgs;
161− ghc = bh.compiler.ghcjs710;
162− compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
163− packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
164− };
165− ghcjs80 = callPackage ../development/haskell-modules rec {
166− buildHaskellPackages = ghc.bootPkgs;
167− ghc = bh.compiler.ghcjs80;
168− compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
169− packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
170− };
171− ghcjs82 = callPackage ../development/haskell-modules rec {
172− buildHaskellPackages = ghc.bootPkgs;
173− ghc = bh.compiler.ghcjs82;
174− compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
175− packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
176− };
159+ ghcjs = packages.ghcjs86;
177160 ghcjs84 = callPackage ../development/haskell-modules rec {
178161 buildHaskellPackages = ghc.bootPkgs;
179162 ghc = bh.compiler.ghcjs84;
180163 compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
181164 packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
182165 };
166+ ghcjs86 = callPackage ../development/haskell-modules rec {
167+ buildHaskellPackages = ghc.bootPkgs;
168+ ghc = bh.compiler.ghcjs86;
169+ compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { };
170+ packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
171+ };
183172
184173 # The integer-simple attribute set contains package sets for all the GHC compilers
185174 # using integer-simple instead of integer-gmp.