b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

docbook-xsl-ns: "revert" after parent commit

Browse source 
I didn't realize I was redefining two derivations at once.
This commit is contained in:
Vladimír Čunát 2018-01-30 19:49:44 +01:00
parent 15c471e444
commit e851d53cea
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
View file

@ -2,7 +2,7 @@
let
common = { pname, sha256 }: let self = stdenv.mkDerivation rec {
common = { pname, sha256, patches ? [] }: let self = stdenv.mkDerivation rec {
name = "${pname}-1.79.1";
src = fetchurl {
@ -10,13 +10,7 @@ let
inherit sha256;
};
patches = [(fetchpatch {
name = "potential-infinite-template-recursion.patch";
url = "https://src.fedoraproject.org/cgit/rpms/docbook-style-xsl.git/"
+ "plain/docbook-style-xsl-non-recursive-string-subst.patch?id=bf9e5d16fd";
sha256 = "1pfb468bsj3j879ip0950waih0r1s6rzfbm2p70glbz0g3903p7h";
stripLen = "1";
})];
inherit patches;
propagatedBuildInputs = [ findXMLCatalogs ];
@ -52,6 +46,15 @@ in {
docbook_xsl = common {
pname = "docbook-xsl";
sha256 = "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj";
patches = [(fetchpatch {
name = "potential-infinite-template-recursion.patch";
url = "https://src.fedoraproject.org/cgit/rpms/docbook-style-xsl.git/"
+ "plain/docbook-style-xsl-non-recursive-string-subst.patch?id=bf9e5d16fd";
sha256 = "1pfb468bsj3j879ip0950waih0r1s6rzfbm2p70glbz0g3903p7h";
stripLen = "1";
})];
};
docbook_xsl_ns = common {