Merge pull request #139055 from obsidiansystems/dn-backport-21.05-add-ghcjs
[backport release-21.05] ghcjs 8.10.7: init
This commit is contained in:
John Ericson
GitHub
commit
2091b11642
|
|
@ -1,14 +0,0 @@
|
|||
{ haskellLib }:
|
||||
|
||||
let inherit (haskellLib) doJailbreak dontHaddock dontCheck;
|
||||
in self: super: {
|
||||
ghcjs = super.ghcjs.override {
|
||||
shelly = super.shelly_1_8_1;
|
||||
};
|
||||
ghc-api-ghcjs = super.ghc-api-ghcjs.override
|
||||
{
|
||||
happy = self.happy_1_19_5;
|
||||
};
|
||||
haddock-library-ghcjs = doJailbreak (dontCheck super.haddock-library-ghcjs);
|
||||
haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs);
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"url": "https://github.com/ghcjs/ghcjs",
|
||||
"rev": "e87195eaa2bc7e320e18cf10386802bc90b7c874",
|
||||
"sha256": "02mwkf7aagxqi142gcmq048244apslrr72p568akcab9s0fn2gvy",
|
||||
"fetchSubmodules": true
|
||||
}
|
||||
|
|
@ -1,177 +0,0 @@
|
|||
{ 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, lib, 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.6.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 = lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
ghc-api-ghcjs = callPackage
|
||||
({ mkDerivation, alex, array, base, binary, bytestring, containers
|
||||
, deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap
|
||||
, ghci-ghcjs, happy, hpc, process, lib, template-haskell-ghcjs
|
||||
, terminfo, time, transformers, unix
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ghc-api-ghcjs";
|
||||
version = "8.6.5";
|
||||
src = configuredSrc + /lib/ghc-api-ghcjs;
|
||||
libraryHaskellDepends = [
|
||||
array base binary bytestring containers deepseq directory filepath
|
||||
ghc-boot ghc-boot-th ghc-heap ghci-ghcjs hpc process
|
||||
template-haskell-ghcjs terminfo time transformers unix
|
||||
];
|
||||
libraryToolDepends = [ alex happy ];
|
||||
homepage = "http://www.haskell.org/ghc/";
|
||||
description = "The GHC API (customized for GHCJS)";
|
||||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
ghci-ghcjs = callPackage
|
||||
({ mkDerivation, array, base, binary, bytestring, containers
|
||||
, deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap, lib
|
||||
, template-haskell-ghcjs, transformers, unix
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ghci-ghcjs";
|
||||
version = "8.6.1";
|
||||
src = configuredSrc + /lib/ghci-ghcjs;
|
||||
libraryHaskellDepends = [
|
||||
array base binary bytestring containers deepseq filepath ghc-boot
|
||||
ghc-boot-th ghc-heap template-haskell-ghcjs transformers unix
|
||||
];
|
||||
description = "The library supporting GHC's interactive interpreter (customized for GHCJS)";
|
||||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
ghcjs-th = callPackage
|
||||
({ mkDerivation, base, binary, bytestring, containers, ghc-prim
|
||||
, ghci-ghcjs, lib, 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 = "https://github.com/ghcjs";
|
||||
license = 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, lib
|
||||
, 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 = lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
haddock-library-ghcjs = callPackage
|
||||
({ mkDerivation, base, base-compat, bytestring, containers, deepseq
|
||||
, directory, filepath, haddock-library, hspec, hspec-discover
|
||||
, optparse-applicative, parsec, QuickCheck, lib, text
|
||||
, transformers, tree-diff
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "haddock-library-ghcjs";
|
||||
version = "1.6.0";
|
||||
src = configuredSrc + /lib/haddock-library-ghcjs;
|
||||
libraryHaskellDepends = [
|
||||
base bytestring containers parsec text transformers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base base-compat bytestring containers deepseq directory filepath
|
||||
haddock-library hspec optparse-applicative parsec QuickCheck text
|
||||
transformers tree-diff
|
||||
];
|
||||
testToolDepends = [ hspec-discover ];
|
||||
homepage = "http://www.haskell.org/haddock/";
|
||||
description = "Library exposing some functionality of Haddock";
|
||||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
template-haskell-ghcjs = callPackage
|
||||
({ mkDerivation, base, ghc-boot-th, pretty, lib }:
|
||||
mkDerivation {
|
||||
pname = "template-haskell-ghcjs";
|
||||
version = "2.14.0.0";
|
||||
src = configuredSrc + /lib/template-haskell-ghcjs;
|
||||
libraryHaskellDepends = [ base ghc-boot-th pretty ];
|
||||
description = "Support library for Template Haskell (customized for GHCJS)";
|
||||
license = lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
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.4 \
|
||||
| jq '{ url, rev, fetchSubmodules, sha256 }' \
|
||||
> 8.4/git.json
|
||||
$ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.4/stage0.nix
|
||||
$ cabal2nix --compiler ghcjs git://github.com/ghcjs/ghcjs-base > ghcjs-base.nix
|
||||
```
|
||||
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
{ haskellLib }:
|
||||
|
||||
let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
|
||||
in self: super: {
|
||||
ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install");
|
||||
haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs;
|
||||
system-fileio = doJailbreak super.system-fileio;
|
||||
}
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
{ perl
|
||||
, autoconf
|
||||
, automake
|
||||
, python3
|
||||
, gcc
|
||||
, cabal-install
|
||||
, runCommand
|
||||
, lib
|
||||
, stdenv
|
||||
|
||||
, ghc
|
||||
, happy
|
||||
, alex
|
||||
|
||||
, ghcjsSrc
|
||||
}:
|
||||
|
||||
runCommand "configured-ghcjs-src" {
|
||||
nativeBuildInputs = [
|
||||
perl
|
||||
autoconf
|
||||
automake
|
||||
python3
|
||||
ghc
|
||||
happy
|
||||
alex
|
||||
cabal-install
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
gcc # https://github.com/ghcjs/ghcjs/issues/663
|
||||
];
|
||||
inherit ghcjsSrc;
|
||||
} ''
|
||||
export HOME=$(pwd)
|
||||
mkdir $HOME/.cabal
|
||||
touch $HOME/.cabal/config
|
||||
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
|
||||
mkdir -p ghc/compiler/vectorise
|
||||
mkdir -p ghc/utils/haddock/haddock-library/vendor
|
||||
|
||||
patchShebangs .
|
||||
./utils/makePackages.sh copy
|
||||
''
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
{ 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
|
||||
''
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
{ haskellLib }:
|
||||
|
||||
let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
|
||||
in self: super: {
|
||||
ghcjs = doJailbreak (super.ghcjs.overrideScope (self: super: {
|
||||
optparse-applicative = self.optparse-applicative_0_15_1_0;
|
||||
}));
|
||||
}
|
||||
|
|
@ -0,0 +1,60 @@
|
|||
{ perl
|
||||
, autoconf
|
||||
, automake
|
||||
, python3
|
||||
, gcc
|
||||
, cabal-install
|
||||
, runCommand
|
||||
, lib
|
||||
, stdenv
|
||||
|
||||
, ghc
|
||||
, happy
|
||||
, alex
|
||||
|
||||
, ghcjsSrc
|
||||
, version
|
||||
}:
|
||||
|
||||
runCommand "configured-ghcjs-src" {
|
||||
nativeBuildInputs = [
|
||||
perl
|
||||
autoconf
|
||||
automake
|
||||
python3
|
||||
ghc
|
||||
happy
|
||||
alex
|
||||
cabal-install
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
gcc # https://github.com/ghcjs/ghcjs/issues/663
|
||||
];
|
||||
inherit ghcjsSrc;
|
||||
} ''
|
||||
export HOME=$(pwd)
|
||||
mkdir $HOME/.cabal
|
||||
touch $HOME/.cabal/config
|
||||
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
|
||||
|
||||
# These files are needed by ghc-boot package, and these are generated by the
|
||||
# make/hadrian build system when compiling ghc. Since we dont have access to
|
||||
# the generated code of the ghc while it got built, here is a little hack to
|
||||
# generate these again.
|
||||
runhaskell ${./generate_host_version.hs}
|
||||
mkdir -p utils/pkg-cache/ghc/libraries/ghc-boot/dist-install/build/GHC/Platform
|
||||
mv Host.hs utils/pkg-cache/ghc/libraries/ghc-boot/dist-install/build/GHC/Platform/Host.hs
|
||||
mv Version.hs utils/pkg-cache/ghc/libraries/ghc-boot/dist-install/build/GHC/Version.hs
|
||||
|
||||
# The ghcjs has the following hardcoded paths of lib dir in its code. Patching
|
||||
# these to match the path expected by the nixpkgs's generic-builder, etc.
|
||||
sed -i 's/libSubDir = "lib"/libSubDir = "lib\/ghcjs-${version}"/' src-bin/Boot.hs
|
||||
sed -i 's@let libDir = takeDirectory haddockPath </> ".." </> "lib"@let libDir = takeDirectory haddockPath </> ".." </> "lib/ghcjs-${version}"@' src-bin/HaddockDriver.hs
|
||||
|
||||
patchShebangs .
|
||||
./utils/makePackages.sh copy
|
||||
''
|
||||
|
|
@ -17,15 +17,18 @@
|
|||
, lib
|
||||
, ghcjsDepOverrides ? (_:_:{})
|
||||
, haskell
|
||||
, linkFarm
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
let
|
||||
passthru = {
|
||||
configuredSrc = callPackage ./configured-ghcjs-src.nix {
|
||||
inherit ghcjsSrc;
|
||||
inherit (bootPkgs) ghc alex happy;
|
||||
inherit (bootPkgs) ghc alex;
|
||||
inherit (bootGhcjs) version;
|
||||
happy = bootPkgs.happy_1_19_12;
|
||||
};
|
||||
genStage0 = callPackage ./mk-stage0.nix { inherit (passthru) configuredSrc; };
|
||||
bootPkgs = bootPkgs.extend (lib.foldr lib.composeExtensions (_:_:{}) [
|
||||
(self: _: import stage0 {
|
||||
inherit (passthru) configuredSrc;
|
||||
|
|
@ -41,26 +44,22 @@ let
|
|||
targetPrefix = "";
|
||||
inherit bootGhcjs;
|
||||
inherit (bootGhcjs) version;
|
||||
ghcVersion = bootPkgs.ghc.version;
|
||||
isGhcjs = true;
|
||||
|
||||
enableShared = true;
|
||||
|
||||
socket-io = pkgsHostHost.nodePackages."socket.io";
|
||||
|
||||
# Relics of the old GHCJS build system
|
||||
stage1Packages = [];
|
||||
mkStage2 = { callPackage }: {
|
||||
# https://github.com/ghcjs/ghcjs-base/issues/110
|
||||
# https://github.com/ghcjs/ghcjs-base/pull/111
|
||||
ghcjs-base = haskell.lib.dontCheck (haskell.lib.doJailbreak (callPackage ./ghcjs-base.nix {}));
|
||||
};
|
||||
|
||||
haskellCompilerName = "ghcjs-${bootGhcjs.version}";
|
||||
};
|
||||
|
||||
bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs;
|
||||
libexec = "${bootGhcjs}/libexec/${builtins.replaceStrings ["darwin" "i686"] ["osx" "i386"] stdenv.buildPlatform.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
|
||||
|
||||
# This provides the stuff we need from the emsdk
|
||||
emsdk = linkFarm "emsdk" [
|
||||
{ name = "upstream/bin"; path = buildPackages.clang + "/bin";}
|
||||
{ name = "upstream/emscripten"; path = buildPackages.emscripten + "/bin"; }
|
||||
];
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = bootGhcjs.name;
|
||||
|
|
@ -87,23 +86,29 @@ in stdenv.mkDerivation {
|
|||
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/lib/${bootGhcjs.name}
|
||||
lndir ${libexec} $out/bin
|
||||
lndir ${bootGhcjs}/bin $out/bin
|
||||
chmod -R +w $out/bin
|
||||
rm $out/bin/ghcjs-boot
|
||||
cp ${bootGhcjs}/bin/ghcjs-boot $out/bin
|
||||
rm $out/bin/haddock
|
||||
cp ${bootGhcjs}/bin/haddock $out/bin
|
||||
cp ${bootGhcjs}/bin/private-ghcjs-hsc2hs $out/bin/ghcjs-hsc2hs
|
||||
|
||||
wrapProgram $out/bin/ghcjs-boot --set ghcjs_libexecdir $out/bin
|
||||
|
||||
wrapProgram $out/bin/ghcjs --add-flags "-B$out/lib/${bootGhcjs.name}"
|
||||
wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/lib/${bootGhcjs.name}"
|
||||
wrapProgram $out/bin/haddock --add-flags "-B$out/lib/${bootGhcjs.name}"
|
||||
wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/lib/${bootGhcjs.name}/package.conf.d"
|
||||
wrapProgram $out/bin/ghcjs-hsc2hs --add-flags "-I$out/lib/${bootGhcjs.name}/include --template=$out/lib/${bootGhcjs.name}/include/template-hsc.h"
|
||||
|
||||
env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j1 --with-ghcjs-bin $out/bin
|
||||
env PATH=$out/bin:$PATH $out/bin/ghcjs-boot --with-emsdk=${emsdk} --no-haddock
|
||||
'';
|
||||
|
||||
# We hard code -j1 as a temporary workaround for
|
||||
# https://github.com/ghcjs/ghcjs/issues/654
|
||||
# enableParallelBuilding = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
inherit passthru;
|
||||
|
||||
meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
|
||||
meta.maintainers = [lib.maintainers.elvishjerricco];
|
||||
meta.hydraPlatforms = [];
|
||||
meta.broken = true; # https://hydra.nixos.org/build/129701778
|
||||
# The emscripten is broken on darwin
|
||||
meta.platforms = lib.platforms.linux;
|
||||
meta.maintainers = with lib.maintainers; [ obsidian-systems-maintenance ];
|
||||
}
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
-- Generate the Host.hs and Version.hs as done by hadrian/src/Rules/Generate.hs
|
||||
|
||||
import GHC.Platform.Host
|
||||
import GHC.Version
|
||||
|
||||
main = do
|
||||
writeFile "Version.hs" versionHs
|
||||
writeFile "Host.hs" platformHostHs
|
||||
|
||||
-- | Generate @Version.hs@ files.
|
||||
versionHs :: String
|
||||
versionHs = unlines
|
||||
[ "module GHC.Version where"
|
||||
, ""
|
||||
, "import Prelude -- See Note [Why do we import Prelude here?]"
|
||||
, ""
|
||||
, "cProjectGitCommitId :: String"
|
||||
, "cProjectGitCommitId = " ++ show cProjectGitCommitId
|
||||
, ""
|
||||
, "cProjectVersion :: String"
|
||||
, "cProjectVersion = " ++ show cProjectVersion
|
||||
, ""
|
||||
, "cProjectVersionInt :: String"
|
||||
, "cProjectVersionInt = " ++ show cProjectVersionInt
|
||||
, ""
|
||||
, "cProjectPatchLevel :: String"
|
||||
, "cProjectPatchLevel = " ++ show cProjectPatchLevel
|
||||
, ""
|
||||
, "cProjectPatchLevel1 :: String"
|
||||
, "cProjectPatchLevel1 = " ++ show cProjectPatchLevel1
|
||||
, ""
|
||||
, "cProjectPatchLevel2 :: String"
|
||||
, "cProjectPatchLevel2 = " ++ show cProjectPatchLevel2
|
||||
]
|
||||
|
||||
-- | Generate @Platform/Host.hs@ files.
|
||||
platformHostHs :: String
|
||||
platformHostHs = unlines
|
||||
[ "module GHC.Platform.Host where"
|
||||
, ""
|
||||
, "import GHC.Platform"
|
||||
, ""
|
||||
, "cHostPlatformArch :: Arch"
|
||||
, "cHostPlatformArch = " ++ show cHostPlatformArch
|
||||
, ""
|
||||
, "cHostPlatformOS :: OS"
|
||||
, "cHostPlatformOS = " ++ show cHostPlatformOS
|
||||
, ""
|
||||
, "cHostPlatformMini :: PlatformMini"
|
||||
, "cHostPlatformMini = PlatformMini"
|
||||
, " { platformMini_arch = cHostPlatformArch"
|
||||
, " , platformMini_os = cHostPlatformOS"
|
||||
, " }"
|
||||
]
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"url": "https://github.com/obsidiansystems/ghcjs",
|
||||
"rev": "9fc935f2c3ba6c33ec62eb83afc9f52a893eb68c",
|
||||
"sha256": "sha256:063dmir39c4i1z8ypnmq86g1x2vhqndmdpzc4hyzsy5jjqcbx6i3",
|
||||
"fetchSubmodules": true
|
||||
}
|
||||
|
|
@ -0,0 +1,77 @@
|
|||
{ callPackage, configuredSrc }:
|
||||
|
||||
{
|
||||
|
||||
ghcjs = callPackage
|
||||
({ mkDerivation, aeson, alex, array, attoparsec, base, base16-bytestring
|
||||
, base64-bytestring, binary, bytestring, Cabal, containers
|
||||
, cryptohash, data-default, deepseq, directory, executable-path
|
||||
, filepath, ghc-boot, ghc-boot-th, ghc-compact, ghc-heap, ghc-paths
|
||||
, ghci, happy, hashable, hpc, http-types, HUnit, lens, lib
|
||||
, lifted-base, mtl, network, optparse-applicative, parallel, parsec
|
||||
, process, random, safe, shelly, split, stringsearch, syb, tar
|
||||
, template-haskell, terminfo, test-framework, test-framework-hunit
|
||||
, text, time, transformers, unix, unix-compat, unordered-containers
|
||||
, vector, wai, wai-app-static, wai-extra, wai-websockets, warp
|
||||
, webdriver, websockets, wl-pprint-text, xhtml, yaml
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ghcjs";
|
||||
version = "8.10.7";
|
||||
src = configuredSrc + /.;
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson array attoparsec base base16-bytestring base64-bytestring
|
||||
binary bytestring Cabal containers cryptohash data-default deepseq
|
||||
directory filepath ghc-boot ghc-boot-th ghc-compact ghc-heap
|
||||
ghc-paths ghci hashable hpc lens mtl optparse-applicative parallel
|
||||
parsec process safe split stringsearch syb template-haskell
|
||||
terminfo text time transformers unix unordered-containers vector
|
||||
wl-pprint-text yaml
|
||||
];
|
||||
libraryToolDepends = [ alex happy ];
|
||||
executableHaskellDepends = [
|
||||
aeson array base binary bytestring Cabal containers deepseq
|
||||
directory executable-path filepath ghc-boot lens mtl
|
||||
optparse-applicative parsec process tar terminfo text time
|
||||
transformers unix unix-compat unordered-containers vector xhtml
|
||||
yaml
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson base bytestring data-default deepseq directory filepath
|
||||
http-types HUnit lens lifted-base network optparse-applicative
|
||||
process random shelly 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 = lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
ghcjs-th = callPackage
|
||||
({ mkDerivation, base, binary, bytestring, containers, ghc-prim
|
||||
, ghci, lib, template-haskell
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ghcjs-th";
|
||||
version = "0.1.0.0";
|
||||
src = configuredSrc + /lib/ghcjs-th;
|
||||
libraryHaskellDepends = [
|
||||
base binary bytestring containers ghc-prim ghci template-haskell
|
||||
];
|
||||
homepage = "http://github.com/ghcjs";
|
||||
license = lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
ghcjs-prim = callPackage
|
||||
({ mkDerivation, base, ghc-prim, lib }:
|
||||
mkDerivation {
|
||||
pname = "ghcjs-prim";
|
||||
version = "0.1.1.0";
|
||||
src = ./.;
|
||||
libraryHaskellDepends = [ base ghc-prim ];
|
||||
homepage = "http://github.com/ghcjs";
|
||||
license = lib.licenses.mit;
|
||||
}) {};
|
||||
}
|
||||
|
|
@ -8,11 +8,11 @@
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "ghcjs-base";
|
||||
version = "0.2.0.0";
|
||||
version = "0.2.0.3";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/ghcjs/ghcjs-base";
|
||||
sha256 = "0qr05m0djll3x38dhl85pl798arsndmwfhil8yklhb70lxrbvfrs";
|
||||
rev = "01014ade3f8f5ae677df192d7c2a208bd795b96c";
|
||||
sha256 = "15fdkjv0l7hpbbsn5238xxgzfdg61g666nzbv2sgxkwryn5rycv0";
|
||||
rev = "85e31beab9beffc3ea91b954b61a5d04e708b8f2";
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
aeson attoparsec base binary bytestring containers deepseq dlist
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/Data/Vector/Storable/Mutable.hs b/Data/Vector/Storable/Mutable.hs
|
||||
index 8b538bc..2b74fce 100644
|
||||
--- a/Data/Vector/Storable/Mutable.hs
|
||||
+++ b/Data/Vector/Storable/Mutable.hs
|
||||
@@ -197,7 +197,9 @@ storableSet (MVector n fp) x
|
||||
1 -> storableSetAsPrim n fp x (undefined :: Word8)
|
||||
2 -> storableSetAsPrim n fp x (undefined :: Word16)
|
||||
4 -> storableSetAsPrim n fp x (undefined :: Word32)
|
||||
+#if !defined(ghcjs_HOST_OS)
|
||||
8 -> storableSetAsPrim n fp x (undefined :: Word64)
|
||||
+#endif
|
||||
_ -> unsafeWithForeignPtr fp $ \p -> do
|
||||
poke p x
|
||||
|
||||
|
|
@ -0,0 +1,109 @@
|
|||
# GHCJS package fixes
|
||||
#
|
||||
# Please insert new packages *alphabetically*
|
||||
# in the OTHER PACKAGES section.
|
||||
{ pkgs, haskellLib }:
|
||||
|
||||
let
|
||||
removeLibraryHaskellDepends = pnames: depends:
|
||||
builtins.filter (e: !(builtins.elem (e.pname or "") pnames)) depends;
|
||||
in
|
||||
|
||||
with haskellLib;
|
||||
|
||||
self: super:
|
||||
|
||||
## GENERAL SETUP BASE PACKAGES
|
||||
{
|
||||
inherit (self.ghc.bootPkgs)
|
||||
jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle;
|
||||
|
||||
ghcjs-base = dontCheck (self.callPackage ../compilers/ghcjs/ghcjs-base.nix {
|
||||
fetchgit = pkgs.buildPackages.fetchgit;
|
||||
});
|
||||
|
||||
# GHCJS does not ship with the same core packages as GHC.
|
||||
# https://github.com/ghcjs/ghcjs/issues/676
|
||||
stm = doJailbreak self.stm_2_5_0_0;
|
||||
exceptions = dontCheck self.exceptions_0_10_4;
|
||||
|
||||
## OTHER PACKAGES
|
||||
|
||||
# Runtime exception in tests, missing C API h$realloc
|
||||
base-compat-batteries = dontCheck super.base-compat-batteries;
|
||||
|
||||
# nodejs crashes during test
|
||||
ChasingBottoms = dontCheck super.ChasingBottoms;
|
||||
|
||||
# doctest doesn't work on ghcjs, but sometimes dontCheck doesn't seem to get rid of the dependency
|
||||
doctest = pkgs.lib.warn "ignoring dependency on doctest" null;
|
||||
|
||||
ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
|
||||
libraryHaskellDepends = with self; [
|
||||
ghcjs-base ghcjs-dom-jsffi text transformers
|
||||
];
|
||||
configureFlags = [ "-fjsffi" "-f-webkit" ];
|
||||
});
|
||||
|
||||
ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: {
|
||||
libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base self.text ];
|
||||
broken = false;
|
||||
});
|
||||
|
||||
# https://github.com/Deewiant/glob/issues/39
|
||||
Glob = dontCheck super.Glob;
|
||||
|
||||
# Test fails to compile during the hsc2hs stage
|
||||
hashable = dontCheck super.hashable;
|
||||
|
||||
# uses doctest
|
||||
http-types = dontCheck super.http-types;
|
||||
|
||||
jsaddle = overrideCabal super.jsaddle (drv: {
|
||||
libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base ];
|
||||
});
|
||||
|
||||
# Tests hang, possibly some issue with tasty and race(async) usage in the nonTerminating tests
|
||||
logict = dontCheck super.logict;
|
||||
|
||||
patch = dontCheck super.patch;
|
||||
|
||||
# TODO: tests hang
|
||||
pcre-light = dontCheck super.pcre-light;
|
||||
|
||||
# Terminal test not supported on ghcjs
|
||||
QuickCheck = dontCheck super.QuickCheck;
|
||||
|
||||
reflex = overrideCabal super.reflex (drv: {
|
||||
libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base ];
|
||||
});
|
||||
|
||||
reflex-dom = overrideCabal super.reflex-dom (drv: {
|
||||
libraryHaskellDepends = removeLibraryHaskellDepends ["jsaddle-webkit2gtk"] (drv.libraryHaskellDepends or []);
|
||||
});
|
||||
|
||||
# https://github.com/dreixel/syb/issues/21
|
||||
syb = dontCheck super.syb;
|
||||
|
||||
# nodejs crashes during test
|
||||
scientific = dontCheck super.scientific;
|
||||
|
||||
# Tests use TH which gives error
|
||||
tasty-quickcheck = dontCheck super.tasty-quickcheck;
|
||||
|
||||
temporary = dontCheck super.temporary;
|
||||
|
||||
# 2 tests fail, related to time precision
|
||||
time-compat = dontCheck super.time-compat;
|
||||
|
||||
# TODO: The tests have a TH error, which has been fixed in ghc
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/15481 but somehow the issue is
|
||||
# still present here https://github.com/glguy/th-abstraction/issues/53
|
||||
th-abstraction = dontCheck super.th-abstraction;
|
||||
|
||||
# https://github.com/haskell/vector/issues/410
|
||||
vector = appendPatch super.vector (../compilers/ghcjs/patches/vector-ghcjs-storable-set.patch) ;
|
||||
|
||||
# Need hedgehog for tests, which fails to compile due to dep on concurrent-output
|
||||
zenc = dontCheck super.zenc;
|
||||
}
|
||||
|
|
@ -102,6 +102,7 @@ extra-packages:
|
|||
- haddock-api == 2.23.* # required on GHC < 8.10.x
|
||||
- haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0
|
||||
- happy == 1.19.9 # for purescript
|
||||
- happy == 1.19.12 # for ghcjs
|
||||
- hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
|
||||
- hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet.
|
||||
- immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20
|
||||
|
|
|
|||
|
|
@ -116710,6 +116710,22 @@ self: {
|
|||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"happy_1_19_12" = callPackage
|
||||
({ mkDerivation, array, base, containers, mtl, process }:
|
||||
mkDerivation {
|
||||
pname = "happy";
|
||||
version = "1.19.12";
|
||||
sha256 = "03xlmq6qmdx4zvzw8bp33kd9g7yvcq5cz4wg50xilw812kj276pv";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
enableSeparateDataOutput = true;
|
||||
executableHaskellDepends = [ array base containers mtl ];
|
||||
testHaskellDepends = [ base process ];
|
||||
description = "Happy is a parser generator for Haskell";
|
||||
license = lib.licenses.bsd2;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"happy" = callPackage
|
||||
({ mkDerivation, array, base, containers, mtl, process }:
|
||||
mkDerivation {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ let
|
|||
"ghc865Binary"
|
||||
"ghc8102Binary"
|
||||
"ghc8102BinaryMinimal"
|
||||
"ghcjs"
|
||||
"ghcjs810"
|
||||
"integer-simple"
|
||||
"native-bignum"
|
||||
"ghcHEAD"
|
||||
|
|
@ -107,6 +109,13 @@ in {
|
|||
libffi = pkgs.libffi;
|
||||
};
|
||||
|
||||
ghcjs = compiler.ghcjs810;
|
||||
ghcjs810 = callPackage ../development/compilers/ghcjs/8.10 {
|
||||
bootPkgs = packages.ghc8107;
|
||||
ghcjsSrcJson = ../development/compilers/ghcjs/8.10/git.json;
|
||||
stage0 = ../development/compilers/ghcjs/8.10/stage0.nix;
|
||||
};
|
||||
|
||||
# The integer-simple attribute set contains all the GHC compilers
|
||||
# build with integer-simple instead of integer-gmp.
|
||||
integer-simple = let
|
||||
|
|
@ -178,6 +187,14 @@ in {
|
|||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
|
||||
};
|
||||
|
||||
ghcjs = packages.ghcjs810;
|
||||
ghcjs810 = callPackage ../development/haskell-modules rec {
|
||||
buildHaskellPackages = ghc.bootPkgs;
|
||||
ghc = bh.compiler.ghcjs810;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
|
||||
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
|
||||
};
|
||||
|
||||
# The integer-simple attribute set contains package sets for all the GHC compilers
|
||||
# using integer-simple instead of integer-gmp.
|
||||
integer-simple = let
|
||||
|
|
|
|||
Loading…
Reference in New Issue