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

Merge branch 'master' into staging-next

Browse Source 
Larger rebuild, probably mainly haskell.
Hydra nixpkgs: ?compare=1503325
This commit is contained in:
Vladimír Čunát
2019-02-02 17:05:15 +01:00
parent 14d21f60a8 5c986a45ce
commit bd9f835bf6
58 changed files with 1739 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/ghcjs-ng/8.2/git.json
View File

@@ -1,6 +0,0 @@
{
"url": "https://github.com/ghcjs/ghcjs",
"rev": "0cff73c3ee13b464adba90f308b77751c75b9f26",
"sha256": "1shg34zi6ryaihar62qdkkalv8dsrsqbv58jzkhk9in38sdfkjxv",
"fetchSubmodules": true
}

4
pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix
View File

@@ -2,6 +2,8 @@
let inherit (haskellLib) dontCheck doJailbreak;
in self: super: {
haddock-library-ghcjs = dontCheck super.haddock-library-ghcjs;
haddock-library-ghcjs = doJailbreak (dontCheck super.haddock-library-ghcjs);
haddock-api-ghcjs = doJailbreak super.haddock-api-ghcjs;
template-haskell-ghcjs = doJailbreak super.template-haskell-ghcjs;
}

7
pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix Normal file
View File

@@ -0,0 +1,7 @@
{ haskellLib }:
let inherit (haskellLib) dontCheck doJailbreak dontHaddock;
in self: super: {
haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs;
haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs);
}

6
pkgs/development/compilers/ghcjs-ng/8.6/git.json Normal file
View File

@@ -0,0 +1,6 @@
{
"url": "https://github.com/ghcjs/ghcjs",
"rev": "75c61af32d73def4409d1fe7b64659c1d28cd075",
"sha256": "18pixn6xdz6qp941yhxfnmwi463jnpskmg473lv07vvgy4hpgjhj",
"fetchSubmodules": true
}

44
pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix → pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
View File

@@ -20,7 +20,7 @@
}:
mkDerivation {
pname = "ghcjs";
version = "8.2.0.1";
version = "8.6.0.1";
src = configuredSrc + /.;
isLibrary = true;
isExecutable = true;
@@ -60,17 +60,17 @@
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
, deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap
, ghci-ghcjs, hpc, process, stdenv, template-haskell-ghcjs
, terminfo, time, transformers, unix
}:
mkDerivation {
pname = "ghc-api-ghcjs";
version = "8.2.2";
version = "8.6.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
ghc-boot ghc-boot-th ghc-heap ghci-ghcjs hpc process
template-haskell-ghcjs terminfo time transformers unix
];
homepage = "http://www.haskell.org/ghc/";
@@ -80,16 +80,16 @@
ghci-ghcjs = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, deepseq, filepath, ghc-boot, ghc-boot-th, stdenv
, deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap, stdenv
, template-haskell-ghcjs, transformers, unix
}:
mkDerivation {
pname = "ghci-ghcjs";
version = "8.2.2";
version = "8.6.1";
src = configuredSrc + /lib/ghci-ghcjs;
libraryHaskellDepends = [
array base binary bytestring containers deepseq filepath ghc-boot
ghc-boot-th template-haskell-ghcjs transformers unix
ghc-boot-th ghc-heap template-haskell-ghcjs transformers unix
];
description = "The library supporting GHC's interactive interpreter (customized for GHCJS)";
license = stdenv.lib.licenses.bsd3;
@@ -119,7 +119,7 @@
}:
mkDerivation {
pname = "haddock-api-ghcjs";
version = "2.18.1";
version = "2.20.0";
src = configuredSrc + /lib/haddock-api-ghcjs;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
@@ -128,25 +128,33 @@
xhtml
];
testHaskellDepends = [
base containers ghc-api-ghcjs hspec QuickCheck
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 (customized for GHCJS)";
description = "A documentation-generation tool for Haskell libraries";
license = stdenv.lib.licenses.bsd3;
}) {};
haddock-library-ghcjs = callPackage
({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
, hspec-discover, QuickCheck, stdenv, transformers
({ mkDerivation, base, base-compat, bytestring, containers, deepseq
, directory, filepath, haddock-library, hspec, hspec-discover
, optparse-applicative, parsec, QuickCheck, stdenv, text
, transformers, tree-diff
}:
mkDerivation {
pname = "haddock-library-ghcjs";
version = "1.4.4";
version = "1.6.0";
src = configuredSrc + /lib/haddock-library-ghcjs;
libraryHaskellDepends = [ base bytestring deepseq transformers ];
libraryHaskellDepends = [
base bytestring containers parsec text transformers
];
testHaskellDepends = [
base base-compat bytestring deepseq hspec QuickCheck transformers
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/";
@@ -158,7 +166,7 @@
({ mkDerivation, base, ghc-boot-th, pretty, stdenv }:
mkDerivation {
pname = "template-haskell-ghcjs";
version = "2.12.0.0";
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)";

2
pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
View File

@@ -43,6 +43,8 @@ runCommand "configured-ghcjs-src" {
# 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

4
pkgs/development/compilers/ghcjs-ng/default.nix
View File

@@ -104,7 +104,5 @@ in stdenv.mkDerivation {
inherit passthru;
meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
meta.hydraPlatforms = [];
meta.broken = true; # does not compile: https://hydra.nixos.org/build/88052615
meta.maintainers = [lib.maintainers.elvishjerricco];
}