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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-01-27 06:19:24 +00:00
committed by GitHub
parent 715dd567c8 9afe3525f3
commit 6d452e839b
9 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
+7 -7
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";
pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix
+1
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";