cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

ghcjs: fix eval

Browse source 
This was causing release-cross to fail hydra eval, so it hasn't been
building for the last few days. So note that although ghcjs still
does not build, this fixes eval so the jobset can proceed.

Verified with `hydra-eval-jobs pkgs/top-level/release-cross.nix -I nixpkgs=.`
This commit is contained in:
Ryan Burns 2021-01-26 17:11:27 -08:00 committed by Cole Helbling
parent 6d489a3eb4
commit 89850d10e0
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
View file

@ -10,7 +10,7 @@
, 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
, 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
@ -61,7 +61,7 @@
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, stdenv, template-haskell-ghcjs
, ghci-ghcjs, happy, hpc, process, lib, template-haskell-ghcjs
, terminfo, time, transformers, unix
}:
mkDerivation {
@ -81,7 +81,7 @@
ghci-ghcjs = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap, stdenv
, deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap, lib
, template-haskell-ghcjs, transformers, unix
}:
mkDerivation {
@ -98,7 +98,7 @@
ghcjs-th = callPackage
({ mkDerivation, base, binary, bytestring, containers, ghc-prim
, ghci-ghcjs, stdenv, template-haskell-ghcjs
, ghci-ghcjs, lib, template-haskell-ghcjs
}:
mkDerivation {
pname = "ghcjs-th";
@ -115,7 +115,7 @@
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
, haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, lib
, transformers, xhtml
}:
mkDerivation {
@ -142,7 +142,7 @@
haddock-library-ghcjs = callPackage
({ mkDerivation, base, base-compat, bytestring, containers, deepseq
, directory, filepath, haddock-library, hspec, hspec-discover
, optparse-applicative, parsec, QuickCheck, stdenv, text
, optparse-applicative, parsec, QuickCheck, lib, text
, transformers, tree-diff
}:
mkDerivation {
@ -164,7 +164,7 @@
}) {};
template-haskell-ghcjs = callPackage
({ mkDerivation, base, ghc-boot-th, pretty, stdenv }:
({ mkDerivation, base, ghc-boot-th, pretty, lib }:
mkDerivation {
pname = "template-haskell-ghcjs";
version = "2.14.0.0";

1
pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
View file

@ -4,6 +4,7 @@
, quickcheck-unicode, random, scientific, test-framework
, test-framework-hunit, test-framework-quickcheck2, text, time
, transformers, unordered-containers, vector
, lib
}:
mkDerivation {
pname = "ghcjs-base";