summary refs log tree commit diff
path: root/pkgs/development/libraries/expat/default.nix
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2017-08-21 04:10:42 -0400
committerRobert Helgesson <robert@rycee.net>2017-08-21 10:42:52 +0200
commit4ab93f82364c741c2abc705c1f09618f4e77cec4 (patch)
tree2c90bc18b3a6fd9e330625b35fc71275eb730f01 /pkgs/development/libraries/expat/default.nix
parent04cd1db2b76d275dfd06920787ed200e92e7d2d9 (diff)
downloadnixpkgs-4ab93f82364c741c2abc705c1f09618f4e77cec4.tar
nixpkgs-4ab93f82364c741c2abc705c1f09618f4e77cec4.tar.gz
nixpkgs-4ab93f82364c741c2abc705c1f09618f4e77cec4.tar.bz2
nixpkgs-4ab93f82364c741c2abc705c1f09618f4e77cec4.tar.lz
nixpkgs-4ab93f82364c741c2abc705c1f09618f4e77cec4.tar.xz
nixpkgs-4ab93f82364c741c2abc705c1f09618f4e77cec4.tar.zst
nixpkgs-4ab93f82364c741c2abc705c1f09618f4e77cec4.zip
expat: 2.2.3 -> 2.2.4
Diffstat (limited to 'pkgs/development/libraries/expat/default.nix')
-rw-r--r--pkgs/development/libraries/expat/default.nix19
1 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 0a2deab796b..6533997de2f 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,33 +1,26 @@
 { stdenv, fetchpatch, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "expat-2.2.3";
+  name = "expat-2.2.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/expat/${name}.tar.bz2";
-    sha256 = "0pyfma0sv4vif17kfv7xh2l2hl6skgw266a9cwm00p7q0bxr065k";
+    sha256 = "17h1fb9zvqvf0sr78j211bngc6jpql5wzar8fg9b52jzjvdqbb83";
   };
 
   outputs = [ "out" "dev" ]; # TODO: fix referrers
   outputBin = "dev";
 
-  patches = [
-    (fetchpatch {
-      name = "fix-aarch-build.patch";
-      url = "https://github.com/libexpat/libexpat/commit/d98d4399174fd6f71d70e7bd89993a0e7346753d.patch";
-      sha256 = "0z89wb4mzyf7vvl6kbflk5w1z7yc39jwvs3mkznin5agj34x063w";
-      stripLen = 1;
-      excludes = [ "coverage.sh" ];
-    })
-  ];
-
   configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
 
   outputMan = "dev"; # tiny page for a dev tool
 
   doCheck = true;
 
-  preCheck = "patchShebangs ./run.sh";
+  preCheck = ''
+    patchShebangs ./run.sh
+    patchShebangs ./test-driver-wrapper.sh
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://www.libexpat.org/;