From 06f4398b4643fd32fb7d1057b382e70def01edef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Nov 2013 21:09:48 +0100
Subject: [PATCH] Remove broken and obsolete versions of gcj and ghdl

---
 pkgs/top-level/all-packages.nix   | 26 --------------------------
 pkgs/top-level/release-python.nix |  1 -
 pkgs/top-level/release-small.nix  |  1 -
 pkgs/top-level/release.nix        |  1 -
 4 files changed, 29 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ddf2ec8e1267..1d870057043d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2565,20 +2565,6 @@ let
 
   gcj = gcj45;
 
-  gcj44 = wrapGCC (gcc44.gcc.override {
-    name = "gcj";
-    langJava = true;
-    langFortran = false;
-    langCC = true;
-    langC = false;
-    profiledCompiler = false;
-    inherit zip unzip zlib boehmgc gettext pkgconfig;
-    inherit gtk;
-    inherit (gnome) libart_lgpl;
-    inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender
-      libXrandr xproto renderproto xextproto inputproto randrproto;
-  });
-
   gcj45 = wrapGCC (gcc45.gcc.override {
     name = "gcj";
     langJava = true;
@@ -2672,18 +2658,6 @@ let
     enableMultilib = false;
   });
 
-  # Not officially supported version for ghdl
-  ghdl_gcc44 = lowPrio (wrapGCC (import ../development/compilers/gcc/4.4 {
-    inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat gettext which
-      ppl cloogppl;
-    name = "ghdl";
-    langVhdl = true;
-    langCC = false;
-    langC = false;
-    profiledCompiler = false;
-    enableMultilib = false;
-  }));
-
   gcl = builderDefsPackage ../development/compilers/gcl {
     inherit mpfr m4 binutils fetchcvs emacs zlib which
       texinfo;
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 2453712584ac..5aafba980b90 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -372,7 +372,6 @@ let
   gajim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gav = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gcj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  gcj44 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gcj46 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gcl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index ef7bc038c62f..921a6e741343 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -53,7 +53,6 @@ with (import ./release-lib.nix);
   gcc34 = linux;
   gcc42 = linux;
   gcc44 = linux;
-  gcj44 = linux;
   ghdl = linux;
   glibc = linux;
   glibcLocales = linux;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 87b63e33891f..7fa545a8f6df 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -116,7 +116,6 @@ let
       gcc34 = linux;
       gcc42 = linux;
       gcc44 = linux;
-      gcj44 = linux;
       ghdl = linux;
       ghostscript = linux;
       ghostscriptX = linux;