batik: 1.6 -> 1.13

2 files changed, 7 insertions, 13 deletions

diff --git a/pkgs/applications/graphics/batik/builder.sh b/pkgs/applications/graphics/batik/builder.sh
index c6cf64bf3700..be8e6985ea26 100755
--- a/pkgs/applications/graphics/batik/builder.sh
+++ b/pkgs/applications/graphics/batik/builder.sh
@@ -2,6 +2,6 @@ set -e
 
 source $stdenv/setup
 
-unzip $src
+tar xzvf $src
 mkdir $out
 mv batik-* $out/batik
diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix
index 3c78c8b6dbd2..594508dfb043 100644
--- a/pkgs/applications/graphics/batik/default.nix
+++ b/pkgs/applications/graphics/batik/default.nix
@@ -1,25 +1,19 @@
 {stdenv, fetchurl, unzip}:
 
-stdenv.mkDerivation {
-  name = "batik-1.6";
+stdenv.mkDerivation rec {
+  pname = "batik";
+  version = "1.13";
+
   builder = ./builder.sh;
   src = fetchurl {
-    url = "http://tarballs.nixos.org/batik-1.6.zip";
-    sha256 = "0cf15dspmzcnfda8w5lbsdx28m4v2rpq1dv5zx0r0n99ihqd1sh6";
+    url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz";
+    sha256 = "16sq90nbs6psgm3xz30sbs6r5dnpd3qzsvr1xvnp4yipwjcmhmkw";
   };
 
-  buildInputs = [unzip];
-
   meta = with stdenv.lib; {
     description = "Java based toolkit for handling SVG";
     homepage = "https://xmlgraphics.apache.org/batik";
     license = licenses.asl20;
     platforms = platforms.unix;
-    knownVulnerabilities = [
-      # vulnerabilities as of 16th October 2018 from https://xmlgraphics.apache.org/security.html:
-      "CVE-2018-8013"
-      "CVE-2017-5662"
-      "CVE-2015-0250"
-    ];
   };
 }