Skip to content

Commit

Permalink
docbook-xsl: apply Debian/Fedora patch to fix issues
Browse files Browse the repository at this point in the history
Our samba now got hit by that bug: https://hydra.nixos.org/build/68373563
  • Loading branch information
vcunat committed Jan 29, 2018
1 parent 303d5b1 commit 15c471e
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, findXMLCatalogs, writeScriptBin, ruby, bash }:
{ lib, stdenv, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash }:

let

Expand All @@ -10,6 +10,14 @@ 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";
})];

propagatedBuildInputs = [ findXMLCatalogs ];

dontBuild = true;
Expand Down

1 comment on commit 15c471e

@vcunat
Copy link
Member Author

@vcunat vcunat commented on 15c471e Jan 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I think I pushed a different commit than I wanted. I promise to fix this in several hours.

Please sign in to comment.