mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 14:41:27 +00:00
icedtea: Remove
It has apparently never worked. Also drop xerces and xalan, which were only used by icedtea.
This commit is contained in:
Eelco Dolstra
parent
cd5a9f4980
commit
c180be8cf5
@ -1,114 +0,0 @@
|
||||
/* XXX: This is work in progress and it needs your help! */
|
||||
|
||||
/* See http://icedtea.classpath.org/wiki/BuildRequirements for a
|
||||
list of dependencies. */
|
||||
|
||||
{ fetchurl, stdenv, which
|
||||
, wget, cpio, file, ecj, gcj, ant, gawk, procps, inetutils, zip, unzip, zlib
|
||||
, alsaLib, cups, lesstif, freetype, classpath, libjpeg, libpng, giflib
|
||||
, xalanj, xerces, rhino
|
||||
, libX11, libXp, libXtst, libXinerama, libXt, libXrender, xproto
|
||||
, pkgconfig, xulrunner, pulseaudio }:
|
||||
|
||||
let
|
||||
# These variables must match those in the top-level `Makefile.am'.
|
||||
openjdkVersion = "b16";
|
||||
openjdkDate = "24_apr_2009";
|
||||
openjdkURL =
|
||||
"http://download.java.net/openjdk/jdk6/promoted/${openjdkVersion}/";
|
||||
openjdkSourceZip = "openjdk-6-src-${openjdkVersion}-${openjdkDate}.tar.gz";
|
||||
|
||||
openjdk = fetchurl {
|
||||
url = "${openjdkURL}${openjdkSourceZip}";
|
||||
sha256 = "084lkhsnj29finb6pmvrh83nqbliwv32gdi5q5sv43dpv24r85cn";
|
||||
};
|
||||
|
||||
hotspot = fetchurl {
|
||||
url = "http://hg.openjdk.java.net/hsx/hsx14/master/archive/09f7962b8b44.tar.gz";
|
||||
sha256 = "1jbd9ki5ip96293mv1qil20yqcgvkmcrhs302j0n8i8f3v1j70bf";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "icedtea6-1.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://icedtea.classpath.org/download/source/${name}.tar.gz";
|
||||
sha256 = "11vaanfmz842x576wrw5qldpkksi8wqjmh9wikn5gxyjk87qq3k5";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
wget # Not actually used, thanks to `--with-openjdk-src-zip' et al.
|
||||
which cpio file ecj gcj ant gawk procps inetutils zip unzip zlib
|
||||
alsaLib cups lesstif freetype classpath libjpeg libpng giflib
|
||||
xalanj xerces
|
||||
libX11 libXp libXtst libXinerama libXt libXrender xproto
|
||||
pkgconfig /* xulrunner */ pulseaudio
|
||||
];
|
||||
|
||||
preConfigure =
|
||||
'' # Use the Sun-compatible tools (`jar', etc.).
|
||||
export PATH="${gcj.gcc}/lib/jvm/bin:$PATH"
|
||||
|
||||
# Copy patches.
|
||||
cp -v "${./nixos-slash-bin.patch}" patches/nixos-slash-bin.patch
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
stdenv.lib.concatStringsSep " "
|
||||
[ "--with-gcj-home=${gcj}"
|
||||
"--with-ecj" "--with-ecj-jar=${ecj}/lib/java/ecj.jar"
|
||||
"--with-openjdk-src-zip=${openjdk}"
|
||||
"--with-hotspot-src-zip=${hotspot}"
|
||||
"--with-ant-home=${ant}/lib/java"
|
||||
"--with-xalan2-jar=${xalanj}/lib/java/xalan.jar"
|
||||
"--with-xalan2-serializer-jar=${xalanj}/lib/java/xalan.jar"
|
||||
"--with-xerces2-jar=${xerces}/lib/java/xercesImpl.jar"
|
||||
"--with-rhino=${rhino}/lib/java/js.jar"
|
||||
"--disable-plugin" # FIXME: Enable it someday.
|
||||
|
||||
"--with-parallel-job"
|
||||
];
|
||||
|
||||
makeFlags =
|
||||
[ # Have OpenCDK use tools from $PATH.
|
||||
"ALT_UNIXCCS_PATH=" "ALT_UNIXCOMMAND_PATH=" "ALT_USRBIN_PATH="
|
||||
"ALT_COMPILER_PATH=" "ALT_DEVTOOLS_PATH="
|
||||
|
||||
# Libraries.
|
||||
"ALT_MOTIF_DIR="
|
||||
"ALT_FREETYPE_HEADERS_PATH=${freetype}/include"
|
||||
"ALT_FREETYPE_LIB_PATH=${freetype}/lib"
|
||||
"ALT_CUPS_HEADERS_PATH=${cups}/include"
|
||||
"ALT_CUPS_LIB_PATH=${cups}/lib"
|
||||
|
||||
# Tell IcedTea about our patches.
|
||||
"DISTRIBUTION_PATCHES=patches/nixos-slash-bin.patch"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "IcedTea, a libre Java development kit based on OpenJDK";
|
||||
|
||||
longDescription =
|
||||
'' The IcedTea project provides a harness to build the source code from
|
||||
http://openjdk.java.net using Free Software build tools and adds a
|
||||
number of key features to the upstream OpenJDK codebase: a Free
|
||||
64-bit plugin with LiveConnect and Java Web Start support, support
|
||||
for additional platforms via a pure interpreted mode in HotSpot
|
||||
(Zero) or the alternative CACAO virtual machine. Experimental JIT
|
||||
support for Zero is also available via Shark.
|
||||
'';
|
||||
|
||||
license = "GPLv2"; /* and multiple-licensing, e.g., for the plug-ins */
|
||||
|
||||
homepage = http://icedtea.classpath.org/;
|
||||
|
||||
maintainers = [ ];
|
||||
|
||||
# Restrict to GNU systems for now.
|
||||
platforms = stdenv.lib.platforms.gnu;
|
||||
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
Remove references to /bin/echo to allow NixOS builds.
|
||||
|
||||
--- openjdk/jdk/make/common/shared/Defs-utils.gmk 2009-04-24 09:33:55.000000000 +0200
|
||||
+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2010-01-19 15:39:29.000000000 +0100
|
||||
@@ -177,7 +177,7 @@ ifeq ($(PLATFORM),linux)
|
||||
|
||||
NAWK = $(USRBIN_PATH)gawk
|
||||
# Intrinsic unix command, with backslash-escaped character interpretation
|
||||
- ECHO = /bin/echo -e
|
||||
+ ECHO = echo -e
|
||||
# These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
|
||||
AR = $(UTILS_USR_BIN_PATH)ar
|
||||
AS = $(UTILS_USR_BIN_PATH)as
|
||||
@@ -195,6 +195,6 @@ ifeq ($(PLATFORM),solaris)
|
||||
# Intrinsic unix command, with backslash-escaped character interpretation
|
||||
# (not using -e will cause build failure when using /bin/bash)
|
||||
# (using -e breaks something else)
|
||||
- ECHO = /usr/bin/echo
|
||||
+ ECHO = echo
|
||||
endif
|
||||
@ -1,57 +0,0 @@
|
||||
{ fetchurl, stdenv, ant, javac, jvm, xerces }:
|
||||
|
||||
let
|
||||
version = "2.7.1";
|
||||
options = "-Dbuild.compiler=gcj"; # FIXME: We assume GCJ here.
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "xalan-j-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/xml/xalan-j/source/xalan-j_2_7_1-src.tar.gz";
|
||||
sha256 = "0hxhx0n0ynflq1d01sma658ipwn3f3902x6n8mfk70mqkdiallps";
|
||||
};
|
||||
|
||||
buildInputs = [ ant javac jvm xerces ];
|
||||
|
||||
configurePhase =
|
||||
'' rm -v lib/xerces*.jar
|
||||
export CLASSPATH="${xerces}/lib/java"
|
||||
'';
|
||||
|
||||
buildPhase = "ant ${options} jar";
|
||||
doCheck = false;
|
||||
|
||||
# FIXME: Install javadoc as well.
|
||||
installPhase =
|
||||
'' mkdir -p "$out/lib/java"
|
||||
cp -v build/x*.jar "$out/lib/java"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Apache Xalan-Java, an XSLT processor";
|
||||
|
||||
longDescription =
|
||||
'' Xalan-Java is an XSLT processor for transforming XML documents
|
||||
into HTML, text, or other XML document types. It implements XSL
|
||||
Transformations (XSLT) Version 1.0 and XML Path Language (XPath)
|
||||
Version 1.0 and can be used from the command line, in an applet or a
|
||||
servlet, or as a module in other program.
|
||||
|
||||
Xalan-Java implements the javax.xml.transform interface in Java
|
||||
API for XML Processing (JAXP) 1.3. This interface provides a
|
||||
modular framework and a standard API for performing XML
|
||||
transformations, and utilizes system properties to determine which
|
||||
Transformer and which XML parser to use.
|
||||
|
||||
Xalan-Java also implements the javax.xml.xpath interface in JAXP
|
||||
1.3, which provides an object-model neutral API for evaluation of
|
||||
XPath expressions and access to the evaluation environment.
|
||||
'';
|
||||
|
||||
homepage = http://xml.apache.org/xalan-j/;
|
||||
license = "Apache-2.0";
|
||||
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@ -1,57 +0,0 @@
|
||||
{ fetchurl, stdenv, ant, javac, jvm }:
|
||||
|
||||
let
|
||||
version = "2.9.1";
|
||||
tools = fetchurl {
|
||||
url = "mirror://apache/xerces/j/source/Xerces-J-tools.${version}.tar.gz";
|
||||
sha256 = "1zzbq9ijy0f3v8w2sws9w79bkda34m9i01993md94n8fccnkiwac";
|
||||
};
|
||||
options = "-Dbuild.compiler=gcj"; # FIXME: We assume GCJ here.
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "xerces-j-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/xerces/j/source/Xerces-J-src.${version}.tar.gz";
|
||||
sha256 = "14h5jp58999f0rg4mkyab015hkgsxa8n6cx53ia0sjialxi01bqk";
|
||||
};
|
||||
|
||||
buildInputs = [ ant javac jvm ];
|
||||
|
||||
configurePhase = "tar xzvf ${tools}";
|
||||
buildPhase = "ant ${options} jar";
|
||||
|
||||
# The `tests' directory is missing from the tarball.
|
||||
doCheck = false;
|
||||
|
||||
# FIXME: Install javadoc as well.
|
||||
installPhase =
|
||||
'' mkdir -p "$out/lib/java"
|
||||
cp -v build/xerces*.jar "$out/lib/java"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Apache Xerces, an XML parser for Java";
|
||||
|
||||
longDescription =
|
||||
'' Xerces2 Java is a library for parsing, validating and manipulating
|
||||
XML documents.
|
||||
|
||||
Xerces 2.x introduced the Xerces Native Interface (XNI), a
|
||||
complete framework for building parser components and
|
||||
configurations that is extremely modular and easy to program. XNI
|
||||
is merely an internal set of interfaces. There is no need for an
|
||||
XML application programmer to learn XNI if they only intend to
|
||||
interface to the Xerces2 parser using standard interfaces like
|
||||
JAXP, DOM, and SAX. Xerces developers and application developers
|
||||
that need more power and flexibility than that provided by the
|
||||
standard interfaces should read and understand XNI.
|
||||
'';
|
||||
|
||||
homepage = http://xerces.apache.org/xerces2-j/;
|
||||
|
||||
license = "Apache-2.0";
|
||||
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@ -400,7 +400,7 @@ let
|
||||
|
||||
aegisub = callPackage ../applications/video/aegisub {
|
||||
wxGTK = wxGTK29;
|
||||
lua = lua5_1;
|
||||
lua = lua5_1;
|
||||
};
|
||||
|
||||
aespipe = callPackage ../tools/security/aespipe { };
|
||||
@ -4527,14 +4527,6 @@ let
|
||||
|
||||
hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
|
||||
|
||||
icedtea = callPackage ../development/libraries/java/icedtea {
|
||||
ant = apacheAntGcj;
|
||||
xerces = xercesJava;
|
||||
xulrunner = icecatXulrunner3;
|
||||
inherit (xlibs) libX11 libXp libXtst libXinerama libXt
|
||||
libXrender xproto;
|
||||
};
|
||||
|
||||
icu = callPackage ../development/libraries/icu { };
|
||||
|
||||
id3lib = callPackage ../development/libraries/id3lib { };
|
||||
@ -5623,7 +5615,7 @@ let
|
||||
SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { };
|
||||
|
||||
serd = callPackage ../development/libraries/serd {};
|
||||
|
||||
|
||||
serf = callPackage ../development/libraries/serf {};
|
||||
|
||||
silgraphite = callPackage ../development/libraries/silgraphite {};
|
||||
@ -5890,12 +5882,6 @@ let
|
||||
|
||||
xercesc = callPackage ../development/libraries/xercesc {};
|
||||
|
||||
xercesJava = callPackage ../development/libraries/java/xerces {
|
||||
ant = apacheAntGcj; # for bootstrap purposes
|
||||
javac = gcj;
|
||||
jvm = gcj;
|
||||
};
|
||||
|
||||
xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper {
|
||||
packages = [
|
||||
freetype fontconfig xlibs.xproto xlibs.libX11 xlibs.libXt
|
||||
@ -5986,13 +5972,6 @@ let
|
||||
|
||||
v8 = callPackage ../development/libraries/v8 { inherit (pythonPackages) gyp; };
|
||||
|
||||
xalanj = xalanJava;
|
||||
xalanJava = callPackage ../development/libraries/java/xalanj {
|
||||
ant = apacheAntGcj; # for bootstrap purposes
|
||||
javac = gcj;
|
||||
jvm = gcj;
|
||||
xerces = xercesJava; };
|
||||
|
||||
xmlsec = callPackage ../development/libraries/xmlsec { };
|
||||
|
||||
zziplib = callPackage ../development/libraries/zziplib { };
|
||||
@ -6002,20 +5981,26 @@ let
|
||||
|
||||
jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { };
|
||||
|
||||
|
||||
### DEVELOPMENT / LISP MODULES
|
||||
|
||||
asdf = callPackage ../development/lisp-modules/asdf {
|
||||
texLive = null;
|
||||
};
|
||||
|
||||
clwrapperFunction = callPackage ../development/lisp-modules/clwrapper;
|
||||
wrapLisp = lisp: clwrapperFunction {lisp=lisp;};
|
||||
lispPackagesFor = clwrapper: callPackage ../development/lisp-modules/lisp-packages.nix{
|
||||
|
||||
wrapLisp = lisp: clwrapperFunction { inherit lisp; };
|
||||
|
||||
lispPackagesFor = clwrapper: callPackage ../development/lisp-modules/lisp-packages.nix {
|
||||
inherit clwrapper;
|
||||
};
|
||||
|
||||
lispPackagesClisp = lispPackagesFor (wrapLisp clisp);
|
||||
lispPackagesSBCL = lispPackagesFor (wrapLisp sbcl);
|
||||
lispPackages = recurseIntoAttrs lispPackagesSBCL;
|
||||
|
||||
|
||||
### DEVELOPMENT / PERL MODULES
|
||||
|
||||
buildPerlPackage = import ../development/perl-modules/generic perl;
|
||||
|
||||
@ -674,7 +674,6 @@ let
|
||||
icecat3Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
icecat3Xul = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
icecatXulrunner3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
icedtea = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
icewm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
idutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
ikiwiki = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
@ -1761,7 +1760,6 @@ let
|
||||
x11vnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
x2vnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
x2x = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
xalanJava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
xaos = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
xapianBindings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
xapianBindings10 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
@ -1780,7 +1778,6 @@ let
|
||||
xdaliclock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
xdotool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
xen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
xercesJava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
xf86_input_mtrack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
xf86_input_multitouch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
xf86_input_wacom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user