From 60e937173846f1b28e27aaa3abbf200452325e74 Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Fri, 7 Apr 2017 20:02:32 +0200 Subject: [PATCH] haskell: ghcjs packages: Remove ghcjs-prim It is wired into ghcjs now. --- pkgs/development/compilers/ghcjs/base.nix | 3 +-- pkgs/development/compilers/ghcjs/head.nix | 2 -- .../haskell-modules/configuration-ghc-7.10.x.nix | 12 ------------ .../haskell-modules/configuration-ghc-8.0.x.nix | 13 ------------- 4 files changed, 1 insertion(+), 29 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index ac9419d662ec..ab68a8fe3b50 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 e045dc67a507..591660f5c347 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 { diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index ee62cf64fec6..7f561133b64e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -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"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 78c3823a0f95..8eb87279c79e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -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";