From 4c70ef7e5dc4e65c989160a54ad104beaa1b10d5 Mon Sep 17 00:00:00 2001 From: Martin Bravenboer Date: Sat, 17 Sep 2005 23:58:51 +0000 Subject: [PATCH] Cleaning up the java naming conventions svn path=/nixpkgs/trunk/; revision=3871 --- .../subversion-1.1.x/builder.sh | 6 +-- .../subversion-1.1.x/default.nix | 8 +-- .../subversion-1.2.x/builder.sh | 6 +-- .../subversion-1.2.x/default.nix | 6 +-- .../development/compilers/jdk/default-1.4.nix | 9 ++++ .../compilers/jdk/jdk5-sun-linux.nix | 6 +-- pkgs/development/eclipse/ecj/builder.sh | 4 +- pkgs/development/eclipse/ecj/default.nix | 6 +-- pkgs/development/interpreters/jre/default.nix | 2 +- .../{j2re-sun-linux.nix => jre-sun-linux.nix} | 0 .../libraries/java/aterm/default.nix | 4 +- .../development/libraries/java/cup/builder.sh | 4 +- .../libraries/java/cup/default.nix | 4 +- .../libraries/java/jjtraveler/default.nix | 4 +- .../libraries/java/shared-objects/default.nix | 4 +- .../build-managers/apache-ant/builder.sh | 4 +- .../build-managers/apache-ant/default.nix | 6 +-- .../tools/java/jclasslib/builder.sh | 4 +- .../tools/java/jclasslib/default.nix | 4 +- pkgs/development/tools/misc/swig/builder.sh | 2 +- pkgs/development/tools/misc/swig/default.nix | 6 +-- pkgs/servers/http/tomcat/builder.sh | 2 +- pkgs/servers/http/tomcat/default.nix | 4 +- pkgs/system/all-packages-generic.nix | 51 ++++++++++--------- pkgs/system/populate-cache.nix | 2 +- pkgs/tools/text/xml/jing/jing-script.nix | 4 +- pkgs/tools/text/xml/jing/script-builder.sh | 4 +- 27 files changed, 88 insertions(+), 78 deletions(-) create mode 100644 pkgs/development/compilers/jdk/default-1.4.nix rename pkgs/development/interpreters/jre/{j2re-sun-linux.nix => jre-sun-linux.nix} (100%) diff --git a/pkgs/applications/version-management/subversion-1.1.x/builder.sh b/pkgs/applications/version-management/subversion-1.1.x/builder.sh index 168ba61c792..09e6654faa6 100644 --- a/pkgs/applications/version-management/subversion-1.1.x/builder.sh +++ b/pkgs/applications/version-management/subversion-1.1.x/builder.sh @@ -1,4 +1,4 @@ -buildInputs="$openssl $zlib $db4 $httpd $swig $python $j2sdk $expat $patch" +buildInputs="$openssl $zlib $db4 $httpd $swig $python $jdk $expat $patch" . $stdenv/setup configureFlags="--without-gdbm --disable-static" @@ -21,7 +21,7 @@ if test -n "$pythonBindings" -o -n "$javaSwigBindings"; then fi if test "$javahlBindings"; then - configureFlags="--enable-javahl --with-jdk=$j2sdk $configureFlags" + configureFlags="--enable-javahl --with-jdk=$jdk $configureFlags" fi installFlags="$makeFlags" @@ -48,7 +48,7 @@ postInstall() { make javahl make install-javahl mkdir -p $out/share/doc/$name - $j2sdk/bin/javadoc -d $out/share/doc/$name \ + $jdk/bin/javadoc -d $out/share/doc/$name \ -windowtitle "JavaHL Subversion Bindings" \ -link http://java.sun.com/j2se/1.4.2/docs/api/ \ subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/*.java diff --git a/pkgs/applications/version-management/subversion-1.1.x/default.nix b/pkgs/applications/version-management/subversion-1.1.x/default.nix index ff9faaf3aaf..0eedca4defb 100644 --- a/pkgs/applications/version-management/subversion-1.1.x/default.nix +++ b/pkgs/applications/version-management/subversion-1.1.x/default.nix @@ -6,7 +6,7 @@ , javaSwigBindings ? false , javahlBindings ? false , stdenv, fetchurl -, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null, zlib ? null +, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, jdk ? null, zlib ? null }: assert expat != null; @@ -15,7 +15,7 @@ assert httpServer -> httpd != null && httpd.expat == expat; assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl); assert pythonBindings -> swig != null && swig.pythonSupport; assert javaSwigBindings -> swig != null && swig.javaSupport; -assert javahlBindings -> j2sdk != null; +assert javahlBindings -> jdk != null; assert compressionSupport -> zlib != null; stdenv.mkDerivation { @@ -38,8 +38,8 @@ stdenv.mkDerivation { db4 = if localServer then db4 else null; swig = if pythonBindings || javaSwigBindings then swig else null; python = if pythonBindings then swig.python else null; - j2sdk = if javaSwigBindings then swig.j2sdk else - if javahlBindings then j2sdk else null; + jdk = if javaSwigBindings then swig.jdk else + if javahlBindings then jdk else null; inherit expat localServer httpServer sslSupport pythonBindings javaSwigBindings javahlBindings; diff --git a/pkgs/applications/version-management/subversion-1.2.x/builder.sh b/pkgs/applications/version-management/subversion-1.2.x/builder.sh index 6007a5978a7..19f30a4f258 100644 --- a/pkgs/applications/version-management/subversion-1.2.x/builder.sh +++ b/pkgs/applications/version-management/subversion-1.2.x/builder.sh @@ -1,4 +1,4 @@ -buildInputs="$openssl $zlib $db4 $httpd $swig $python $j2sdk $expat $patch" +buildInputs="$openssl $zlib $db4 $httpd $swig $python $jdk $expat $patch" . $stdenv/setup configureFlags="--without-gdbm --disable-static" @@ -23,7 +23,7 @@ if test -n "$pythonBindings"; then fi if test "$javahlBindings"; then - configureFlags="--enable-javahl --with-jdk=$j2sdk $configureFlags" + configureFlags="--enable-javahl --with-jdk=$jdk $configureFlags" fi installFlags="$makeFlags" @@ -39,7 +39,7 @@ postInstall() { make javahl make install-javahl mkdir -p $out/share/doc/$name - $j2sdk/bin/javadoc -d $out/share/doc/$name \ + $jdk/bin/javadoc -d $out/share/doc/$name \ -windowtitle "JavaHL Subversion Bindings" \ -link http://java.sun.com/j2se/1.4.2/docs/api/ \ subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/*.java diff --git a/pkgs/applications/version-management/subversion-1.2.x/default.nix b/pkgs/applications/version-management/subversion-1.2.x/default.nix index a2b6b356aa6..e6932d481f1 100644 --- a/pkgs/applications/version-management/subversion-1.2.x/default.nix +++ b/pkgs/applications/version-management/subversion-1.2.x/default.nix @@ -5,7 +5,7 @@ , pythonBindings ? false , javahlBindings ? false , stdenv, fetchurl -, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null, zlib ? null +, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, jdk ? null, zlib ? null }: assert expat != null; @@ -13,7 +13,7 @@ assert localServer -> db4 != null; assert httpServer -> httpd != null && httpd.expat == expat; assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl); assert pythonBindings -> swig != null && swig.pythonSupport; -assert javahlBindings -> j2sdk != null; +assert javahlBindings -> jdk != null; assert compressionSupport -> zlib != null; stdenv.mkDerivation { @@ -31,7 +31,7 @@ stdenv.mkDerivation { db4 = if localServer then db4 else null; swig = if pythonBindings then swig else null; python = if pythonBindings then swig.python else null; - j2sdk = if javahlBindings then j2sdk else null; + jdk = if javahlBindings then jdk else null; inherit expat localServer httpServer sslSupport pythonBindings javahlBindings; diff --git a/pkgs/development/compilers/jdk/default-1.4.nix b/pkgs/development/compilers/jdk/default-1.4.nix new file mode 100644 index 00000000000..097af70bc1c --- /dev/null +++ b/pkgs/development/compilers/jdk/default-1.4.nix @@ -0,0 +1,9 @@ +{stdenv, fetchurl}: + +if stdenv.system == "i686-linux" + then + (import ./j2sdk-1.4.x-sun-linux.nix) { + inherit stdenv fetchurl; + } + else + false diff --git a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix index 89fd6ab2a54..81ed0223284 100644 --- a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix +++ b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix @@ -1,6 +1,6 @@ /** - * This Nix expression requires the user to download the j2sdk - * distribution to /tmp. Please obtain j2sdk-1_5_0_05-linux-i586.bin + * This Nix expression requires the user to download the jdk + * distribution to /tmp. Please obtain jdk-1_5_0_05-linux-i586.bin * from java.sun.com by hand and place it in /tmp. Blame Sun, not me. * * Note that this is not necessary if someone has already pushed a @@ -19,6 +19,6 @@ derivation { system = stdenv.system; builder = ./builder.sh; pathname = "/tmp/jdk-1_5_0_05-linux-i586.bin"; - md5 = ""; + md5 = "2f83bf2a38fff1f8ac51b02ec7391ca3"; stdenv = stdenv; } diff --git a/pkgs/development/eclipse/ecj/builder.sh b/pkgs/development/eclipse/ecj/builder.sh index 67297e2fd87..1b3d86f44a5 100644 --- a/pkgs/development/eclipse/ecj/builder.sh +++ b/pkgs/development/eclipse/ecj/builder.sh @@ -12,10 +12,10 @@ mkdir -p $out/bin cat >> $out/bin/ecj <> $out/bin/ant <> $out/bin/jclasslib < perl != null; assert pythonSupport -> python != null; -assert javaSupport -> j2sdk != null; +assert javaSupport -> jdk != null; stdenv.mkDerivation { name = "swig-1.3.19"; @@ -18,5 +18,5 @@ stdenv.mkDerivation { perl = if perlSupport then perl else null; python = if pythonSupport then python else null; - j2sdk = if javaSupport then j2sdk else null; + jdk = if javaSupport then jdk else null; } \ No newline at end of file diff --git a/pkgs/servers/http/tomcat/builder.sh b/pkgs/servers/http/tomcat/builder.sh index 1a2414d5970..e70807437e1 100644 --- a/pkgs/servers/http/tomcat/builder.sh +++ b/pkgs/servers/http/tomcat/builder.sh @@ -7,7 +7,7 @@ cd jakarta-tomcat*/bin tar xvfz jsvc.tar.gz cd jsvc-src -sh ./configure --with-java=$sdk +sh ./configure --with-java=$jdk make cp jsvc .. cd .. diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index f7cb3c47d9d..9c32965d8cc 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, j2sdk}: +{stdenv, fetchurl, jdk}: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { md5 = "b802ee042677e284bcf65738c7bdc3b6"; }; - sdk = j2sdk; + inherit jdk; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index d3b5b85b3a5..436eb772f40 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -121,7 +121,7 @@ rec { jing_tools = (import ../tools/text/xml/jing/jing-script.nix) { inherit fetchurl stdenv unzip; - j2re = blackdown; + jre = blackdown; }; cpio = (import ../tools/archivers/cpio) { @@ -332,7 +332,7 @@ rec { swigWithJava = (import ../development/tools/misc/swig) { inherit fetchurl stdenv; - j2sdk = blackdown; + jdk = blackdown; perlSupport = false; pythonSupport = false; javaSupport = true; @@ -485,7 +485,7 @@ rec { }; ecj = (import ../development/eclipse/ecj) { - inherit fetchurl stdenv unzip j2re; + inherit fetchurl stdenv unzip jre; ant = apacheAntBlackdown14; }; @@ -497,11 +497,11 @@ rec { inherit fetchurl stdenv; }; - j2sdk = (import ../development/compilers/j2sdk) { + jdk = (import ../development/compilers/jdk) { inherit fetchurl stdenv; }; - j2sdk15 = (import ../development/compilers/j2sdk/default-1.5.nix) { + j2sdk14x = (import ../development/compilers/jdk/default-1.4.nix) { inherit fetchurl stdenv; }; @@ -614,7 +614,7 @@ rec { inherit fetchurl stdenv ncurses readline; }; - j2re = (import ../development/interpreters/j2re) { + jre = (import ../development/interpreters/jre) { inherit fetchurl stdenv; }; @@ -623,20 +623,19 @@ rec { }; apacheAnt14 = (import ../development/tools/build-managers/apache-ant) { - inherit fetchurl stdenv j2sdk; - name = "ant-j2sdk-1.4.2"; + inherit fetchurl stdenv jdk; + name = "ant-jdk-1.4.2"; }; apacheAntBlackdown14 = (import ../development/tools/build-managers/apache-ant) { inherit fetchurl stdenv; - j2sdk = blackdown; + jdk = blackdown; name = "ant-blackdown-1.4.2"; }; - apacheAnt15 = (import ../development/tools/build-managers/apache-ant) { - inherit fetchurl stdenv; - name = "ant-j2sdk-1.5.0"; - j2sdk = j2sdk15; + apacheAnt = (import ../development/tools/build-managers/apache-ant) { + inherit fetchurl stdenv jdk; + name = "ant-jdk-1.5.0"; }; dovecot = (import ../servers/mail/dovecot) { @@ -649,7 +648,7 @@ rec { tomcat5 = (import ../servers/http/tomcat) { inherit fetchurl stdenv ; - j2sdk = blackdown; + jdk = blackdown; }; cil = (import ../development/libraries/cil) { @@ -939,18 +938,15 @@ rec { }; sharedobjects = (import ../development/libraries/java/shared-objects) { - j2sdk = j2sdk15; - inherit fetchurl stdenv; + inherit fetchurl stdenv jdk; }; jjtraveler = (import ../development/libraries/java/jjtraveler) { - j2sdk = j2sdk15; - inherit fetchurl stdenv; + inherit fetchurl stdenv jdk; }; atermjava = (import ../development/libraries/java/aterm) { - j2sdk = j2sdk15; - inherit fetchurl stdenv sharedobjects jjtraveler; + inherit fetchurl stdenv sharedobjects jjtraveler jdk; }; jakartaregexp = (import ../development/libraries/java/jakarta-regexp) { @@ -963,8 +959,7 @@ rec { }; jclasslib = (import ../development/tools/java/jclasslib) { - inherit fetchurl stdenv xpf; - j2re = j2sdk15; + inherit fetchurl stdenv xpf jre; ant = apacheAnt14; }; @@ -977,8 +972,7 @@ rec { }; javaCup = import ../development/libraries/java/cup { - inherit stdenv fetchurl; - j2sdk = j2sdk15; + inherit stdenv fetchurl jdk; }; jflex = import ../development/libraries/java/jflex { @@ -1354,7 +1348,7 @@ rec { sslSupport = true; httpd = apacheHttpd; javahlBindings = true; - j2sdk = blackdown; + jdk = blackdown; }; rcs = (import ../applications/version-management/rcs) { @@ -1392,6 +1386,13 @@ rec { inherit (xlibs) libXi; }; + firefoxbeta = (import ../applications/networking/browsers/firefox-1.5beta) { + inherit fetchurl stdenv pkgconfig perl zip; + inherit (gtkLibs) gtk; + inherit (gnome) libIDL; + inherit (xlibs) libXi; + }; + firefoxWrapper = (import ../applications/networking/browsers/firefox-wrapper) { inherit stdenv firefox; plugins = [ diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix index 09e33485ec8..d88c11a7b28 100644 --- a/pkgs/system/populate-cache.nix +++ b/pkgs/system/populate-cache.nix @@ -114,7 +114,7 @@ let { apacheAntBlackdown14 jikes ecj - j2re + jre jetty ;}; diff --git a/pkgs/tools/text/xml/jing/jing-script.nix b/pkgs/tools/text/xml/jing/jing-script.nix index 617836f9325..d6433f43a0c 100644 --- a/pkgs/tools/text/xml/jing/jing-script.nix +++ b/pkgs/tools/text/xml/jing/jing-script.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, j2re, unzip} : +{stdenv, fetchurl, jre, unzip} : stdenv.mkDerivation { name = "jing-tools-20030619"; @@ -8,5 +8,5 @@ stdenv.mkDerivation { inherit stdenv fetchurl unzip; }; - inherit j2re; + inherit jre; } \ No newline at end of file diff --git a/pkgs/tools/text/xml/jing/script-builder.sh b/pkgs/tools/text/xml/jing/script-builder.sh index fa9f727e131..b0c4648404c 100644 --- a/pkgs/tools/text/xml/jing/script-builder.sh +++ b/pkgs/tools/text/xml/jing/script-builder.sh @@ -5,10 +5,10 @@ mkdir -p $out/bin || exit 1 cat >> $out/bin/jing <