mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 05:00:16 +00:00
Merge #19041: libxslt: 1.1.28 -> 1.1.29
This commit is contained in:
commit
8e7c388edc
|
@ -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" ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue