diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-09-28 17:14:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-09-28 17:14:09 +0200 |
| commit | 8e7c388edc3cc92f51c82e2be706b405a4ae23ad (patch) | |
| tree | 410324caa8b972521d8a109ab2da254ef8848dfd /pkgs/development | |
| parent | 77604964b695c3fba644684198a4c1f3bf8f607d (diff) | |
| parent | 06d8dd3ed406dab462b6c9d0afc56060e06c3f74 (diff) | |
| download | nixlib-8e7c388edc3cc92f51c82e2be706b405a4ae23ad.tar nixlib-8e7c388edc3cc92f51c82e2be706b405a4ae23ad.tar.gz nixlib-8e7c388edc3cc92f51c82e2be706b405a4ae23ad.tar.bz2 nixlib-8e7c388edc3cc92f51c82e2be706b405a4ae23ad.tar.lz nixlib-8e7c388edc3cc92f51c82e2be706b405a4ae23ad.tar.xz nixlib-8e7c388edc3cc92f51c82e2be706b405a4ae23ad.tar.zst nixlib-8e7c388edc3cc92f51c82e2be706b405a4ae23ad.zip | |
Merge #19041: libxslt: 1.1.28 -> 1.1.29
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/libxslt/default.nix | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index f1b69447fac5..2afbfc2fe997 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,27 +1,14 @@ { stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs }: stdenv.mkDerivation rec { - name = "libxslt-1.1.28"; + name = "libxslt-1.1.29"; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; - sha256 = "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz"; + sha256 = "1klh81xbm9ppzgqk339097i39b7fnpmlj8lzn8bpczl3aww6x5xm"; }; - patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch - ++ stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt") - (fetchpatch { - name = "mingw.patch"; - url = "http://git.gnome.org/browse/libxslt/patch/?id=ab5810bf27cd63"; - sha256 = "0kkqq3fv2k3q86al38vp6zwxazpvp5kslcjnmrq4ax5cm2zvsjk3"; - }) - ++ [ - (fetchpatch { - name = "CVE-2015-7995.patch"; - url = "http://git.gnome.org/browse/libxslt/patch/?id=7ca19df892ca22"; - sha256 = "1xzg0q94dzbih9nvqp7g9ihz0a3qb0w23l1158m360z9smbi8zbd"; - }) - ]; + patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch; outputs = [ "bin" "dev" "out" "doc" ]; |