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

haskell: ghcjs packages: Remove ghcjs-prim

Browse Source 
It is wired into ghcjs now.
This commit is contained in:
Leon Isenberg 2017-04-07 20:02:32 +02:00
parent a5ee494046
commit 60e9371738
4 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/ghcjs/base.nix
View File

@ -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 = [

2
pkgs/development/compilers/ghcjs/head.nix
View File

@ -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 {

12
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -95,18 +95,6 @@ self: super: {
# https://github.com/kazu-yamamoto/unix-time/issues/30
unix-time = dontCheck super.unix-time;
ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation {
pname = "ghcjs-prim";
version = "0.1.0.0";
src = fetchgit {
url = git://github.com/ghcjs/ghcjs-prim.git;
rev = "dfeaab2aafdfefe46bf12960d069f28d2e5f1454"; # ghc-7.10 branch
sha256 = "19kyb26nv1hdpp0kc2gaxkq5drw5ib4za0641py5i4bbf1g58yvy";
};
buildDepends = [ primitive ];
license = pkgs.stdenv.lib.licenses.bsd3;
}) {};
# diagrams/monoid-extras#19
monoid-extras = overrideCabal super.monoid-extras (drv: {
prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal";

13
pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
View File

@ -41,19 +41,6 @@ self: super: {
# jailbreak-cabal can use the native Cabal library.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation {
pname = "ghcjs-prim";
version = "0.1.0.0";
src = fetchgit {
url = git://github.com/ghcjs/ghcjs-prim.git;
rev = "dfeaab2aafdfefe46bf12960d069f28d2e5f1454"; # ghc-7.10 branch
sha256 = "19kyb26nv1hdpp0kc2gaxkq5drw5ib4za0641py5i4bbf1g58yvy";
};
buildDepends = [ primitive ];
license = pkgs.stdenv.lib.licenses.bsd3;
broken = true; # needs template-haskell >=2.9 && <2.11
}) {};
# https://github.com/bmillwood/applicative-quoters/issues/6
applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";