Merge branch 'origin/master' into stdenv-updates.

pkgs/tools/text/xml/jing/default.nix

@@ -1,13 +1,22 @@
-{stdenv, fetchurl, unzip} :
+{ stdenv, fetchurl, unzip, jre }:
 
 stdenv.mkDerivation {
-  name = "jing-20030619";
+  name = "jing-20091111";
   builder = ./unzip-builder.sh;
 
   src = fetchurl {
-    url = http://www.thaiopensource.com/download/jing-20030619.zip;
-    md5 = "f9b0775d8740f16ab3df82ad3707a093";
+    url = https://jing-trang.googlecode.com/files/jing-20091111.zip;
+    sha256 = "134h2r22r64v5yk4v8mhl6r893dlw5vzx9daf2sj2mbbma004sap";
   };
 
-  inherit unzip;
-}
+  inherit unzip jre;
+
+  meta = with stdenv.lib; {
+    description = "A RELAX NG validator in Java";
+    # The homepage is www.thaiopensource.com, but it links to googlecode.com
+    # for downloads and call it the "project site".
+    homepage = http://www.thaiopensource.com/relaxng/jing.html;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}

pkgs/tools/text/xml/jing/jing-script.nix

@@ -1,12 +0,0 @@
-{stdenv, fetchurl, jre, unzip} :
-
-stdenv.mkDerivation {
-  name = "jing-tools-20030619";
-  builder = ./script-builder.sh;
-
-  jing = (import ./default.nix) {
-    inherit stdenv fetchurl unzip;
-  };
-
-  inherit jre;
-}

pkgs/tools/text/xml/jing/script-builder.sh

@@ -1,14 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/bin
-
-cat >> $out/bin/jing <<EOF
-#! $SHELL
-
-export JAVA_HOME=$jre
-export LANG="en_US"
-
-exec $jre/bin/java -jar $jing/bin/jing.jar "\$@"
-EOF
-
-chmod a+x $out/bin/jing

pkgs/tools/text/xml/jing/unzip-builder.sh

@@ -4,3 +4,11 @@ source $stdenv/setup
 $unzip/bin/unzip $src
 mkdir -p $out
 mv $name/* $out
+
+cat > "$out/bin/jing" <<EOF
+#! $SHELL
+export JAVA_HOME="$jre"
+exec "$jre/bin/java" -jar "$out/bin/jing.jar" "\$@"
+EOF
+
+chmod a+x "$out/bin/jing"

pkgs/tools/text/xml/trang/default.nix

@@ -1,15 +1,24 @@
-{stdenv, fetchurl, jre, unzip}:
+{ stdenv, fetchurl, unzip, jre }:
 
 stdenv.mkDerivation {
-  name = "trang-20030619";
+  name = "trang-20091111";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://www.thaiopensource.com/download/trang-20030619.zip;
-    md5 = "9611ea59fda0f62fecc4a5017a72984e";
+    url = https://jing-trang.googlecode.com/files/trang-20091111.zip;
+    sha256 = "16551j63n2y3w9lc7krjazddsab7xvdymbss4rdvx3liz4sg18yq";
   };
 
-  buildInputs = [unzip];
-
   inherit jre;
+
+  buildInputs = [ unzip ];
+
+  meta = with stdenv.lib; {
+    description = "Multi-format schema converter based on RELAX NG";
+    # The homepage is www.thaiopensource.com, but it links to googlecode.com
+    # for downloads and call it the "project site".
+    homepage = http://www.thaiopensource.com/relaxng/trang.html;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
 }