diff options
| author | Leon Isenberg <ljli@users.noreply.github.com> | 2017-04-07 20:02:32 +0200 |
|---|---|---|
| committer | Leon Isenberg <ljli@users.noreply.github.com> | 2017-04-07 21:41:01 +0200 |
| commit | 60e937173846f1b28e27aaa3abbf200452325e74 (patch) | |
| tree | 6969abe58f5027d79941fcec9b1feb99d9c61c3b /pkgs/development/compilers/ghcjs | |
| parent | a5ee494046b4259a4a2dfea95776faa898d1bd26 (diff) | |
| download | nixpkgs-60e937173846f1b28e27aaa3abbf200452325e74.tar nixpkgs-60e937173846f1b28e27aaa3abbf200452325e74.tar.gz nixpkgs-60e937173846f1b28e27aaa3abbf200452325e74.tar.bz2 nixpkgs-60e937173846f1b28e27aaa3abbf200452325e74.tar.lz nixpkgs-60e937173846f1b28e27aaa3abbf200452325e74.tar.xz nixpkgs-60e937173846f1b28e27aaa3abbf200452325e74.tar.zst nixpkgs-60e937173846f1b28e27aaa3abbf200452325e74.zip | |
haskell: ghcjs packages: Remove ghcjs-prim
It is wired into ghcjs now.
Diffstat (limited to 'pkgs/development/compilers/ghcjs')
| -rw-r--r-- | pkgs/development/compilers/ghcjs/base.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghcjs/head.nix | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index ac9419d662e..ab68a8fe3b5 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -19,7 +19,6 @@ , executable-path , transformers-compat , haddock-api -, ghcjs-prim , regex-posix , callPackage @@ -122,7 +121,7 @@ in mkDerivation (rec { alex happy git gnumake autoconf automake libtool patch gmp base16-bytestring cryptohash executable-path haddock-api transformers-compat QuickCheck haddock hspec xhtml - ghcjs-prim regex-posix libiconv + regex-posix libiconv ]; buildTools = [ nodejs git ]; testDepends = [ diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index e045dc67a50..591660f5c34 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -3,8 +3,6 @@ bootPkgs.callPackage ./base.nix { version = "0.2.020170323"; - # deprecated on HEAD, directly included in the distribution - ghcjs-prim = null; inherit bootPkgs; ghcjsSrc = fetchFromGitHub { |