Merge pull request #29696 from cocreature/ghcjsHEAD

ghcjsHEAD: Bump ghcjs and ghcjs-boot revisions
This commit is contained in:
Charles Strahan 2017-09-30 13:29:25 -04:00 committed by GitHub
commit 9b8c2788c4
3 changed files with 355 additions and 231 deletions

View File

@ -46,24 +46,6 @@ index db8b12e..7b815c5 100644
mapM_ patchPackage =<< allPackages mapM_ patchPackage =<< allPackages
preparePrimops preparePrimops
buildGenPrim buildGenPrim
@@ -1141,7 +1132,7 @@ cabalStage1 pkgs = sub $ do
globalFlags <- cabalGlobalFlags
flags <- cabalInstallFlags (length pkgs == 1)
let args = globalFlags ++ ("install" : pkgs) ++
- [ "--solver=topdown" -- the modular solver refuses to install stage1 packages
+ [ "--allow-boot-library-installs"
] ++ map ("--configure-option="<>) configureOpts ++ flags
checkInstallPlan pkgs args
cabal_ args
@@ -1162,7 +1153,7 @@ cabalInstall pkgs = do
-- uses somewhat fragile parsing of --dry-run output, find a better way
checkInstallPlan :: [Package] -> [Text] -> B ()
checkInstallPlan pkgs opts = do
- plan <- cabal (opts ++ ["-v2", "--dry-run"])
+ plan <- cabal (opts ++ ["-vverbose+nowrap", "--dry-run"])
when (hasReinstalls plan || hasUnexpectedInstalls plan || hasNewVersion plan) (err plan)
where
hasReinstalls = T.isInfixOf "(reinstall)" -- reject reinstalls
@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do @@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do
, "--avoid-reinstalls" , "--avoid-reinstalls"
, "--builddir", "dist" , "--builddir", "dist"

View File

@ -6,19 +6,15 @@ bootPkgs.callPackage ./base.nix {
inherit bootPkgs; inherit bootPkgs;
ghcjsSrc = fetchFromGitHub { ghcjsSrc = fetchFromGitHub {
# TODO: switch back to the regular ghcjs repo owner = "ghcjs";
# when https://github.com/ghcjs/ghcjs/pull/573 is merged.
owner = "k0001";
repo = "ghcjs"; repo = "ghcjs";
rev = "600015e085a28da601b65a41c513d4a458fcd184"; rev = "2b3759942fb5b2fc1a58d314d9b098d4622fa6b6";
sha256 = "01kirrg0fnfwhllvwgfqjiwzwj4yv4lyig87x61n9jp6y5shzjdx"; sha256 = "15asapg0va8dvcdycsx8dgk4xcpdnhml4h31wka6vvxf5anzz8aw";
}; };
ghcjsBootSrc = fetchgit { ghcjsBootSrc = fetchgit {
# TODO: switch back to git://github.com/ghcjs/ghcjs-boot.git url = git://github.com/ghcjs/ghcjs-boot.git;
# when https://github.com/ghcjs/ghcjs-boot/pull/41 is merged. rev = "106e144cca6529a1b9612c11aea5d6ef65b96745";
url = git://github.com/basvandijk/ghcjs-boot.git; sha256 = "0gxg8iiwvm93x1dwhxypczn9qiz4m1xvj8i7cf4snfdy2jdyhi5l";
rev = "19a3b157ecb807c2224daffda5baecc92b76af35";
sha256 = "16sgr8vfr1nx5ljnk8gckgjk70zpa67ix4dbr9aizkwyz41ilfrb";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -2,117 +2,145 @@
{ {
async = callPackage async = callPackage
({ mkDerivation, base, HUnit, stm, test-framework ({ mkDerivation, base, HUnit, stdenv, stm, test-framework
, test-framework-hunit, stdenv , test-framework-hunit
}: }:
mkDerivation { mkDerivation {
pname = "async"; pname = "async";
version = "2.1.1"; version = "2.1.1";
src = "${ghcjsBoot}/boot/async"; src = "${ghcjsBoot}/boot/async";
doCheck = false; doCheck = false;
libraryHaskellDepends = [ base stm ]; libraryHaskellDepends = [ base stm ];
testHaskellDepends = [ testHaskellDepends = [
base HUnit test-framework test-framework-hunit base HUnit test-framework test-framework-hunit
]; ];
jailbreak = true; jailbreak = true;
homepage = https://github.com/simonmar/async; homepage = "https://github.com/simonmar/async";
description = "Run IO operations asynchronously and wait for their results"; description = "Run IO operations asynchronously and wait for their results";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
aeson = callPackage aeson = callPackage
({ mkDerivation, attoparsec, base, base-compat, base-orphans ({ mkDerivation, attoparsec, base, base-compat, base-orphans
, base16-bytestring, bytestring, containers, deepseq, directory , base16-bytestring, bytestring, containers, deepseq, directory
, dlist, fetchgit, filepath, generic-deriving, ghc-prim, hashable , dlist, filepath, generic-deriving, ghc-prim, hashable
, hashable-time, HUnit, integer-logarithms, QuickCheck , hashable-time, HUnit, integer-logarithms, QuickCheck
, quickcheck-instances, scientific, stdenv, tagged , quickcheck-instances, scientific, stdenv, tagged
, template-haskell, test-framework, test-framework-hunit , template-haskell, test-framework, test-framework-hunit
, test-framework-quickcheck2, text, time, time-locale-compat , test-framework-quickcheck2, text, th-abstraction, time
, unordered-containers, uuid-types, vector , time-locale-compat, unordered-containers, uuid-types, vector
}: }:
mkDerivation { mkDerivation {
pname = "aeson"; pname = "aeson";
version = "1.1.1.0"; version = "1.2.2.0";
src = "${ghcjsBoot}/boot/aeson"; src = "${ghcjsBoot}/boot/aeson";
libraryHaskellDepends = [ doCheck = false;
attoparsec base base-compat bytestring containers deepseq dlist libraryHaskellDepends = [
ghc-prim hashable scientific tagged template-haskell text time attoparsec base base-compat bytestring containers deepseq dlist
time-locale-compat unordered-containers uuid-types vector ghc-prim hashable scientific tagged template-haskell text
]; th-abstraction time time-locale-compat unordered-containers
testHaskellDepends = [ uuid-types vector
attoparsec base base-compat base-orphans base16-bytestring ];
bytestring containers directory dlist filepath generic-deriving testHaskellDepends = [
ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck attoparsec base base-compat base-orphans base16-bytestring
quickcheck-instances scientific tagged template-haskell bytestring containers directory dlist filepath generic-deriving
test-framework test-framework-hunit test-framework-quickcheck2 text ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
time time-locale-compat unordered-containers uuid-types vector quickcheck-instances scientific tagged template-haskell
]; test-framework test-framework-hunit test-framework-quickcheck2 text
jailbreak = true; time time-locale-compat unordered-containers uuid-types vector
homepage = https://github.com/bos/aeson; ];
description = "Fast JSON parsing and encoding"; jailbreak = true;
license = stdenv.lib.licenses.bsd3; homepage = "https://github.com/bos/aeson";
}) {}; description = "Fast JSON parsing and encoding";
license = stdenv.lib.licenses.bsd3;
}) {};
attoparsec = callPackage attoparsec = callPackage
({ mkDerivation, array, base, bytestring, case-insensitive ({ mkDerivation, array, base, bytestring, case-insensitive
, containers, criterion, deepseq, directory, filepath, ghc-prim , containers, criterion, deepseq, directory, filepath, ghc-prim
, http-types, parsec, QuickCheck, quickcheck-unicode, scientific , http-types, parsec, QuickCheck, quickcheck-unicode, scientific
, tasty, tasty-quickcheck, text, transformers, unordered-containers , stdenv, tasty, tasty-quickcheck, text, transformers
, vector, stdenv , unordered-containers, vector
}: }:
mkDerivation { mkDerivation {
pname = "attoparsec"; pname = "attoparsec";
version = "0.13.1.0"; version = "0.13.1.0";
src = "${ghcjsBoot}/boot/attoparsec"; src = "${ghcjsBoot}/boot/attoparsec";
libraryHaskellDepends = [ doCheck = false;
array base bytestring containers deepseq scientific text libraryHaskellDepends = [
transformers array base bytestring containers deepseq scientific text
]; transformers
testHaskellDepends = [ ];
array base bytestring deepseq QuickCheck quickcheck-unicode testHaskellDepends = [
scientific tasty tasty-quickcheck text transformers vector array base bytestring deepseq QuickCheck quickcheck-unicode
]; scientific tasty tasty-quickcheck text transformers vector
benchmarkHaskellDepends = [ ];
array base bytestring case-insensitive containers criterion deepseq benchmarkHaskellDepends = [
directory filepath ghc-prim http-types parsec scientific text array base bytestring case-insensitive containers criterion deepseq
transformers unordered-containers vector directory filepath ghc-prim http-types parsec scientific text
]; transformers unordered-containers vector
jailbreak = true; ];
homepage = https://github.com/bos/attoparsec; jailbreak = true;
description = "Fast combinator parsing for bytestrings and text"; homepage = "https://github.com/bos/attoparsec";
license = stdenv.lib.licenses.bsd3; description = "Fast combinator parsing for bytestrings and text";
}) {}; license = stdenv.lib.licenses.bsd3;
}) {};
base-compat = callPackage
({ mkDerivation, base, hspec, QuickCheck, stdenv, unix }:
mkDerivation {
pname = "base-compat";
version = "0.9.3";
src = "${ghcjsBoot}/boot/base-compat";
doCheck = false;
libraryHaskellDepends = [ base unix ];
testHaskellDepends = [ base hspec QuickCheck ];
jailbreak = true;
description = "A compatibility layer for base";
license = stdenv.lib.licenses.mit;
}) {};
bytestring-builder = callPackage
({ mkDerivation, base, bytestring, deepseq, stdenv }:
mkDerivation {
pname = "bytestring-builder";
version = "0.10.8.1.0";
src = "${ghcjsBoot}/boot/bytestring-builder";
doCheck = false;
libraryHaskellDepends = [ base bytestring deepseq ];
jailbreak = true;
description = "The new bytestring builder, packaged outside of GHC";
license = stdenv.lib.licenses.bsd3;
}) {};
case-insensitive = callPackage case-insensitive = callPackage
({ mkDerivation, base, bytestring, criterion, deepseq, hashable ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
, HUnit, test-framework, test-framework-hunit, text, stdenv , HUnit, stdenv, test-framework, test-framework-hunit, text
}: }:
mkDerivation { mkDerivation {
pname = "case-insensitive"; pname = "case-insensitive";
version = "1.2.0.8"; version = "1.2.0.8";
src = "${ghcjsBoot}/boot/case-insensitive"; src = "${ghcjsBoot}/boot/case-insensitive";
doCheck = false; doCheck = false;
libraryHaskellDepends = [ base bytestring deepseq hashable text ]; libraryHaskellDepends = [ base bytestring deepseq hashable text ];
testHaskellDepends = [ testHaskellDepends = [
base bytestring HUnit test-framework test-framework-hunit text base bytestring HUnit test-framework test-framework-hunit text
]; ];
benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
jailbreak = true; jailbreak = true;
homepage = https://github.com/basvandijk/case-insensitive; homepage = "https://github.com/basvandijk/case-insensitive";
description = "Case insensitive string comparison"; description = "Case insensitive string comparison";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
dlist = callPackage dlist = callPackage
({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }: ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }:
mkDerivation { mkDerivation {
pname = "dlist"; pname = "dlist";
version = "0.8.0.2"; version = "0.8.0.2";
src = "${ghcjsBoot}/boot/dlist"; src = "${ghcjsBoot}/boot/dlist";
doCheck = false; doCheck = false;
libraryHaskellDepends = [ base deepseq ]; libraryHaskellDepends = [ base deepseq ];
testHaskellDepends = [ base Cabal QuickCheck ]; testHaskellDepends = [ base Cabal QuickCheck ];
jailbreak = true; jailbreak = true;
homepage = https://github.com/spl/dlist; homepage = "https://github.com/spl/dlist";
description = "Difference lists"; description = "Difference lists";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
extensible-exceptions = callPackage extensible-exceptions = callPackage
({ mkDerivation, base, stdenv }: ({ mkDerivation, base, stdenv }:
mkDerivation { mkDerivation {
@ -125,10 +153,21 @@
description = "Extensible exceptions"; description = "Extensible exceptions";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
fail = callPackage
({ mkDerivation, stdenv }:
mkDerivation {
pname = "fail";
version = "4.9.0.0";
src = "${ghcjsBoot}/boot/fail";
jailbreak = true;
homepage = "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail";
description = "Forward-compatible MonadFail class";
license = stdenv.lib.licenses.bsd3;
}) {};
hashable = callPackage hashable = callPackage
({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp ({ mkDerivation, base, bytestring, criterion, ghc-prim, HUnit
, QuickCheck, random, stdenv, test-framework, test-framework-hunit , integer-gmp, QuickCheck, random, siphash, stdenv, test-framework
, test-framework-quickcheck2, text, unix , test-framework-hunit, test-framework-quickcheck2, text, unix
}: }:
mkDerivation { mkDerivation {
pname = "hashable"; pname = "hashable";
@ -142,24 +181,58 @@
base bytestring ghc-prim HUnit QuickCheck random test-framework base bytestring ghc-prim HUnit QuickCheck random test-framework
test-framework-hunit test-framework-quickcheck2 text unix test-framework-hunit test-framework-quickcheck2 text unix
]; ];
benchmarkHaskellDepends = [
base bytestring criterion ghc-prim integer-gmp siphash text
];
jailbreak = true; jailbreak = true;
homepage = http://github.com/tibbe/hashable; homepage = "http://github.com/tibbe/hashable";
description = "A class for types that can be converted to a hash value"; description = "A class for types that can be converted to a hash value";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
integer-logarithms = callPackage
({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
, smallcheck, stdenv, tasty, tasty-hunit, tasty-quickcheck
, tasty-smallcheck
}:
mkDerivation {
pname = "integer-logarithms";
version = "1.0.2";
src = "${ghcjsBoot}/boot/integer-logarithms";
doCheck = false;
libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
testHaskellDepends = [
base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
tasty-smallcheck
];
jailbreak = true;
homepage = "https://github.com/phadej/integer-logarithms";
description = "Integer logarithms";
license = stdenv.lib.licenses.mit;
}) {};
mtl = callPackage mtl = callPackage
({ mkDerivation, base, stdenv, transformers }: ({ mkDerivation, base, stdenv, transformers }:
mkDerivation { mkDerivation {
pname = "mtl"; pname = "mtl";
version = "2.2.2"; version = "2.2.1";
src = "${ghcjsBoot}/boot/mtl"; src = "${ghcjsBoot}/boot/mtl";
doCheck = false; doCheck = false;
libraryHaskellDepends = [ base transformers ]; libraryHaskellDepends = [ base transformers ];
jailbreak = true; jailbreak = true;
homepage = http://github.com/ekmett/mtl; homepage = "http://github.com/ekmett/mtl";
description = "Monad classes, using functional dependencies"; description = "Monad classes, using functional dependencies";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
nats = callPackage
({ mkDerivation, stdenv }:
mkDerivation {
pname = "nats";
version = "1.1.1";
src = "${ghcjsBoot}/boot/nats";
jailbreak = true;
homepage = "http://github.com/ekmett/nats/";
description = "Natural numbers";
license = stdenv.lib.licenses.bsd3;
}) {};
old-time = callPackage old-time = callPackage
({ mkDerivation, base, old-locale, stdenv }: ({ mkDerivation, base, old-locale, stdenv }:
mkDerivation { mkDerivation {
@ -184,30 +257,57 @@
description = "Parallel programming library"; description = "Parallel programming library";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
random = callPackage
({ mkDerivation, base, stdenv, time }:
mkDerivation {
pname = "random";
version = "1.1";
src = "${ghcjsBoot}/boot/random";
doCheck = false;
libraryHaskellDepends = [ base time ];
testHaskellDepends = [ base ];
jailbreak = true;
description = "random number library";
license = stdenv.lib.licenses.bsd3;
}) {};
scientific = callPackage scientific = callPackage
({ mkDerivation, base, binary, bytestring, containers, criterion ({ mkDerivation, base, binary, bytestring, containers, criterion
, deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
, QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit , QuickCheck, smallcheck, stdenv, tasty, tasty-ant-xml, tasty-hunit
, tasty-quickcheck, tasty-smallcheck, text, vector, stdenv , tasty-quickcheck, tasty-smallcheck, text, vector
}: }:
mkDerivation { mkDerivation {
pname = "scientific"; pname = "scientific";
version = "0.3.4.10"; version = "0.3.4.10";
src = "${ghcjsBoot}/boot/scientific"; src = "${ghcjsBoot}/boot/scientific";
libraryHaskellDepends = [ doCheck = false;
base binary bytestring containers deepseq ghc-prim hashable libraryHaskellDepends = [
integer-gmp integer-logarithms text vector base binary bytestring containers deepseq ghc-prim hashable
]; integer-gmp integer-logarithms text vector
testHaskellDepends = [ ];
base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml testHaskellDepends = [
tasty-hunit tasty-quickcheck tasty-smallcheck text base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
]; tasty-hunit tasty-quickcheck tasty-smallcheck text
benchmarkHaskellDepends = [ base criterion ]; ];
jailbreak = true; benchmarkHaskellDepends = [ base criterion ];
homepage = https://github.com/basvandijk/scientific; jailbreak = true;
description = "Numbers represented using scientific notation"; homepage = "https://github.com/basvandijk/scientific";
license = stdenv.lib.licenses.bsd3; description = "Numbers represented using scientific notation";
}) {}; license = stdenv.lib.licenses.bsd3;
}) {};
semigroups = callPackage
({ mkDerivation, base, stdenv }:
mkDerivation {
pname = "semigroups";
version = "0.18.3";
src = "${ghcjsBoot}/boot/semigroups";
doCheck = false;
libraryHaskellDepends = [ base ];
jailbreak = true;
homepage = "http://github.com/ekmett/semigroups/";
description = "Anything that associates";
license = stdenv.lib.licenses.bsd3;
}) {};
stm = callPackage stm = callPackage
({ mkDerivation, array, base, stdenv }: ({ mkDerivation, array, base, stdenv }:
mkDerivation { mkDerivation {
@ -230,27 +330,27 @@
libraryHaskellDepends = [ base ]; libraryHaskellDepends = [ base ];
testHaskellDepends = [ base containers HUnit mtl ]; testHaskellDepends = [ base containers HUnit mtl ];
jailbreak = true; jailbreak = true;
homepage = http://www.cs.uu.nl/wiki/GenericProgramming/SYB; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
description = "Scrap Your Boilerplate"; description = "Scrap Your Boilerplate";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
tagged = callPackage tagged = callPackage
({ mkDerivation, base, deepseq, template-haskell, transformers ({ mkDerivation, base, deepseq, stdenv, template-haskell
, transformers-compat, stdenv , transformers, transformers-compat
}: }:
mkDerivation { mkDerivation {
pname = "tagged"; pname = "tagged";
version = "0.8.5"; version = "0.8.5";
src = "${ghcjsBoot}/boot/tagged"; src = "${ghcjsBoot}/boot/tagged";
doCheck = false; doCheck = false;
libraryHaskellDepends = [ libraryHaskellDepends = [
base deepseq template-haskell transformers transformers-compat base deepseq template-haskell transformers transformers-compat
]; ];
jailbreak = true; jailbreak = true;
homepage = http://github.com/ekmett/tagged; homepage = "http://github.com/ekmett/tagged";
description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
text = callPackage text = callPackage
({ mkDerivation, array, base, binary, bytestring, deepseq, directory ({ mkDerivation, array, base, binary, bytestring, deepseq, directory
, ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode
@ -271,57 +371,104 @@
test-framework-hunit test-framework-quickcheck2 test-framework-hunit test-framework-quickcheck2
]; ];
jailbreak = true; jailbreak = true;
homepage = https://github.com/bos/text; homepage = "https://github.com/bos/text";
description = "An efficient packed Unicode text type"; description = "An efficient packed Unicode text type";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
th-abstraction = callPackage
({ mkDerivation, base, containers, ghc-prim, stdenv
, template-haskell
}:
mkDerivation {
pname = "th-abstraction";
version = "0.2.6.0";
src = "${ghcjsBoot}/boot/th-abstraction";
doCheck = false;
libraryHaskellDepends = [
base containers ghc-prim template-haskell
];
testHaskellDepends = [ base containers template-haskell ];
jailbreak = true;
homepage = "https://github.com/glguy/th-abstraction";
description = "Nicer interface for reified information about data types";
license = stdenv.lib.licenses.isc;
}) {};
time-locale-compat = callPackage
({ mkDerivation, base, old-locale, stdenv, time }:
mkDerivation {
pname = "time-locale-compat";
version = "0.1.1.3";
src = "${ghcjsBoot}/boot/time-locale-compat";
doCheck = false;
libraryHaskellDepends = [ base old-locale time ];
jailbreak = true;
homepage = "https://github.com/khibino/haskell-time-locale-compat";
description = "Compatibility of TimeLocale between old-locale and time-1.5";
license = stdenv.lib.licenses.bsd3;
}) {};
transformers-compat = callPackage
({ mkDerivation, base, ghc-prim, stdenv, transformers }:
mkDerivation {
pname = "transformers-compat";
version = "0.5.1.4";
src = "${ghcjsBoot}/boot/transformers-compat";
doCheck = false;
libraryHaskellDepends = [ base ghc-prim transformers ];
jailbreak = true;
homepage = "http://github.com/ekmett/transformers-compat/";
description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
license = stdenv.lib.licenses.bsd3;
}) {};
unordered-containers = callPackage unordered-containers = callPackage
({ mkDerivation, base, bytestring, ChasingBottoms, containers ({ mkDerivation, base, bytestring, ChasingBottoms, containers
, criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
, mtl, QuickCheck, random, test-framework, test-framework-hunit , mtl, QuickCheck, random, stdenv, test-framework
, test-framework-quickcheck2, stdenv , test-framework-hunit, test-framework-quickcheck2
}: }:
mkDerivation { mkDerivation {
pname = "unordered-containers"; pname = "unordered-containers";
version = "0.2.7.2"; version = "0.2.7.2";
src = "${ghcjsBoot}/boot/unordered-containers"; src = "${ghcjsBoot}/boot/unordered-containers";
libraryHaskellDepends = [ base deepseq hashable ]; doCheck = false;
testHaskellDepends = [ libraryHaskellDepends = [ base deepseq hashable ];
base ChasingBottoms containers hashable HUnit QuickCheck testHaskellDepends = [
test-framework test-framework-hunit test-framework-quickcheck2 base ChasingBottoms containers hashable HUnit QuickCheck
]; test-framework test-framework-hunit test-framework-quickcheck2
benchmarkHaskellDepends = [ ];
base bytestring containers criterion deepseq deepseq-generics benchmarkHaskellDepends = [
hashable hashmap mtl random base bytestring containers criterion deepseq deepseq-generics
]; hashable hashmap mtl random
jailbreak = true; ];
homepage = https://github.com/tibbe/unordered-containers; jailbreak = true;
description = "Efficient hashing-based container types"; homepage = "https://github.com/tibbe/unordered-containers";
license = stdenv.lib.licenses.bsd3; description = "Efficient hashing-based container types";
}) {}; license = stdenv.lib.licenses.bsd3;
}) {};
uuid-types = callPackage uuid-types = callPackage
({ mkDerivation, base, binary, bytestring, containers, criterion ({ mkDerivation, base, binary, bytestring, containers, criterion
, deepseq, hashable, HUnit, QuickCheck, random, stdenv, tasty , deepseq, hashable, HUnit, QuickCheck, random, stdenv, tasty
, tasty-hunit, tasty-quickcheck, text , tasty-hunit, tasty-quickcheck, text, unordered-containers
}: }:
mkDerivation { mkDerivation {
pname = "uuid-types"; pname = "uuid-types";
version = "1.0.3"; version = "1.0.3";
src = "${ghcjsBoot}/boot/uuid/uuid-types"; src = "${ghcjsBoot}/boot/uuid/uuid-types";
libraryHaskellDepends = [ doCheck = false;
base binary bytestring deepseq hashable random text libraryHaskellDepends = [
]; base binary bytestring deepseq hashable random text
testHaskellDepends = [ ];
base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck testHaskellDepends = [
]; base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
benchmarkHaskellDepends = [ ];
base bytestring containers criterion deepseq random benchmarkHaskellDepends = [
]; base bytestring containers criterion deepseq random
jailbreak = true; unordered-containers
homepage = https://github.com/aslatter/uuid; ];
description = "Type definitions for Universally Unique Identifiers"; jailbreak = true;
license = stdenv.lib.licenses.bsd3; homepage = "https://github.com/hvr/uuid";
}) {}; description = "Type definitions for Universally Unique Identifiers";
license = stdenv.lib.licenses.bsd3;
}) {};
vector = callPackage vector = callPackage
({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
, random, stdenv, template-haskell, test-framework , random, stdenv, template-haskell, test-framework
@ -338,7 +485,7 @@
test-framework-quickcheck2 transformers test-framework-quickcheck2 transformers
]; ];
jailbreak = true; jailbreak = true;
homepage = https://github.com/haskell/vector; homepage = "https://github.com/haskell/vector";
description = "Efficient Arrays"; description = "Efficient Arrays";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
@ -366,16 +513,15 @@
test-framework-hunit test-framework-quickcheck2 text test-framework-hunit test-framework-quickcheck2 text
]; ];
jailbreak = true; jailbreak = true;
homepage = http://github.com/ghcjs/ghcjs-base; homepage = "http://github.com/ghcjs/ghcjs-base";
description = "Base library for GHCJS"; description = "base library for GHCJS";
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
}) {}; }) {};
Cabal = callPackage Cabal = callPackage
({ mkDerivation, array, base, binary, bytestring, containers ({ mkDerivation, array, base, binary, bytestring, containers
, deepseq, directory, extensible-exceptions, filepath, HUnit , deepseq, directory, exceptions, filepath, old-time, pretty
, old-time, pretty, process, QuickCheck, regex-posix, stdenv , process, QuickCheck, regex-posix, stdenv, tagged, tasty
, test-framework, test-framework-hunit, test-framework-quickcheck2 , tasty-hunit, tasty-quickcheck, time, transformers, unix
, time, unix
}: }:
mkDerivation { mkDerivation {
pname = "Cabal"; pname = "Cabal";
@ -387,12 +533,12 @@
pretty process time unix pretty process time unix
]; ];
testHaskellDepends = [ testHaskellDepends = [
base bytestring containers directory extensible-exceptions filepath base bytestring containers directory exceptions filepath old-time
HUnit old-time process QuickCheck regex-posix test-framework pretty process QuickCheck regex-posix tagged tasty tasty-hunit
test-framework-hunit test-framework-quickcheck2 unix tasty-quickcheck transformers unix
]; ];
jailbreak = true; jailbreak = true;
homepage = http://www.haskell.org/cabal/; homepage = "http://www.haskell.org/cabal/";
description = "A framework for packaging Haskell software"; description = "A framework for packaging Haskell software";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};