summary refs log tree commit diff
path: root/pkgs/development/libraries/expat/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/expat/default.nix')
-rw-r--r--pkgs/development/libraries/expat/default.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 774190278cb..1b663fc21a9 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "expat-2.1.0";
+  name = "expat-2.1.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/expat/${name}.tar.gz";
-    sha256 = "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2";
+    url = "mirror://sourceforge/expat/${name}.tar.bz2";
+    sha256 = "0ryyjgvy7jq0qb7a9mhc1giy3bzn56aiwrs8dpydqngplbjq9xdg";
   };
 
-  patches = [ ./CVE-2015-1283.patch ];
-
   outputs = [ "dev" "out" ]; # TODO: fix referrers
   outputBin = "dev";
 
@@ -17,6 +15,10 @@ stdenv.mkDerivation rec {
 
   outputMan = "dev"; # tiny page for a dev tool
 
+  patches = [ ./CVE-2015-1283-refix.patch ./CVE-2016-0718-v2-2-1.patch ];
+
+  doCheck = true;
+
   meta = with stdenv.lib; {
     homepage = http://www.libexpat.org/;
     description = "A stream-oriented XML parser library written in C";