about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-09-17 08:41:06 +0200
committerVladimír Čunát <vcunat@gmail.com>2017-09-17 10:35:39 +0200
commitf6763a4561ccc8178f6ae8371e4cd1f1b92e892f (patch)
tree066d306445fb4357f8ca106ba12b39b9a7aa5d9e /pkgs/development
parent90059701a836b0d0dbc676e2d1ce417cc5a25bd2 (diff)
parent604ca931827df78cd6d603f0771eb72c73aed86c (diff)
downloadnixlib-f6763a4561ccc8178f6ae8371e4cd1f1b92e892f.tar
nixlib-f6763a4561ccc8178f6ae8371e4cd1f1b92e892f.tar.gz
nixlib-f6763a4561ccc8178f6ae8371e4cd1f1b92e892f.tar.bz2
nixlib-f6763a4561ccc8178f6ae8371e4cd1f1b92e892f.tar.lz
nixlib-f6763a4561ccc8178f6ae8371e4cd1f1b92e892f.tar.xz
nixlib-f6763a4561ccc8178f6ae8371e4cd1f1b92e892f.tar.zst
nixlib-f6763a4561ccc8178f6ae8371e4cd1f1b92e892f.zip
Merge #29431: libxml2: 2.9.4 -> 2.9.5
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/libxml2/default.nix13
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 370572956726..28b6faa436aa 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -10,22 +10,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "libxml2-${version}";
-  version = "2.9.4";
+  version = "2.9.5";
 
   src = fetchurl {
     url = "http://xmlsoft.org/sources/${name}.tar.gz";
-    sha256 = "0g336cr0bw6dax1q48bblphmchgihx9p1pjmxdnrd6sh3qci3fgz";
+    sha256 = "0f6d5nkvcfx8yqis2dwrnv6qaj0nhiifz49y657vmrwwxvnc2ca0";
   };
 
-  patches = [
-    (fetchpatch {
-      # Contains fixes for CVE-2016-{4658,5131} and other bugs.
-      name = "misc.patch";
-      url = "https://git.gnome.org/browse/libxml2/patch/?id=e905f081&id2=v2.9.4";
-      sha256 = "14rnzilspmh92bcpwbd6kqikj36gx78al42ilgpqgl1609krb5m5";
-    })
-  ];
-
   outputs = [ "bin" "dev" "out" "man" "doc" ]
     ++ lib.optional pythonSupport "py";
   propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py";