git.iko.soy/typeable/nixpkgs
on master help sign in
GHCJS: Add 8.6
commit57cb854e42b5b01b61db84c17015ca0930442dcc authorWill Fancher <elvishjerricco@gmail.com> dateMon 14 Jan 2019, 18:04 (8 years ago) parent27a48b7
5 files changed+206−2
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.6/stage0.nix+176 pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix+2 pkgs/top-level/haskell-packages.nix+15−2
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.6/stage0.nixnew file+176
@@ -0,0 +1,176 @@
1+{ callPackage, configuredSrc }:
2+
3+{
4+
5+ ghcjs = callPackage
6+ ({ mkDerivation, aeson, array, attoparsec, base, base16-bytestring
7+ , base64-bytestring, binary, bytestring, Cabal, containers
8+ , cryptohash, data-default, deepseq, directory, executable-path
9+ , filepath, ghc-api-ghcjs, ghc-boot, ghc-paths, ghci-ghcjs
10+ , ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts
11+ , haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl
12+ , network, optparse-applicative, parallel, parsec, process, random
13+ , regex-posix, safe, shelly, split, stdenv, stringsearch, syb
14+ , system-fileio, system-filepath, tar, template-haskell
15+ , template-haskell-ghcjs, terminfo, test-framework
16+ , test-framework-hunit, text, time, transformers
17+ , transformers-compat, unix, unix-compat, unordered-containers
18+ , vector, wai, wai-app-static, wai-extra, wai-websockets, warp
19+ , webdriver, websockets, wl-pprint-text, yaml
20+ }:
21+ mkDerivation {
22+ pname = "ghcjs";
23+ version = "8.6.0.1";
24+ src = configuredSrc + /.;
25+ isLibrary = true;
26+ isExecutable = true;
27+ enableSeparateDataOutput = true;
28+ setupHaskellDepends = [
29+ base Cabal containers directory filepath process template-haskell
30+ transformers
31+ ];
32+ libraryHaskellDepends = [
33+ aeson array attoparsec base base16-bytestring base64-bytestring
34+ binary bytestring Cabal containers cryptohash data-default deepseq
35+ directory filepath ghc-api-ghcjs ghc-boot ghc-paths ghci-ghcjs
36+ ghcjs-th hashable haskell-src-exts haskell-src-meta lens mtl
37+ optparse-applicative parallel parsec process regex-posix safe split
38+ stringsearch syb template-haskell template-haskell-ghcjs text time
39+ transformers unordered-containers vector wl-pprint-text yaml
40+ ];
41+ executableHaskellDepends = [
42+ aeson base binary bytestring Cabal containers directory
43+ executable-path filepath ghc-api-ghcjs ghc-boot haddock-api-ghcjs
44+ lens mtl optparse-applicative process shelly system-fileio
45+ system-filepath tar terminfo text time transformers
46+ transformers-compat unix unix-compat unordered-containers vector
47+ yaml
48+ ];
49+ testHaskellDepends = [
50+ aeson base bytestring data-default deepseq directory http-types
51+ HUnit lens lifted-base network optparse-applicative process random
52+ shelly system-fileio system-filepath test-framework
53+ test-framework-hunit text time transformers unordered-containers
54+ wai wai-app-static wai-extra wai-websockets warp webdriver
55+ websockets yaml
56+ ];
57+ description = "Haskell to JavaScript compiler";
58+ license = stdenv.lib.licenses.mit;
59+ }) {};
60+
61+ ghc-api-ghcjs = callPackage
62+ ({ mkDerivation, array, base, binary, bytestring, containers
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
66+ }:
67+ mkDerivation {
68+ pname = "ghc-api-ghcjs";
69+ version = "8.6.2";
70+ src = configuredSrc + /lib/ghc-api-ghcjs;
71+ libraryHaskellDepends = [
72+ array base binary bytestring containers deepseq directory filepath
73+ ghc-boot ghc-boot-th ghc-heap ghci-ghcjs hpc process
74+ template-haskell-ghcjs terminfo time transformers unix
75+ ];
76+ homepage = "http://www.haskell.org/ghc/";
77+ description = "The GHC API (customized for GHCJS)";
78+ license = stdenv.lib.licenses.bsd3;
79+ }) {};
80+
81+ ghci-ghcjs = callPackage
82+ ({ mkDerivation, array, base, binary, bytestring, containers
83+ , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap, stdenv
84+ , template-haskell-ghcjs, transformers, unix
85+ }:
86+ mkDerivation {
87+ pname = "ghci-ghcjs";
88+ version = "8.6.1";
89+ src = configuredSrc + /lib/ghci-ghcjs;
90+ libraryHaskellDepends = [
91+ array base binary bytestring containers deepseq filepath ghc-boot
92+ ghc-boot-th ghc-heap template-haskell-ghcjs transformers unix
93+ ];
94+ description = "The library supporting GHC's interactive interpreter (customized for GHCJS)";
95+ license = stdenv.lib.licenses.bsd3;
96+ }) {};
97+
98+ ghcjs-th = callPackage
99+ ({ mkDerivation, base, binary, bytestring, containers, ghc-prim
100+ , ghci-ghcjs, stdenv, template-haskell-ghcjs
101+ }:
102+ mkDerivation {
103+ pname = "ghcjs-th";
104+ version = "0.1.0.0";
105+ src = configuredSrc + /lib/ghcjs-th;
106+ libraryHaskellDepends = [
107+ base binary bytestring containers ghc-prim ghci-ghcjs
108+ template-haskell-ghcjs
109+ ];
110+ homepage = "http://github.com/ghcjs";
111+ license = stdenv.lib.licenses.mit;
112+ }) {};
113+
114+ haddock-api-ghcjs = callPackage
115+ ({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq
116+ , directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths
117+ , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, stdenv
118+ , transformers, xhtml
119+ }:
120+ mkDerivation {
121+ pname = "haddock-api-ghcjs";
122+ version = "2.20.0";
123+ src = configuredSrc + /lib/haddock-api-ghcjs;
124+ enableSeparateDataOutput = true;
125+ libraryHaskellDepends = [
126+ array base bytestring Cabal containers deepseq directory filepath
127+ ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs transformers
128+ xhtml
129+ ];
130+ testHaskellDepends = [
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
134+ ];
135+ testToolDepends = [ hspec-discover ];
136+ homepage = "http://www.haskell.org/haddock/";
137+ description = "A documentation-generation tool for Haskell libraries";
138+ license = stdenv.lib.licenses.bsd3;
139+ }) {};
140+
141+ haddock-library-ghcjs = callPackage
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
146+ }:
147+ mkDerivation {
148+ pname = "haddock-library-ghcjs";
149+ version = "1.6.0";
150+ src = configuredSrc + /lib/haddock-library-ghcjs;
151+ libraryHaskellDepends = [
152+ base bytestring containers parsec text transformers
153+ ];
154+ testHaskellDepends = [
155+ base base-compat bytestring containers deepseq directory filepath
156+ haddock-library hspec optparse-applicative parsec QuickCheck text
157+ transformers tree-diff
158+ ];
159+ testToolDepends = [ hspec-discover ];
160+ homepage = "http://www.haskell.org/haddock/";
161+ description = "Library exposing some functionality of Haddock";
162+ license = stdenv.lib.licenses.bsd3;
163+ }) {};
164+
165+ template-haskell-ghcjs = callPackage
166+ ({ mkDerivation, base, ghc-boot-th, pretty, stdenv }:
167+ mkDerivation {
168+ pname = "template-haskell-ghcjs";
169+ version = "2.14.0.0";
170+ src = configuredSrc + /lib/template-haskell-ghcjs;
171+ libraryHaskellDepends = [ base ghc-boot-th pretty ];
172+ description = "Support library for Template Haskell (customized for GHCJS)";
173+ license = stdenv.lib.licenses.bsd3;
174+ }) {};
175+
176+}
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/top-level/haskell-packages.nix+15−2
@@ -11,6 +11,7 @@ let
1111 "ghcjs"
1212 "ghcjs82"
1313 "ghcjs84"
14+ "ghcjs86"
1415 "integer-simple"
1516 ];
1617
@@ -83,7 +84,7 @@ in {
8384 buildLlvmPackages = buildPackages.llvmPackages_6;
8485 llvmPackages = pkgs.llvmPackages_6;
8586 };
86− ghcjs = compiler.ghcjs84;
87+ ghcjs = compiler.ghcjs86;
8788 ghcjs82 = callPackage ../development/compilers/ghcjs-ng {
8889 bootPkgs = packages.ghc822;
8990 ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json;
@@ -95,6 +96,12 @@ in {
9596 stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix;
9697 ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {};
9798 };
99+ ghcjs86 = callPackage ../development/compilers/ghcjs-ng {
100+ bootPkgs = packages.ghc863;
101+ ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.6/git.json;
102+ stage0 = ../development/compilers/ghcjs-ng/8.6/stage0.nix;
103+ ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.6/dep-overrides.nix {};
104+ };
98105
99106 # The integer-simple attribute set contains all the GHC compilers
100107 # build with integer-simple instead of integer-gmp.
@@ -155,7 +162,7 @@ in {
155162 ghc = bh.compiler.ghcHEAD;
156163 compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
157164 };
158− ghcjs = packages.ghcjs84;
165+ ghcjs = packages.ghcjs86;
159166 ghcjs82 = callPackage ../development/haskell-modules rec {
160167 buildHaskellPackages = ghc.bootPkgs;
161168 ghc = bh.compiler.ghcjs82;
@@ -168,6 +175,12 @@ in {
168175 compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
169176 packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
170177 };
178+ ghcjs86 = callPackage ../development/haskell-modules rec {
179+ buildHaskellPackages = ghc.bootPkgs;
180+ ghc = bh.compiler.ghcjs86;
181+ compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { };
182+ packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
183+ };
171184
172185 # The integer-simple attribute set contains package sets for all the GHC compilers
173186 # using integer-simple instead of integer-gmp.