summary refs log tree commit diff
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2022-02-20 19:29:41 +0100
committersternenseemann <sternenseemann@systemli.org>2022-02-20 19:29:41 +0100
commitb0c612766821c65eaa9a9f296547acef9a63755e (patch)
treede9af5190505b3a841e0172cb0c0fa61200b7286
parent3f9aa37aa25877804d57223d8fa5898946370cca (diff)
downloadnixpkgs-b0c612766821c65eaa9a9f296547acef9a63755e.tar
nixpkgs-b0c612766821c65eaa9a9f296547acef9a63755e.tar.gz
nixpkgs-b0c612766821c65eaa9a9f296547acef9a63755e.tar.bz2
nixpkgs-b0c612766821c65eaa9a9f296547acef9a63755e.tar.lz
nixpkgs-b0c612766821c65eaa9a9f296547acef9a63755e.tar.xz
nixpkgs-b0c612766821c65eaa9a9f296547acef9a63755e.tar.zst
nixpkgs-b0c612766821c65eaa9a9f296547acef9a63755e.zip
pandoc: drop obsolete patch
The linked pull request has since been merged and included with the
pandoc version we are shipping now (from stackage nightly).
-rw-r--r--pkgs/development/tools/pandoc/default.nix26
1 files changed, 9 insertions, 17 deletions
diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix
index a61f39c15b6..e587a2ef4e7 100644
--- a/pkgs/development/tools/pandoc/default.nix
+++ b/pkgs/development/tools/pandoc/default.nix
@@ -8,24 +8,7 @@ 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=";
-      })
-    ];
-  }) static).overrideAttrs (drv: {
 
-    # These libraries are still referenced, because they generate
-    # a `Paths_*` module for figuring out their version.
-    # The `Paths_*` module is generated by Cabal, and contains the
-    # version, but also paths to e.g. the data directories, which
-    # lead to a transitive runtime dependency on the whole GHC distribution.
-    # This should ideally be fixed in haskellPackages (or even Cabal),
-    # but a minimal pandoc is important enough to patch it manually.
-    disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.HTTP ];
     postInstall = drv.postInstall or "" + ''
       remove-references-to \
         -t ${haskellPackages.pandoc-types} \
@@ -34,4 +17,13 @@ in
         -t ${haskellPackages.HTTP} \
         $out/bin/pandoc
     '';
+  }) static).overrideAttrs (drv: {
+    # These libraries are still referenced, because they generate
+    # a `Paths_*` module for figuring out their version.
+    # The `Paths_*` module is generated by Cabal, and contains the
+    # version, but also paths to e.g. the data directories, which
+    # lead to a transitive runtime dependency on the whole GHC distribution.
+    # This should ideally be fixed in haskellPackages (or even Cabal),
+    # but a minimal pandoc is important enough to patch it manually.
+    disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.HTTP ];
   })