public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24279 from LumiGuide/ghcjsHEAD-upgrade-to-latest-LTS

Browse Source 
ghcjsHEAD: upgrade ghcjs-boot packages
This commit is contained in:
Peter Simons 2017-03-24 23:13:55 +01:00 committed by GitHub
commit 011466857b
2 changed files with 203 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/compilers/ghcjs/head.nix
View File

@ -1,22 +1,26 @@
{ fetchgit, fetchFromGitHub, bootPkgs }: { fetchgit, fetchFromGitHub, bootPkgs }:
bootPkgs.callPackage ./base.nix { bootPkgs.callPackage ./base.nix {
version = "0.2.020161101"; version = "0.2.020170323";
# deprecated on HEAD, directly included in the distribution # deprecated on HEAD, directly included in the distribution
ghcjs-prim = null; ghcjs-prim = null;
inherit bootPkgs; inherit bootPkgs;
ghcjsSrc = fetchFromGitHub { ghcjsSrc = fetchFromGitHub {
owner = "ghcjs"; # TODO: switch back to the regular ghcjs repo
# when https://github.com/ghcjs/ghcjs/pull/573 is merged.
owner = "basvandijk";
repo = "ghcjs"; repo = "ghcjs";
rev = "2dc14802e78d7d9dfa35395d5dbfc9c708fb83e6"; rev = "e6cdc71964a1c2e4184416a493e9d384c408914c";
sha256 = "0cvmapbrwg0h1pbz648isc2l84z694ylnfm8ncd1g4as28lmj0pz"; sha256 = "00fk9qwyx4vpvr0h9jbqxwlrvl6w63l5sq8r357prsp6xyv5zniz";
}; };
ghcjsBootSrc = fetchgit { ghcjsBootSrc = fetchgit {
url = git://github.com/ghcjs/ghcjs-boot.git; # TODO: switch back to git://github.com/ghcjs/ghcjs-boot.git
rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8"; # when https://github.com/ghcjs/ghcjs-boot/pull/41 is merged.
sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq"; url = git://github.com/basvandijk/ghcjs-boot.git;
rev = "19a3b157ecb807c2224daffda5baecc92b76af35";
sha256 = "16sgr8vfr1nx5ljnk8gckgjk70zpa67ix4dbr9aizkwyz41ilfrb";
fetchSubmodules = true; fetchSubmodules = true;
}; };

138
pkgs/development/compilers/ghcjs/head_stage2.nix
View File

@ -2,12 +2,12 @@
{ {
async = callPackage async = callPackage
({ mkDerivation, base, HUnit, stdenv, stm, test-framework ({ mkDerivation, base, HUnit, stm, test-framework
, test-framework-hunit , test-framework-hunit, stdenv
}: }:
mkDerivation { mkDerivation {
pname = "async"; pname = "async";
version = "2.1.0"; version = "2.1.1";
src = "${ghcjsBoot}/boot/async"; src = "${ghcjsBoot}/boot/async";
doCheck = false; doCheck = false;
libraryHaskellDepends = [ base stm ]; libraryHaskellDepends = [ base stm ];
@ -20,26 +20,31 @@
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
aeson = callPackage aeson = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers, deepseq ({ mkDerivation, attoparsec, base, base-compat, base-orphans
, dlist, fail, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific , base16-bytestring, bytestring, containers, deepseq, directory
, stdenv, syb, tagged, template-haskell, test-framework , dlist, fetchgit, filepath, generic-deriving, ghc-prim, hashable
, test-framework-hunit, test-framework-quickcheck2, text, time , hashable-time, HUnit, integer-logarithms, QuickCheck
, transformers, unordered-containers, vector , quickcheck-instances, scientific, stdenv, tagged
, template-haskell, test-framework, test-framework-hunit
, test-framework-quickcheck2, text, time, time-locale-compat
, unordered-containers, uuid-types, vector
}: }:
mkDerivation { mkDerivation {
pname = "aeson"; pname = "aeson";
version = "0.11.2.0"; version = "1.1.1.0";
src = "${ghcjsBoot}/boot/aeson"; src = "${ghcjsBoot}/boot/aeson";
doCheck = false;
libraryHaskellDepends = [ libraryHaskellDepends = [
attoparsec base bytestring containers deepseq dlist fail ghc-prim attoparsec base base-compat bytestring containers deepseq dlist
hashable mtl scientific syb tagged template-haskell text time transformers ghc-prim hashable scientific tagged template-haskell text time
unordered-containers vector time-locale-compat unordered-containers uuid-types vector
]; ];
testHaskellDepends = [ testHaskellDepends = [
attoparsec base bytestring containers ghc-prim HUnit QuickCheck attoparsec base base-compat base-orphans base16-bytestring
template-haskell test-framework test-framework-hunit bytestring containers directory dlist filepath generic-deriving
test-framework-quickcheck2 text time unordered-containers vector ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
quickcheck-instances scientific tagged template-haskell
test-framework test-framework-hunit test-framework-quickcheck2 text
time time-locale-compat unordered-containers uuid-types vector
]; ];
jailbreak = true; jailbreak = true;
homepage = "https://github.com/bos/aeson"; homepage = "https://github.com/bos/aeson";
@ -47,24 +52,28 @@
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
attoparsec = callPackage attoparsec = callPackage
({ mkDerivation, array, base, bytestring, containers, deepseq ({ mkDerivation, array, base, bytestring, case-insensitive
, QuickCheck, quickcheck-unicode, scientific, stdenv , containers, criterion, deepseq, directory, filepath, ghc-prim
, test-framework, test-framework-quickcheck2, text, transformers , http-types, parsec, QuickCheck, quickcheck-unicode, scientific
, vector , tasty, tasty-quickcheck, text, transformers, unordered-containers
, vector, stdenv
}: }:
mkDerivation { mkDerivation {
pname = "attoparsec"; pname = "attoparsec";
version = "0.13.0.2"; version = "0.13.1.0";
src = "${ghcjsBoot}/boot/attoparsec"; src = "${ghcjsBoot}/boot/attoparsec";
doCheck = false;
libraryHaskellDepends = [ libraryHaskellDepends = [
array base bytestring containers deepseq scientific text array base bytestring containers deepseq scientific text
transformers transformers
]; ];
testHaskellDepends = [ testHaskellDepends = [
array base bytestring containers deepseq QuickCheck array base bytestring deepseq QuickCheck quickcheck-unicode
quickcheck-unicode scientific test-framework scientific tasty tasty-quickcheck text transformers vector
test-framework-quickcheck2 text transformers vector ];
benchmarkHaskellDepends = [
array base bytestring case-insensitive containers criterion deepseq
directory filepath ghc-prim http-types parsec scientific text
transformers unordered-containers vector
]; ];
jailbreak = true; jailbreak = true;
homepage = "https://github.com/bos/attoparsec"; homepage = "https://github.com/bos/attoparsec";
@ -72,18 +81,19 @@
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
case-insensitive = callPackage case-insensitive = callPackage
({ mkDerivation, base, bytestring, deepseq, hashable, HUnit, stdenv ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
, test-framework, test-framework-hunit, text , HUnit, test-framework, test-framework-hunit, text, stdenv
}: }:
mkDerivation { mkDerivation {
pname = "case-insensitive"; pname = "case-insensitive";
version = "1.2.0.6"; 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 ];
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";
@ -93,7 +103,7 @@
({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }: ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }:
mkDerivation { mkDerivation {
pname = "dlist"; pname = "dlist";
version = "0.7.1.2"; version = "0.8.0.2";
src = "${ghcjsBoot}/boot/dlist"; src = "${ghcjsBoot}/boot/dlist";
doCheck = false; doCheck = false;
libraryHaskellDepends = [ base deepseq ]; libraryHaskellDepends = [ base deepseq ];
@ -175,24 +185,24 @@
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
scientific = callPackage scientific = callPackage
({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc-prim ({ mkDerivation, base, binary, bytestring, containers, criterion
, hashable, integer-gmp, QuickCheck, smallcheck, stdenv, tasty , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
, tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
, text, vector , tasty-quickcheck, tasty-smallcheck, text, vector, stdenv
}: }:
mkDerivation { mkDerivation {
pname = "scientific"; pname = "scientific";
version = "0.3.4.7"; version = "0.3.4.10";
src = "${ghcjsBoot}/boot/scientific"; src = "${ghcjsBoot}/boot/scientific";
doCheck = false;
libraryHaskellDepends = [ libraryHaskellDepends = [
base binary bytestring containers deepseq ghc-prim hashable base binary bytestring containers deepseq ghc-prim hashable
integer-gmp text vector integer-gmp integer-logarithms text vector
]; ];
testHaskellDepends = [ testHaskellDepends = [
base bytestring QuickCheck smallcheck tasty tasty-ant-xml base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
tasty-hunit tasty-quickcheck tasty-smallcheck text tasty-hunit tasty-quickcheck tasty-smallcheck text
]; ];
benchmarkHaskellDepends = [ base criterion ];
jailbreak = true; jailbreak = true;
homepage = "https://github.com/basvandijk/scientific"; homepage = "https://github.com/basvandijk/scientific";
description = "Numbers represented using scientific notation"; description = "Numbers represented using scientific notation";
@ -224,6 +234,23 @@
description = "Scrap Your Boilerplate"; description = "Scrap Your Boilerplate";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
tagged = callPackage
({ mkDerivation, base, deepseq, template-haskell, transformers
, transformers-compat, stdenv
}:
mkDerivation {
pname = "tagged";
version = "0.8.5";
src = "${ghcjsBoot}/boot/tagged";
doCheck = false;
libraryHaskellDepends = [
base deepseq template-haskell transformers transformers-compat
];
jailbreak = true;
homepage = "http://github.com/ekmett/tagged";
description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
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
@ -249,25 +276,52 @@
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
unordered-containers = callPackage unordered-containers = callPackage
({ mkDerivation, base, ChasingBottoms, containers, deepseq, hashable ({ mkDerivation, base, bytestring, ChasingBottoms, containers
, HUnit, QuickCheck, stdenv, test-framework, test-framework-hunit , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
, test-framework-quickcheck2 , mtl, QuickCheck, random, test-framework, test-framework-hunit
, test-framework-quickcheck2, stdenv
}: }:
mkDerivation { mkDerivation {
pname = "unordered-containers"; pname = "unordered-containers";
version = "0.2.7.0"; version = "0.2.7.2";
src = "${ghcjsBoot}/boot/unordered-containers"; src = "${ghcjsBoot}/boot/unordered-containers";
doCheck = false;
libraryHaskellDepends = [ base deepseq hashable ]; libraryHaskellDepends = [ base deepseq hashable ];
testHaskellDepends = [ testHaskellDepends = [
base ChasingBottoms containers hashable HUnit QuickCheck base ChasingBottoms containers hashable HUnit QuickCheck
test-framework test-framework-hunit test-framework-quickcheck2 test-framework test-framework-hunit test-framework-quickcheck2
]; ];
benchmarkHaskellDepends = [
base bytestring containers criterion deepseq deepseq-generics
hashable hashmap mtl random
];
jailbreak = true; jailbreak = true;
homepage = "https://github.com/tibbe/unordered-containers"; homepage = "https://github.com/tibbe/unordered-containers";
description = "Efficient hashing-based container types"; description = "Efficient hashing-based container types";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
uuid-types = callPackage
({ mkDerivation, base, binary, bytestring, containers, criterion
, deepseq, hashable, HUnit, QuickCheck, random, stdenv, tasty
, tasty-hunit, tasty-quickcheck, text
}:
mkDerivation {
pname = "uuid-types";
version = "1.0.3";
src = "${ghcjsBoot}/boot/uuid/uuid-types";
libraryHaskellDepends = [
base binary bytestring deepseq hashable random text
];
testHaskellDepends = [
base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
];
benchmarkHaskellDepends = [
base bytestring containers criterion deepseq random
];
jailbreak = true;
homepage = "https://github.com/aslatter/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