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).
This commit is contained in:
parent
3f9aa37aa2
commit
b0c6127668
|
@ -8,24 +8,7 @@ in
|
||||||
configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
|
configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
|
||||||
buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed];
|
buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed];
|
||||||
buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ];
|
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 "" + ''
|
postInstall = drv.postInstall or "" + ''
|
||||||
remove-references-to \
|
remove-references-to \
|
||||||
-t ${haskellPackages.pandoc-types} \
|
-t ${haskellPackages.pandoc-types} \
|
||||||
|
@ -34,4 +17,13 @@ in
|
||||||
-t ${haskellPackages.HTTP} \
|
-t ${haskellPackages.HTTP} \
|
||||||
$out/bin/pandoc
|
$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 ];
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue