summary refs log tree commit diff
path: root/pkgs/development/libraries/libxml2
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2019-11-10 20:51:04 +0000
committerRobert Scott <code@humanleg.org.uk>2019-11-11 01:18:39 +0000
commitc3c77ecfded84bf8106cf24f5abe2ba4009f6b34 (patch)
treec5598231a3561905fdc60419dd847ed2e7867811 /pkgs/development/libraries/libxml2
parent119b1b630d35f1c2d4ee42225ce2226facbfe962 (diff)
downloadnixpkgs-c3c77ecfded84bf8106cf24f5abe2ba4009f6b34.tar
nixpkgs-c3c77ecfded84bf8106cf24f5abe2ba4009f6b34.tar.gz
nixpkgs-c3c77ecfded84bf8106cf24f5abe2ba4009f6b34.tar.bz2
nixpkgs-c3c77ecfded84bf8106cf24f5abe2ba4009f6b34.tar.lz
nixpkgs-c3c77ecfded84bf8106cf24f5abe2ba4009f6b34.tar.xz
nixpkgs-c3c77ecfded84bf8106cf24f5abe2ba4009f6b34.tar.zst
nixpkgs-c3c77ecfded84bf8106cf24f5abe2ba4009f6b34.zip
libxml2: 2.9.9 -> 2.9.10
disable python test which was previously failing anyway, but in previous
versions it was being ignored
Diffstat (limited to 'pkgs/development/libraries/libxml2')
-rw-r--r--pkgs/development/libraries/libxml2/default.nix10
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 7ed50f61224..f5dcb3357f7 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libxml2";
-  version = "2.9.9";
+  version = "2.9.10";
 
   src = fetchurl {
     url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz";
-    sha256 = "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl";
+    sha256 = "07xynh8hcxb2yb1fs051xrgszjvj37wnxvxgsj10rzmqzy9y3zma";
   };
   patches = [
     # Upstream bugs:
@@ -53,6 +53,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # disable test that's problematic with newer pythons: see
+  # https://mail.gnome.org/archives/xml/2017-August/msg00014.html
+  preCheck = lib.optionalString (pythonSupport && !(python?pythonOlder && python.pythonOlder "3.5")) ''
+    echo "" > python/tests/tstLastError.py
+  '';
+
   doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin &&
     stdenv.hostPlatform.libc != "musl";