summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorRyan Burns <rtburns@protonmail.com>2021-01-26 17:11:27 -0800
committerCole Helbling <cole.e.helbling@outlook.com>2021-01-26 19:58:53 -0800
commit89850d10e08e49de9c72871fadf1457b4fe9e423 (patch)
tree0f1d256b956deb69270cb160929684ca8d5771c3 /pkgs
parent6d489a3eb4556735fab0fa4ce84be86e2594ef83 (diff)
ghcjs: fix eval
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=.`
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix14
-rw-r--r--pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix1
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
index 88630f996a94..e8c4a027520d 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
+++ b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
@@ -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";
diff --git a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix b/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
index 54a60b50372e..4fff32759d38 100644
--- a/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
+++ b/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
@@ -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";