Merge pull request #40392 from ElvishJerricco/ghcjs-8.2
Ghcjs 8.2 & 8.4
This commit is contained in:
commit
b5cef2ea66
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"url": "https://github.com/ghcjs/ghcjs",
|
||||||
|
"rev": "0cff73c3ee13b464adba90f308b77751c75b9f26",
|
||||||
|
"sha256": "1shg34zi6ryaihar62qdkkalv8dsrsqbv58jzkhk9in38sdfkjxv",
|
||||||
|
"fetchSubmodules": true
|
||||||
|
}
|
|
@ -0,0 +1,168 @@
|
||||||
|
{ callPackage, configuredSrc }:
|
||||||
|
|
||||||
|
{
|
||||||
|
|
||||||
|
ghcjs = callPackage
|
||||||
|
({ mkDerivation, aeson, array, attoparsec, base, base16-bytestring
|
||||||
|
, base64-bytestring, binary, bytestring, Cabal, containers
|
||||||
|
, cryptohash, data-default, deepseq, directory, executable-path
|
||||||
|
, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths, ghci-ghcjs
|
||||||
|
, ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts
|
||||||
|
, haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl
|
||||||
|
, network, optparse-applicative, parallel, parsec, process, random
|
||||||
|
, regex-posix, safe, shelly, split, stdenv, stringsearch, syb
|
||||||
|
, system-fileio, system-filepath, tar, template-haskell
|
||||||
|
, template-haskell-ghcjs, terminfo, test-framework
|
||||||
|
, test-framework-hunit, text, time, transformers
|
||||||
|
, transformers-compat, unix, unix-compat, unordered-containers
|
||||||
|
, vector, wai, wai-app-static, wai-extra, wai-websockets, warp
|
||||||
|
, webdriver, websockets, wl-pprint-text, yaml
|
||||||
|
}:
|
||||||
|
mkDerivation {
|
||||||
|
pname = "ghcjs";
|
||||||
|
version = "8.2.0.1";
|
||||||
|
src = configuredSrc + /.;
|
||||||
|
isLibrary = true;
|
||||||
|
isExecutable = true;
|
||||||
|
enableSeparateDataOutput = true;
|
||||||
|
setupHaskellDepends = [
|
||||||
|
base Cabal containers directory filepath process template-haskell
|
||||||
|
transformers
|
||||||
|
];
|
||||||
|
libraryHaskellDepends = [
|
||||||
|
aeson array attoparsec base base16-bytestring base64-bytestring
|
||||||
|
binary bytestring Cabal containers cryptohash data-default deepseq
|
||||||
|
directory filepath ghc-api-ghcjs ghc-boot ghc-paths ghci-ghcjs
|
||||||
|
ghcjs-th hashable haskell-src-exts haskell-src-meta lens mtl
|
||||||
|
optparse-applicative parallel parsec process regex-posix safe split
|
||||||
|
stringsearch syb template-haskell template-haskell-ghcjs text time
|
||||||
|
transformers unordered-containers vector wl-pprint-text yaml
|
||||||
|
];
|
||||||
|
executableHaskellDepends = [
|
||||||
|
aeson base binary bytestring Cabal containers directory
|
||||||
|
executable-path filepath ghc-api-ghcjs ghc-boot haddock-api-ghcjs
|
||||||
|
lens mtl optparse-applicative process shelly system-fileio
|
||||||
|
system-filepath tar terminfo text time transformers
|
||||||
|
transformers-compat unix unix-compat unordered-containers vector
|
||||||
|
yaml
|
||||||
|
];
|
||||||
|
testHaskellDepends = [
|
||||||
|
aeson base bytestring data-default deepseq directory http-types
|
||||||
|
HUnit lens lifted-base network optparse-applicative process random
|
||||||
|
shelly system-fileio system-filepath test-framework
|
||||||
|
test-framework-hunit text time transformers unordered-containers
|
||||||
|
wai wai-app-static wai-extra wai-websockets warp webdriver
|
||||||
|
websockets yaml
|
||||||
|
];
|
||||||
|
description = "Haskell to JavaScript compiler";
|
||||||
|
license = stdenv.lib.licenses.mit;
|
||||||
|
}) {};
|
||||||
|
|
||||||
|
ghc-api-ghcjs = callPackage
|
||||||
|
({ mkDerivation, array, base, binary, bytestring, containers
|
||||||
|
, deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci-ghcjs
|
||||||
|
, hoopl, hpc, process, stdenv, template-haskell-ghcjs, terminfo
|
||||||
|
, time, transformers, unix
|
||||||
|
}:
|
||||||
|
mkDerivation {
|
||||||
|
pname = "ghc-api-ghcjs";
|
||||||
|
version = "8.2.2";
|
||||||
|
src = configuredSrc + /lib/ghc-api-ghcjs;
|
||||||
|
libraryHaskellDepends = [
|
||||||
|
array base binary bytestring containers deepseq directory filepath
|
||||||
|
ghc-boot ghc-boot-th ghci-ghcjs hoopl hpc process
|
||||||
|
template-haskell-ghcjs terminfo time transformers unix
|
||||||
|
];
|
||||||
|
homepage = "http://www.haskell.org/ghc/";
|
||||||
|
description = "The GHC API (customized for GHCJS)";
|
||||||
|
license = stdenv.lib.licenses.bsd3;
|
||||||
|
}) {};
|
||||||
|
|
||||||
|
ghci-ghcjs = callPackage
|
||||||
|
({ mkDerivation, array, base, binary, bytestring, containers
|
||||||
|
, deepseq, filepath, ghc-boot, ghc-boot-th, stdenv
|
||||||
|
, template-haskell-ghcjs, transformers, unix
|
||||||
|
}:
|
||||||
|
mkDerivation {
|
||||||
|
pname = "ghci-ghcjs";
|
||||||
|
version = "8.2.2";
|
||||||
|
src = configuredSrc + /lib/ghci-ghcjs;
|
||||||
|
libraryHaskellDepends = [
|
||||||
|
array base binary bytestring containers deepseq filepath ghc-boot
|
||||||
|
ghc-boot-th template-haskell-ghcjs transformers unix
|
||||||
|
];
|
||||||
|
description = "The library supporting GHC's interactive interpreter (customized for GHCJS)";
|
||||||
|
license = stdenv.lib.licenses.bsd3;
|
||||||
|
}) {};
|
||||||
|
|
||||||
|
ghcjs-th = callPackage
|
||||||
|
({ mkDerivation, base, binary, bytestring, containers, ghc-prim
|
||||||
|
, ghci-ghcjs, stdenv, template-haskell-ghcjs
|
||||||
|
}:
|
||||||
|
mkDerivation {
|
||||||
|
pname = "ghcjs-th";
|
||||||
|
version = "0.1.0.0";
|
||||||
|
src = configuredSrc + /lib/ghcjs-th;
|
||||||
|
libraryHaskellDepends = [
|
||||||
|
base binary bytestring containers ghc-prim ghci-ghcjs
|
||||||
|
template-haskell-ghcjs
|
||||||
|
];
|
||||||
|
homepage = "http://github.com/ghcjs";
|
||||||
|
license = stdenv.lib.licenses.mit;
|
||||||
|
}) {};
|
||||||
|
|
||||||
|
haddock-api-ghcjs = callPackage
|
||||||
|
({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq
|
||||||
|
, directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths
|
||||||
|
, haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, stdenv
|
||||||
|
, transformers, xhtml
|
||||||
|
}:
|
||||||
|
mkDerivation {
|
||||||
|
pname = "haddock-api-ghcjs";
|
||||||
|
version = "2.18.1";
|
||||||
|
src = configuredSrc + /lib/haddock-api-ghcjs;
|
||||||
|
enableSeparateDataOutput = true;
|
||||||
|
libraryHaskellDepends = [
|
||||||
|
array base bytestring Cabal containers deepseq directory filepath
|
||||||
|
ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs transformers
|
||||||
|
xhtml
|
||||||
|
];
|
||||||
|
testHaskellDepends = [
|
||||||
|
base containers ghc-api-ghcjs hspec QuickCheck
|
||||||
|
];
|
||||||
|
testToolDepends = [ hspec-discover ];
|
||||||
|
homepage = "http://www.haskell.org/haddock/";
|
||||||
|
description = "A documentation-generation tool for Haskell libraries (customized for GHCJS)";
|
||||||
|
license = stdenv.lib.licenses.bsd3;
|
||||||
|
}) {};
|
||||||
|
|
||||||
|
haddock-library-ghcjs = callPackage
|
||||||
|
({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
|
||||||
|
, hspec-discover, QuickCheck, stdenv, transformers
|
||||||
|
}:
|
||||||
|
mkDerivation {
|
||||||
|
pname = "haddock-library-ghcjs";
|
||||||
|
version = "1.4.4";
|
||||||
|
src = configuredSrc + /lib/haddock-library-ghcjs;
|
||||||
|
libraryHaskellDepends = [ base bytestring deepseq transformers ];
|
||||||
|
testHaskellDepends = [
|
||||||
|
base base-compat bytestring deepseq hspec QuickCheck transformers
|
||||||
|
];
|
||||||
|
testToolDepends = [ hspec-discover ];
|
||||||
|
homepage = "http://www.haskell.org/haddock/";
|
||||||
|
description = "Library exposing some functionality of Haddock";
|
||||||
|
license = stdenv.lib.licenses.bsd3;
|
||||||
|
}) {};
|
||||||
|
|
||||||
|
template-haskell-ghcjs = callPackage
|
||||||
|
({ mkDerivation, base, ghc-boot-th, pretty, stdenv }:
|
||||||
|
mkDerivation {
|
||||||
|
pname = "template-haskell-ghcjs";
|
||||||
|
version = "2.12.0.0";
|
||||||
|
src = configuredSrc + /lib/template-haskell-ghcjs;
|
||||||
|
libraryHaskellDepends = [ base ghc-boot-th pretty ];
|
||||||
|
description = "Support library for Template Haskell (customized for GHCJS)";
|
||||||
|
license = stdenv.lib.licenses.bsd3;
|
||||||
|
}) {};
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,7 @@
|
||||||
|
{ haskellLib }:
|
||||||
|
|
||||||
|
let inherit (haskellLib) dontCheck doJailbreak;
|
||||||
|
in self: super: {
|
||||||
|
haddock-library-ghcjs = dontCheck super.haddock-library-ghcjs;
|
||||||
|
haddock-api-ghcjs = doJailbreak super.haddock-api-ghcjs;
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"url": "https://github.com/ghcjs/ghcjs",
|
||||||
|
"rev": "d20da90a4819faad1c6309a06363b34edac0374c",
|
||||||
|
"sha256": "0jmxgfm1zwg6xscjcaycfam7zss8ik4ql4ii5lpryh4h6cdhvkbr",
|
||||||
|
"fetchSubmodules": true
|
||||||
|
}
|
|
@ -0,0 +1,175 @@
|
||||||
|
{ callPackage, configuredSrc }:
|
||||||
|
|
||||||
|
{
|
||||||
|
|
||||||
|
ghcjs = callPackage
|
||||||
|
({ mkDerivation, aeson, array, attoparsec, base, base16-bytestring
|
||||||
|
, base64-bytestring, binary, bytestring, Cabal, containers
|
||||||
|
, cryptohash, data-default, deepseq, directory, executable-path
|
||||||
|
, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths, ghci-ghcjs
|
||||||
|
, ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts
|
||||||
|
, haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl
|
||||||
|
, network, optparse-applicative, parallel, parsec, process, random
|
||||||
|
, regex-posix, safe, shelly, split, stdenv, stringsearch, syb
|
||||||
|
, system-fileio, system-filepath, tar, template-haskell
|
||||||
|
, template-haskell-ghcjs, terminfo, test-framework
|
||||||
|
, test-framework-hunit, text, time, transformers
|
||||||
|
, transformers-compat, unix, unix-compat, unordered-containers
|
||||||
|
, vector, wai, wai-app-static, wai-extra, wai-websockets, warp
|
||||||
|
, webdriver, websockets, wl-pprint-text, yaml
|
||||||
|
}:
|
||||||
|
mkDerivation {
|
||||||
|
pname = "ghcjs";
|
||||||
|
version = "8.4.0.1";
|
||||||
|
src = configuredSrc + /.;
|
||||||
|
isLibrary = true;
|
||||||
|
isExecutable = true;
|
||||||
|
enableSeparateDataOutput = true;
|
||||||
|
setupHaskellDepends = [
|
||||||
|
base Cabal containers directory filepath process template-haskell
|
||||||
|
transformers
|
||||||
|
];
|
||||||
|
libraryHaskellDepends = [
|
||||||
|
aeson array attoparsec base base16-bytestring base64-bytestring
|
||||||
|
binary bytestring Cabal containers cryptohash data-default deepseq
|
||||||
|
directory filepath ghc-api-ghcjs ghc-boot ghc-paths ghci-ghcjs
|
||||||
|
ghcjs-th hashable haskell-src-exts haskell-src-meta lens mtl
|
||||||
|
optparse-applicative parallel parsec process regex-posix safe split
|
||||||
|
stringsearch syb template-haskell template-haskell-ghcjs text time
|
||||||
|
transformers unordered-containers vector wl-pprint-text yaml
|
||||||
|
];
|
||||||
|
executableHaskellDepends = [
|
||||||
|
aeson base binary bytestring Cabal containers directory
|
||||||
|
executable-path filepath ghc-api-ghcjs ghc-boot haddock-api-ghcjs
|
||||||
|
lens mtl optparse-applicative process shelly system-fileio
|
||||||
|
system-filepath tar terminfo text time transformers
|
||||||
|
transformers-compat unix unix-compat unordered-containers vector
|
||||||
|
yaml
|
||||||
|
];
|
||||||
|
testHaskellDepends = [
|
||||||
|
aeson base bytestring data-default deepseq directory http-types
|
||||||
|
HUnit lens lifted-base network optparse-applicative process random
|
||||||
|
shelly system-fileio system-filepath test-framework
|
||||||
|
test-framework-hunit text time transformers unordered-containers
|
||||||
|
wai wai-app-static wai-extra wai-websockets warp webdriver
|
||||||
|
websockets yaml
|
||||||
|
];
|
||||||
|
description = "Haskell to JavaScript compiler";
|
||||||
|
license = stdenv.lib.licenses.mit;
|
||||||
|
}) {};
|
||||||
|
|
||||||
|
ghc-api-ghcjs = callPackage
|
||||||
|
({ mkDerivation, array, base, binary, bytestring, containers
|
||||||
|
, deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci-ghcjs
|
||||||
|
, hpc, process, stdenv, template-haskell-ghcjs, terminfo, time
|
||||||
|
, transformers, unix
|
||||||
|
}:
|
||||||
|
mkDerivation {
|
||||||
|
pname = "ghc-api-ghcjs";
|
||||||
|
version = "8.4.0";
|
||||||
|
src = configuredSrc + /lib/ghc-api-ghcjs;
|
||||||
|
libraryHaskellDepends = [
|
||||||
|
array base binary bytestring containers deepseq directory filepath
|
||||||
|
ghc-boot ghc-boot-th ghci-ghcjs hpc process template-haskell-ghcjs
|
||||||
|
terminfo time transformers unix
|
||||||
|
];
|
||||||
|
homepage = "http://www.haskell.org/ghc/";
|
||||||
|
description = "The GHC API (customized for GHCJS)";
|
||||||
|
license = stdenv.lib.licenses.bsd3;
|
||||||
|
}) {};
|
||||||
|
|
||||||
|
ghci-ghcjs = callPackage
|
||||||
|
({ mkDerivation, array, base, binary, bytestring, containers
|
||||||
|
, deepseq, filepath, ghc-boot, ghc-boot-th, stdenv
|
||||||
|
, template-haskell-ghcjs, transformers, unix
|
||||||
|
}:
|
||||||
|
mkDerivation {
|
||||||
|
pname = "ghci-ghcjs";
|
||||||
|
version = "8.4.0";
|
||||||
|
src = configuredSrc + /lib/ghci-ghcjs;
|
||||||
|
libraryHaskellDepends = [
|
||||||
|
array base binary bytestring containers deepseq filepath ghc-boot
|
||||||
|
ghc-boot-th template-haskell-ghcjs transformers unix
|
||||||
|
];
|
||||||
|
description = "The library supporting GHC's interactive interpreter (customized for GHCJS)";
|
||||||
|
license = stdenv.lib.licenses.bsd3;
|
||||||
|
}) {};
|
||||||
|
|
||||||
|
ghcjs-th = callPackage
|
||||||
|
({ mkDerivation, base, binary, bytestring, containers, ghc-prim
|
||||||
|
, ghci-ghcjs, stdenv, template-haskell-ghcjs
|
||||||
|
}:
|
||||||
|
mkDerivation {
|
||||||
|
pname = "ghcjs-th";
|
||||||
|
version = "0.1.0.0";
|
||||||
|
src = configuredSrc + /lib/ghcjs-th;
|
||||||
|
libraryHaskellDepends = [
|
||||||
|
base binary bytestring containers ghc-prim ghci-ghcjs
|
||||||
|
template-haskell-ghcjs
|
||||||
|
];
|
||||||
|
homepage = "http://github.com/ghcjs";
|
||||||
|
license = stdenv.lib.licenses.mit;
|
||||||
|
}) {};
|
||||||
|
|
||||||
|
haddock-api-ghcjs = callPackage
|
||||||
|
({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq
|
||||||
|
, directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths
|
||||||
|
, haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, stdenv
|
||||||
|
, transformers, xhtml
|
||||||
|
}:
|
||||||
|
mkDerivation {
|
||||||
|
pname = "haddock-api-ghcjs";
|
||||||
|
version = "2.20.0";
|
||||||
|
src = configuredSrc + /lib/haddock-api-ghcjs;
|
||||||
|
enableSeparateDataOutput = true;
|
||||||
|
libraryHaskellDepends = [
|
||||||
|
array base bytestring Cabal containers deepseq directory filepath
|
||||||
|
ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs transformers
|
||||||
|
xhtml
|
||||||
|
];
|
||||||
|
testHaskellDepends = [
|
||||||
|
array base bytestring Cabal containers deepseq directory filepath
|
||||||
|
ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs hspec
|
||||||
|
QuickCheck transformers xhtml
|
||||||
|
];
|
||||||
|
testToolDepends = [ hspec-discover ];
|
||||||
|
homepage = "http://www.haskell.org/haddock/";
|
||||||
|
description = "A documentation-generation tool for Haskell libraries";
|
||||||
|
license = stdenv.lib.licenses.bsd3;
|
||||||
|
}) {};
|
||||||
|
|
||||||
|
haddock-library-ghcjs = callPackage
|
||||||
|
({ mkDerivation, base, base-compat, bytestring, containers, deepseq
|
||||||
|
, directory, filepath, haddock-library, hspec, hspec-discover
|
||||||
|
, optparse-applicative, QuickCheck, stdenv, transformers, tree-diff
|
||||||
|
}:
|
||||||
|
mkDerivation {
|
||||||
|
pname = "haddock-library-ghcjs";
|
||||||
|
version = "1.6.0";
|
||||||
|
src = configuredSrc + /lib/haddock-library-ghcjs;
|
||||||
|
libraryHaskellDepends = [
|
||||||
|
base bytestring containers deepseq transformers
|
||||||
|
];
|
||||||
|
testHaskellDepends = [
|
||||||
|
base base-compat bytestring containers deepseq directory filepath
|
||||||
|
haddock-library hspec optparse-applicative QuickCheck transformers
|
||||||
|
tree-diff
|
||||||
|
];
|
||||||
|
testToolDepends = [ hspec-discover ];
|
||||||
|
homepage = "http://www.haskell.org/haddock/";
|
||||||
|
description = "Library exposing some functionality of Haddock";
|
||||||
|
license = stdenv.lib.licenses.bsd3;
|
||||||
|
}) {};
|
||||||
|
|
||||||
|
template-haskell-ghcjs = callPackage
|
||||||
|
({ mkDerivation, base, ghc-boot-th, pretty, stdenv }:
|
||||||
|
mkDerivation {
|
||||||
|
pname = "template-haskell-ghcjs";
|
||||||
|
version = "2.13.0.0";
|
||||||
|
src = configuredSrc + /lib/template-haskell-ghcjs;
|
||||||
|
libraryHaskellDepends = [ base ghc-boot-th pretty ];
|
||||||
|
description = "Support library for Template Haskell (customized for GHCJS)";
|
||||||
|
license = stdenv.lib.licenses.bsd3;
|
||||||
|
}) {};
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,20 @@
|
||||||
|
New build system for GHCJS 8.2
|
||||||
|
---
|
||||||
|
|
||||||
|
`ghcjs-8.2` reworked the build system, and now comes with its own
|
||||||
|
small package set of dependencies. This involves autogenerating
|
||||||
|
several sources and cabal files, based on a GHC
|
||||||
|
checkout. `callCabal2nix` is off limits, since we don't like "import
|
||||||
|
from derivation" in nixpkgs. So there is a derivation that builds the
|
||||||
|
nix expression that should be checked in whenever GHCJS is updated.
|
||||||
|
|
||||||
|
Updating
|
||||||
|
---
|
||||||
|
|
||||||
|
```
|
||||||
|
$ nix-prefetch-git https://github.com/ghcjs/ghcjs --rev refs/heads/ghc-8.2 \
|
||||||
|
| jq '{ url, rev, fetchSubmodules, sha256 }' \
|
||||||
|
> 8.2/git.json
|
||||||
|
$ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.2/stage0.nix
|
||||||
|
```
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
{ haskellLib, alex, happy }:
|
||||||
|
|
||||||
|
let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
|
||||||
|
in self: super: {
|
||||||
|
ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy];
|
||||||
|
ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install");
|
||||||
|
haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs;
|
||||||
|
}
|
|
@ -0,0 +1,45 @@
|
||||||
|
{ perl
|
||||||
|
, autoconf
|
||||||
|
, automake
|
||||||
|
, python3
|
||||||
|
, gcc
|
||||||
|
, cabal-install
|
||||||
|
, gmp
|
||||||
|
, runCommand
|
||||||
|
|
||||||
|
, ghc
|
||||||
|
, happy
|
||||||
|
, alex
|
||||||
|
|
||||||
|
, ghcjsSrc
|
||||||
|
}:
|
||||||
|
|
||||||
|
runCommand "configured-ghcjs-src" {
|
||||||
|
buildInputs = [
|
||||||
|
perl
|
||||||
|
autoconf
|
||||||
|
automake
|
||||||
|
python3
|
||||||
|
gcc
|
||||||
|
ghc
|
||||||
|
happy
|
||||||
|
alex
|
||||||
|
cabal-install
|
||||||
|
];
|
||||||
|
inherit ghcjsSrc;
|
||||||
|
} ''
|
||||||
|
export HOME=$(pwd)
|
||||||
|
cp -r "$ghcjsSrc" "$out"
|
||||||
|
chmod -R +w "$out"
|
||||||
|
cd "$out"
|
||||||
|
|
||||||
|
# TODO: Find a better way to avoid impure version numbers
|
||||||
|
sed -i 's/RELEASE=NO/RELEASE=YES/' ghc/configure.ac
|
||||||
|
|
||||||
|
# TODO: How to actually fix this?
|
||||||
|
# Seems to work fine and produce the right files.
|
||||||
|
touch ghc/includes/ghcautoconf.h
|
||||||
|
|
||||||
|
patchShebangs .
|
||||||
|
./utils/makePackages.sh copy
|
||||||
|
''
|
|
@ -0,0 +1,91 @@
|
||||||
|
{ stdenv
|
||||||
|
, callPackage
|
||||||
|
, fetchgit
|
||||||
|
, ghcjsSrcJson ? null
|
||||||
|
, ghcjsSrc ? fetchgit (builtins.fromJSON (builtins.readFile ghcjsSrcJson))
|
||||||
|
, bootPkgs
|
||||||
|
, alex
|
||||||
|
, happy
|
||||||
|
, stage0
|
||||||
|
, haskellLib
|
||||||
|
, cabal-install
|
||||||
|
, nodejs
|
||||||
|
, makeWrapper
|
||||||
|
, xorg
|
||||||
|
, gmp
|
||||||
|
, pkgconfig
|
||||||
|
, lib
|
||||||
|
, ghcjsDepOverrides ? (_:_:{})
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
passthru = {
|
||||||
|
configuredSrc = callPackage ./configured-ghcjs-src.nix {
|
||||||
|
inherit ghcjsSrc alex happy;
|
||||||
|
inherit (bootPkgs) ghc;
|
||||||
|
};
|
||||||
|
genStage0 = callPackage ./mk-stage0.nix { inherit (passthru) configuredSrc; };
|
||||||
|
bootPkgs = bootPkgs.extend (lib.foldr lib.composeExtensions (_:_:{}) [
|
||||||
|
(self: _: import stage0 {
|
||||||
|
inherit (passthru) configuredSrc;
|
||||||
|
inherit (self) callPackage;
|
||||||
|
})
|
||||||
|
|
||||||
|
(callPackage ./common-overrides.nix { inherit haskellLib alex happy; })
|
||||||
|
ghcjsDepOverrides
|
||||||
|
]);
|
||||||
|
|
||||||
|
targetPrefix = "";
|
||||||
|
inherit bootGhcjs;
|
||||||
|
inherit (bootGhcjs) version;
|
||||||
|
isGhcjs = true;
|
||||||
|
|
||||||
|
# Relics of the old GHCJS build system
|
||||||
|
stage1Packages = [];
|
||||||
|
mkStage2 = _: {};
|
||||||
|
};
|
||||||
|
|
||||||
|
bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs;
|
||||||
|
libexec =
|
||||||
|
if builtins.compareVersions bootGhcjs.version "8.3" <= 0
|
||||||
|
then "${bootGhcjs}/bin"
|
||||||
|
else "${bootGhcjs}/libexec/${stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
|
||||||
|
|
||||||
|
in stdenv.mkDerivation {
|
||||||
|
name = "ghcjs";
|
||||||
|
src = passthru.configuredSrc;
|
||||||
|
nativeBuildInputs = [
|
||||||
|
bootGhcjs
|
||||||
|
passthru.bootPkgs.ghc
|
||||||
|
cabal-install
|
||||||
|
nodejs
|
||||||
|
makeWrapper
|
||||||
|
xorg.lndir
|
||||||
|
gmp
|
||||||
|
pkgconfig
|
||||||
|
];
|
||||||
|
phases = ["unpackPhase" "buildPhase"];
|
||||||
|
buildPhase = ''
|
||||||
|
export HOME=$TMP
|
||||||
|
cd lib/boot
|
||||||
|
|
||||||
|
mkdir -p $out/bin
|
||||||
|
mkdir -p $out/libexec
|
||||||
|
lndir ${libexec} $out/bin
|
||||||
|
|
||||||
|
wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec"
|
||||||
|
wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec"
|
||||||
|
wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d"
|
||||||
|
|
||||||
|
env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j1 --with-ghcjs-bin $out/bin
|
||||||
|
'';
|
||||||
|
|
||||||
|
# We hard code -j1 as a temporary workaround for
|
||||||
|
# https://github.com/ghcjs/ghcjs/issues/654
|
||||||
|
# enableParallelBuilding = true;
|
||||||
|
|
||||||
|
inherit passthru;
|
||||||
|
|
||||||
|
meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
{ configuredSrc
|
||||||
|
, runCommand
|
||||||
|
, cabal2nix
|
||||||
|
, yq
|
||||||
|
}:
|
||||||
|
|
||||||
|
runCommand "stage0.nix" {
|
||||||
|
buildInputs = [cabal2nix yq];
|
||||||
|
} ''
|
||||||
|
(
|
||||||
|
printf '{ callPackage, configuredSrc }:\n\n{\n\n'
|
||||||
|
yq '.packages | .[]' ${configuredSrc}/stack.yaml -r | sed 's|^\.$|./.|' | sed 's|^\.||' | while read f; do
|
||||||
|
printf ' %s = callPackage\n' \
|
||||||
|
"$(find ${configuredSrc}/$f -name "*.cabal" -maxdepth 1 \
|
||||||
|
| xargs basename \
|
||||||
|
| sed 's/.cabal$//')"
|
||||||
|
printf '(%s) {};' \
|
||||||
|
"$(cabal2nix ${configuredSrc}/$f \
|
||||||
|
| sed 's|${configuredSrc}/|configuredSrc + |g')" \
|
||||||
|
| sed 's/^/ /'
|
||||||
|
printf '\n\n'
|
||||||
|
done
|
||||||
|
printf '}\n'
|
||||||
|
) > $out
|
||||||
|
''
|
|
@ -105,6 +105,9 @@ self: super: {
|
||||||
## hspec-discover ==2.4.8
|
## hspec-discover ==2.4.8
|
||||||
hspec-discover = super.hspec-discover_2_5_0;
|
hspec-discover = super.hspec-discover_2_5_0;
|
||||||
|
|
||||||
|
# https://github.com/jcristovao/enclosed-exceptions/issues/12
|
||||||
|
enclosed-exceptions = dontCheck super.enclosed-exceptions;
|
||||||
|
|
||||||
## On Hackage:
|
## On Hackage:
|
||||||
|
|
||||||
## Upstreamed, awaiting a Hackage release
|
## Upstreamed, awaiting a Hackage release
|
||||||
|
@ -450,7 +453,7 @@ self: super: {
|
||||||
matrix = self.matrix_0_3_6_1;
|
matrix = self.matrix_0_3_6_1;
|
||||||
pandoc = self.pandoc_2_2;
|
pandoc = self.pandoc_2_2;
|
||||||
pandoc-types = self.pandoc-types_1_17_4_2;
|
pandoc-types = self.pandoc-types_1_17_4_2;
|
||||||
wl-pprint-text = self.wl-pprint-text_1_1_1_1;
|
wl-pprint-text = self.wl-pprint-text_1_2_0_0;
|
||||||
base-compat = self.base-compat_0_10_1;
|
base-compat = self.base-compat_0_10_1;
|
||||||
|
|
||||||
# https://github.com/xmonad/xmonad/issues/155
|
# https://github.com/xmonad/xmonad/issues/155
|
||||||
|
|
|
@ -10,7 +10,10 @@ let
|
||||||
"ghc821Binary"
|
"ghc821Binary"
|
||||||
"ghcCross"
|
"ghcCross"
|
||||||
"ghcjs"
|
"ghcjs"
|
||||||
"ghcjsHEAD"
|
"ghcjs710"
|
||||||
|
"ghcjs80"
|
||||||
|
"ghcjs82"
|
||||||
|
"ghcjs84"
|
||||||
"integer-simple"
|
"integer-simple"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -76,14 +79,28 @@ in rec {
|
||||||
buildLlvmPackages = buildPackages.llvmPackages_5;
|
buildLlvmPackages = buildPackages.llvmPackages_5;
|
||||||
llvmPackages = pkgs.llvmPackages_5;
|
llvmPackages = pkgs.llvmPackages_5;
|
||||||
};
|
};
|
||||||
ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs {
|
ghcjs = compiler.ghcjs82;
|
||||||
|
ghcjs710 = packages.ghc7103.callPackage ../development/compilers/ghcjs {
|
||||||
bootPkgs = packages.ghc7103;
|
bootPkgs = packages.ghc7103;
|
||||||
inherit (pkgs) cabal-install;
|
inherit (pkgs) cabal-install;
|
||||||
};
|
};
|
||||||
ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix {
|
ghcjs80 = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix {
|
||||||
bootPkgs = packages.ghc802;
|
bootPkgs = packages.ghc802;
|
||||||
inherit (pkgs) cabal-install;
|
inherit (pkgs) cabal-install;
|
||||||
};
|
};
|
||||||
|
ghcjs82 = callPackage ../development/compilers/ghcjs-ng rec {
|
||||||
|
bootPkgs = packages.ghc822;
|
||||||
|
inherit (bootPkgs) alex happy;
|
||||||
|
ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json;
|
||||||
|
stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
|
||||||
|
};
|
||||||
|
ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec {
|
||||||
|
bootPkgs = packages.ghc842;
|
||||||
|
inherit (bootPkgs) alex happy;
|
||||||
|
ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json;
|
||||||
|
stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix;
|
||||||
|
ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {};
|
||||||
|
};
|
||||||
|
|
||||||
# The integer-simple attribute set contains all the GHC compilers
|
# The integer-simple attribute set contains all the GHC compilers
|
||||||
# build with integer-simple instead of integer-gmp.
|
# build with integer-simple instead of integer-gmp.
|
||||||
|
@ -139,18 +156,31 @@ 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 = callPackage ../development/haskell-modules rec {
|
ghcjs = packages.ghcjs82;
|
||||||
|
ghcjs710 = callPackage ../development/haskell-modules rec {
|
||||||
buildHaskellPackages = ghc.bootPkgs;
|
buildHaskellPackages = ghc.bootPkgs;
|
||||||
ghc = bh.compiler.ghcjs;
|
ghc = bh.compiler.ghcjs;
|
||||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
|
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
|
||||||
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
|
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
|
||||||
};
|
};
|
||||||
ghcjsHEAD = callPackage ../development/haskell-modules rec {
|
ghcjs80 = callPackage ../development/haskell-modules rec {
|
||||||
buildHaskellPackages = ghc.bootPkgs;
|
buildHaskellPackages = ghc.bootPkgs;
|
||||||
ghc = bh.compiler.ghcjsHEAD;
|
ghc = bh.compiler.ghcjsHEAD;
|
||||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
|
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
|
||||||
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
|
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
|
||||||
};
|
};
|
||||||
|
ghcjs82 = callPackage ../development/haskell-modules rec {
|
||||||
|
buildHaskellPackages = ghc.bootPkgs;
|
||||||
|
ghc = bh.compiler.ghcjs82;
|
||||||
|
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
|
||||||
|
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
|
||||||
|
};
|
||||||
|
ghcjs84 = callPackage ../development/haskell-modules rec {
|
||||||
|
buildHaskellPackages = ghc.bootPkgs;
|
||||||
|
ghc = bh.compiler.ghcjs84;
|
||||||
|
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
|
||||||
|
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
|
||||||
|
};
|
||||||
|
|
||||||
# The integer-simple attribute set contains package sets for all the GHC compilers
|
# The integer-simple attribute set contains package sets for all the GHC compilers
|
||||||
# using integer-simple instead of integer-gmp.
|
# using integer-simple instead of integer-gmp.
|
||||||
|
|
Loading…
Reference in New Issue