about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2017-12-26 15:11:44 +0100
committerPeter Simons <simons@cryp.to>2017-12-26 15:12:36 +0100
commitb03ac7d22b65f4719c8efbdf3400b5c2a927aa79 (patch)
tree15405bb662995cdc6051317165dccf3f31d82363 /pkgs
parent7f91eb94be02bcc403f31d96eebb59a0f07400d8 (diff)
jhc: drop broken Haskell compiler
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/compilers/jhc/default.nix32
-rw-r--r--pkgs/top-level/aliases.nix2
-rw-r--r--pkgs/top-level/haskell-packages.nix5
3 files changed, 1 insertions, 38 deletions
diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix
deleted file mode 100644
index 6b8c6599062e5..0000000000000
--- a/pkgs/development/compilers/jhc/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, perl, ghcWithPackages }:
-
-let ghc = ghcWithPackages (hpkgs: with hpkgs; [
-            binary zlib utf8-string readline fgl regex-compat HsSyck random
-          ]);
-in
-
-stdenv.mkDerivation rec {
-  name = "jhc-${version}";
-  version = "0.8.2";
-
-  src = fetchurl {
-    url    = "http://repetae.net/dist/${name}.tar.gz";
-    sha256 = "0lrgg698mx6xlrqcylba9z4g1f053chrzc92ri881dmb1knf83bz";
-  };
-
-  buildInputs = [ perl ghc ];
-
-  preConfigure = ''
-    configureFlagsArray+=("CC=cc")
-    configureFlagsArray+=("--with-hsc2hs=${ghc}/bin/hsc2hs --cc=cc")
-  '';
-
-  meta = {
-    description = "Whole-program, globally optimizing Haskell compiler";
-    homepage = http://repetae.net/computer/jhc/;
-    license = stdenv.lib.licenses.bsd3;
-    platforms = ["x86_64-linux"]; # 32 bit builds are broken
-    maintainers = with stdenv.lib.maintainers; [ aforemny thoughtpolice ];
-    broken = true; # https://hydra.nixos.org/build/61700723
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 37d764205099b..6eb826c073f63 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -79,7 +79,7 @@ mapAliases (rec {
   htmlTidy = html-tidy;  # added 2014-12-06
   iana_etc = iana-etc;  # added 2017-03-08
   idea = jetbrains; # added 2017-04-03
-  inherit (haskell.compiler) jhc uhc;   # 2015-05-15
+  inherit (haskell.compiler) uhc;   # 2015-05-15
   inotifyTools = inotify-tools;
   joseki = apache-jena-fuseki; # added 2016-02-28
   jquery_ui = jquery-ui;  # added 2014-09-07
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0d620ce2b2955..e980db5cc7058 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -13,7 +13,6 @@ let
     "ghcjs"
     "ghcjsHEAD"
     "ghcCross"
-    "jhc"
     "uhc"
     "integer-simple"
   ];
@@ -91,10 +90,6 @@ in rec {
       inherit (bootPkgs) hscolour alex happy;
     };
 
-    jhc = callPackage ../development/compilers/jhc {
-      inherit (packages.ghc763) ghcWithPackages;
-    };
-
     uhc = callPackage ../development/compilers/uhc/default.nix ({
       stdenv = pkgs.clangStdenv;
       inherit (pkgs.haskellPackages) ghcWithPackages;