summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-07-12 18:01:03 +0000
committerGitHub <noreply@github.com>2021-07-12 18:01:03 +0000
commit266cb48e6549ecec997b929c22b77006dcc250cb (patch)
tree2c76970de66fe5b97af2f584857cdac60c4cff5d /pkgs/development/tools
parent56d22e36bdf23020e3b67bcf532d3f186ae0b1a1 (diff)
parent4d8858a949ddd029d8ba35d8f64ff537a7b2ac5f (diff)
downloadnixpkgs-266cb48e6549ecec997b929c22b77006dcc250cb.tar
nixpkgs-266cb48e6549ecec997b929c22b77006dcc250cb.tar.gz
nixpkgs-266cb48e6549ecec997b929c22b77006dcc250cb.tar.bz2
nixpkgs-266cb48e6549ecec997b929c22b77006dcc250cb.tar.lz
nixpkgs-266cb48e6549ecec997b929c22b77006dcc250cb.tar.xz
nixpkgs-266cb48e6549ecec997b929c22b77006dcc250cb.tar.zst
nixpkgs-266cb48e6549ecec997b929c22b77006dcc250cb.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/pandoc/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix
index 4f65d5fa5db..7c286218d8e 100644
--- a/pkgs/development/tools/pandoc/default.nix
+++ b/pkgs/development/tools/pandoc/default.nix
@@ -8,6 +8,14 @@ in
     configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
     buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed];
     buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ];
+    patches = (drv.patches or []) ++ [
+      # Support citerefentry DocBook element.
+      # https://github.com/jgm/pandoc/pull/7437
+      (fetchpatch {
+        url = "https://github.com/jgm/pandoc/commit/06408d08e5ccf06a6a04c9b77470e6a67d98e52c.patch";
+        sha256 = "gOtrWVylzwgu0YLD4SztqlXxtaXXGOf8nTqLwUBS7qs=";
+      })
+    ];
   })).overrideAttrs (drv: {
 
     # These libraries are still referenced, because they generate