From 951023ee8a63b6883a320178e4344d62070447fe Mon Sep 17 00:00:00 2001 From: Martin Bravenboer Date: Sun, 11 Sep 2005 15:38:59 +0000 Subject: [PATCH] Moved a number of Java libraries from the GW project to the Nix Package Collection. svn path=/nixpkgs/trunk/; revision=3803 --- .../development/libraries/java/cup/builder.sh | 13 ++ .../libraries/java/cup/default.nix | 13 ++ .../libraries/java/httpunit/builder.sh | 5 + .../libraries/java/httpunit/default.nix | 13 ++ .../jakarta-commons/file-upload/builder.sh | 6 + .../jakarta-commons/file-upload/default.nix | 11 ++ .../libraries/java/jdom/builder.sh | 6 + .../libraries/java/jdom/default.nix | 11 ++ .../libraries/java/jflex/builder.sh | 6 + .../libraries/java/jflex/default.nix | 11 ++ .../libraries/java/junit/builder.sh | 6 + .../libraries/java/junit/default.nix | 13 ++ .../libraries/java/lucene/builder.sh | 6 + .../libraries/java/lucene/default.nix | 11 ++ .../libraries/java/mockobjects/builder.sh | 6 + .../libraries/java/mockobjects/default.nix | 11 ++ pkgs/system/all-packages-generic.nix | 123 ++++++++++++------ 17 files changed, 229 insertions(+), 42 deletions(-) create mode 100755 pkgs/development/libraries/java/cup/builder.sh create mode 100644 pkgs/development/libraries/java/cup/default.nix create mode 100755 pkgs/development/libraries/java/httpunit/builder.sh create mode 100644 pkgs/development/libraries/java/httpunit/default.nix create mode 100755 pkgs/development/libraries/java/jakarta-commons/file-upload/builder.sh create mode 100644 pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix create mode 100755 pkgs/development/libraries/java/jdom/builder.sh create mode 100644 pkgs/development/libraries/java/jdom/default.nix create mode 100755 pkgs/development/libraries/java/jflex/builder.sh create mode 100644 pkgs/development/libraries/java/jflex/default.nix create mode 100755 pkgs/development/libraries/java/junit/builder.sh create mode 100644 pkgs/development/libraries/java/junit/default.nix create mode 100755 pkgs/development/libraries/java/lucene/builder.sh create mode 100644 pkgs/development/libraries/java/lucene/default.nix create mode 100755 pkgs/development/libraries/java/mockobjects/builder.sh create mode 100644 pkgs/development/libraries/java/mockobjects/default.nix diff --git a/pkgs/development/libraries/java/cup/builder.sh b/pkgs/development/libraries/java/cup/builder.sh new file mode 100755 index 00000000000..9f9cc5cda63 --- /dev/null +++ b/pkgs/development/libraries/java/cup/builder.sh @@ -0,0 +1,13 @@ +set -e +. $stdenv/setup + +tar zxvf $src + +$j2sdk/bin/javac java_cup/*.java +$j2sdk/bin/javac java_cup/runtime/*.java + +mkdir -p $out/java_cup/runtime + +cp java_cup/*.class $out/java_cup +cp java_cup/runtime/*.class $out/java_cup/runtime/ + diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix new file mode 100644 index 00000000000..36c6e963326 --- /dev/null +++ b/pkgs/development/libraries/java/cup/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, j2sdk} : + +stdenv.mkDerivation { + name = "java-cup-10k"; + builder = ./builder.sh; + + src = fetchurl { + url = http://www.cs.princeton.edu/~appel/modern/java/CUP/java_cup_v10k.tar.gz; + md5 = "8b11edfec13c590ea443d0f0ae0da479"; + }; + + inherit j2sdk; +} diff --git a/pkgs/development/libraries/java/httpunit/builder.sh b/pkgs/development/libraries/java/httpunit/builder.sh new file mode 100755 index 00000000000..53bf996caa3 --- /dev/null +++ b/pkgs/development/libraries/java/httpunit/builder.sh @@ -0,0 +1,5 @@ +. $stdenv/setup + +$unzip/bin/unzip $src +mkdir $out +mv $name/* $out/ diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix new file mode 100644 index 00000000000..67baff53d42 --- /dev/null +++ b/pkgs/development/libraries/java/httpunit/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, unzip} : + +stdenv.mkDerivation { + name = "httpunit-1.6"; + builder = ./builder.sh; + + src = fetchurl { + url = http://surfnet.dl.sourceforge.net/sourceforge/httpunit/httpunit-1.6.zip; + md5 = "e94b53b9f4d7bdb706e4baac95b6e424"; + }; + + inherit unzip; +} diff --git a/pkgs/development/libraries/java/jakarta-commons/file-upload/builder.sh b/pkgs/development/libraries/java/jakarta-commons/file-upload/builder.sh new file mode 100755 index 00000000000..d1a93c0fdf4 --- /dev/null +++ b/pkgs/development/libraries/java/jakarta-commons/file-upload/builder.sh @@ -0,0 +1,6 @@ +set -e +. $stdenv/setup + +tar zxvf $src +mkdir -p $out +mv $name/* $out diff --git a/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix b/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix new file mode 100644 index 00000000000..0e495e551df --- /dev/null +++ b/pkgs/development/libraries/java/jakarta-commons/file-upload/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl} : + +stdenv.mkDerivation { + name = "commons-fileupload-1.0"; + builder = ./builder.sh; + + src = fetchurl { + url = http://apache.mirror.rokscom.nl/jakarta/commons/fileupload/binaries/commons-fileupload-1.0.tar.gz; + md5 = "5618b26b1a5c006d7236fb4465e907b6"; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/java/jdom/builder.sh b/pkgs/development/libraries/java/jdom/builder.sh new file mode 100755 index 00000000000..d1a93c0fdf4 --- /dev/null +++ b/pkgs/development/libraries/java/jdom/builder.sh @@ -0,0 +1,6 @@ +set -e +. $stdenv/setup + +tar zxvf $src +mkdir -p $out +mv $name/* $out diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix new file mode 100644 index 00000000000..bca165bb324 --- /dev/null +++ b/pkgs/development/libraries/java/jdom/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl} : + +stdenv.mkDerivation { + name = "jdom-1.0"; + builder = ./builder.sh; + + src = fetchurl { + url = http://www.jdom.org/dist/binary/jdom-1.0.tar.gz; + md5 = "ce29ecc05d63fdb419737fd00c04c281"; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/java/jflex/builder.sh b/pkgs/development/libraries/java/jflex/builder.sh new file mode 100755 index 00000000000..d1a93c0fdf4 --- /dev/null +++ b/pkgs/development/libraries/java/jflex/builder.sh @@ -0,0 +1,6 @@ +set -e +. $stdenv/setup + +tar zxvf $src +mkdir -p $out +mv $name/* $out diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix new file mode 100644 index 00000000000..b527af14e4b --- /dev/null +++ b/pkgs/development/libraries/java/jflex/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl} : + +stdenv.mkDerivation { + name = "jflex-1.4"; + builder = ./builder.sh; + + src = fetchurl { + url = http://jflex.de/jflex-1.4.tar.gz; + md5 = "120cedc76b278a476682edfa6828841f"; + }; +} diff --git a/pkgs/development/libraries/java/junit/builder.sh b/pkgs/development/libraries/java/junit/builder.sh new file mode 100755 index 00000000000..e8105eca4e3 --- /dev/null +++ b/pkgs/development/libraries/java/junit/builder.sh @@ -0,0 +1,6 @@ +set -e +. $stdenv/setup + +$unzip/bin/unzip $src +mkdir -p $out +mv junit*/* $out diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix new file mode 100644 index 00000000000..84004f973b6 --- /dev/null +++ b/pkgs/development/libraries/java/junit/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, unzip} : + +stdenv.mkDerivation { + name = "junit-3.8.1"; + builder = ./builder.sh; + + src = fetchurl { + url = http://surfnet.dl.sourceforge.net/sourceforge/junit/junit3.8.1.zip; + md5 = "5110326e4b7f7497dfa60ede4b626751"; + }; + + inherit unzip; +} diff --git a/pkgs/development/libraries/java/lucene/builder.sh b/pkgs/development/libraries/java/lucene/builder.sh new file mode 100755 index 00000000000..d1a93c0fdf4 --- /dev/null +++ b/pkgs/development/libraries/java/lucene/builder.sh @@ -0,0 +1,6 @@ +set -e +. $stdenv/setup + +tar zxvf $src +mkdir -p $out +mv $name/* $out diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix new file mode 100644 index 00000000000..9380591636c --- /dev/null +++ b/pkgs/development/libraries/java/lucene/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl} : + +stdenv.mkDerivation { + name = "lucene-1.4.1"; + builder = ./builder.sh; + + src = fetchurl { + url = http://cvs.apache.org/dist/jakarta/lucene/v1.4.1/lucene-1.4.1.tar.gz; + md5 = "656a6f40f5b8f7d2e19453436848bfe8"; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/java/mockobjects/builder.sh b/pkgs/development/libraries/java/mockobjects/builder.sh new file mode 100755 index 00000000000..358d45d872b --- /dev/null +++ b/pkgs/development/libraries/java/mockobjects/builder.sh @@ -0,0 +1,6 @@ +set -e +. $stdenv/setup + +tar xvf $src +mkdir -p $out +mv * $out diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix new file mode 100644 index 00000000000..5315cc63f1c --- /dev/null +++ b/pkgs/development/libraries/java/mockobjects/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl} : + +stdenv.mkDerivation { + name = "mockobjects-0.09"; + builder = ./builder.sh; + + src = fetchurl { + url = http://surfnet.dl.sourceforge.net/sourceforge/mockobjects/mockobjects-bin-0.09.tar; + md5 = "a0e11423bd5fcbb6ea65753643ea8852"; + }; +} diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index ebddd7c18f5..3ac1b4961ba 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -503,44 +503,6 @@ rec { inherit fetchurl stdenv; }; - saxon = (import ../development/libraries/java/saxon) { - inherit fetchurl stdenv unzip; - }; - - saxonb = (import ../development/libraries/java/saxon/default8.nix) { - inherit fetchurl stdenv unzip; - }; - - sharedobjects = (import ../development/libraries/java/shared-objects) { - j2sdk = j2sdk15; - inherit fetchurl stdenv; - }; - - jjtraveler = (import ../development/libraries/java/jjtraveler) { - j2sdk = j2sdk15; - inherit fetchurl stdenv; - }; - - atermjava = (import ../development/libraries/java/aterm) { - j2sdk = j2sdk15; - inherit fetchurl stdenv sharedobjects jjtraveler; - }; - - jakartaregexp = (import ../development/libraries/java/jakarta-regexp) { - inherit fetchurl stdenv; - }; - - jakartabcel = (import ../development/libraries/java/jakarta-bcel) { - regexp = jakartaregexp; - inherit fetchurl stdenv; - }; - - jclasslib = (import ../development/tools/java/jclasslib) { - inherit fetchurl stdenv xpf; - j2re = j2sdk15; - ant = apacheAnt14; - }; - ocaml = (import ../development/compilers/ocaml) { inherit fetchurl stdenv x11; }; @@ -598,10 +560,6 @@ rec { inherit fetchurl stdenv ghc; }; - happy = (import ../development/tools/parsing/happy) { - inherit fetchurl stdenv perl ghc; - }; - harp = (import ../development/compilers/harp) { inherit fetchurl stdenv unzip ghc happy; }; @@ -610,6 +568,12 @@ rec { inherit fetchurl stdenv; }; + ### DEVELOPMENT / INTERPRETERS + + happy = (import ../development/tools/parsing/happy) { + inherit fetchurl stdenv perl ghc; + }; + realPerl = (import ../development/interpreters/perl) { inherit fetchurl stdenv; }; @@ -950,6 +914,81 @@ rec { inherit fetchurl stdenv libxml2 openssl; }; + ### DEVELOPMENT / LIBRARIES / JAVA + + saxon = (import ../development/libraries/java/saxon) { + inherit fetchurl stdenv unzip; + }; + + saxonb = (import ../development/libraries/java/saxon/default8.nix) { + inherit fetchurl stdenv unzip; + }; + + sharedobjects = (import ../development/libraries/java/shared-objects) { + j2sdk = j2sdk15; + inherit fetchurl stdenv; + }; + + jjtraveler = (import ../development/libraries/java/jjtraveler) { + j2sdk = j2sdk15; + inherit fetchurl stdenv; + }; + + atermjava = (import ../development/libraries/java/aterm) { + j2sdk = j2sdk15; + inherit fetchurl stdenv sharedobjects jjtraveler; + }; + + jakartaregexp = (import ../development/libraries/java/jakarta-regexp) { + inherit fetchurl stdenv; + }; + + jakartabcel = (import ../development/libraries/java/jakarta-bcel) { + regexp = jakartaregexp; + inherit fetchurl stdenv; + }; + + jclasslib = (import ../development/tools/java/jclasslib) { + inherit fetchurl stdenv xpf; + j2re = j2sdk15; + ant = apacheAnt14; + }; + + lucene = import ../development/libraries/java/lucene { + inherit stdenv fetchurl; + }; + + jdom = import ../development/libraries/java/jdom { + inherit stdenv fetchurl; + }; + + javaCup = import ../development/libraries/java/cup { + inherit stdenv fetchurl; + j2sdk = j2sdk15; + }; + + jflex = import ../development/libraries/java/jflex { + inherit stdenv fetchurl; + }; + + junit = import ../development/libraries/java/junit { + inherit stdenv fetchurl unzip; + }; + + httpunit = import ../development/libraries/java/httpunit { + inherit stdenv fetchurl unzip; + }; + + mockobjects = import ../development/libraries/java/mockobjects { + inherit stdenv fetchurl; + }; + + commonsFileUpload = import ../development/libraries/java/jakarta-commons/file-upload { + inherit stdenv fetchurl; + }; + + ### DEVELOPMENT / PERL MODULES + perlBerkeleyDB = import ../development/perl-modules/BerkeleyDB { inherit fetchurl perl db4; };