From cf9a57daf389642966e7a83e125ef3a255ff24e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 30 Oct 2013 07:53:38 +0100 Subject: [PATCH] gcj: use 4.8 and drop all others See/complain on discussion #699. --- pkgs/top-level/all-packages.nix | 58 +-------------------------------- 1 file changed, 1 insertion(+), 57 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba552ea6b3c..cde66122156 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2562,63 +2562,7 @@ let profiledCompiler = false; }); - gcj = gcj47; - - 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; - langFortran = false; - langCC = true; - langC = false; - profiledCompiler = false; - inherit zip unzip zlib boehmgc gettext pkgconfig perl; - inherit gtk; - inherit (gnome) libart_lgpl; - inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender - libXrandr xproto renderproto xextproto inputproto randrproto; - }); - - gcj46 = wrapGCC (gcc46.gcc.override { - name = "gcj"; - langJava = true; - langFortran = false; - langCC = true; - langC = false; - profiledCompiler = false; - inherit zip unzip zlib boehmgc gettext pkgconfig perl; - inherit gtk; - inherit (gnome) libart_lgpl; - inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender - libXrandr xproto renderproto xextproto inputproto randrproto; - }); - - gcj47 = wrapGCC (gcc47.gcc.override { - name = "gcj"; - langJava = true; - langFortran = false; - langCC = true; - langC = false; - profiledCompiler = false; - inherit zip unzip zlib boehmgc gettext pkgconfig perl; - inherit gtk; - inherit (gnome) libart_lgpl; - inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender - libXrandr xproto renderproto xextproto inputproto randrproto; - }); + gcj = gcj48; gcj48 = wrapGCC (gcc48.gcc.override { name = "gcj";