Skip to content

Commit e394e96

Browse files
cabal2nix: don't emit man postInstall script for pandoc >= 3.1.10
The man page was moved from the pandoc release tarball to the pandoc-cli tar ball. We'll just stop emitting this postInstall portion as soon as the pandoc release tar ball no longer has the man page files. Instead we'll just manually have this code in nixpkgs as an override, so we are slowly working towards #504.
1 parent 5551800 commit e394e96

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs

+3-3
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ hooks =
152152
, ("opencv", opencvOverrides)
153153
, ("pandoc >= 1.16.0.2 && < 2.5", set doCheck False) -- https://github.com/jgm/pandoc/issues/2709 and https://github.com/fpco/stackage/issues/1332
154154
, ("pandoc < 2.6", pandocPre26Overrides)
155-
, ("pandoc >= 2.6", pandocOverrides)
155+
, ("pandoc >= 2.6 && < 3.1.10", pandocPre3110Overrides) -- https://github.com/jgm/pandoc/commit/55227a20273267c236ec039c3e6559287a1dca45
156156
, ("pandoc-citeproc", set doCheck False) -- https://github.com/jgm/pandoc-citeproc/issues/369
157157
, ("purescript", set doCheck False) -- test suite doesn't cope with Nix build env
158158
, ("proto-lens-protobuf-types", set (libraryDepends . tool . contains (pkg "protobuf")) True)
@@ -389,8 +389,8 @@ pandocPre26Overrides = set phaseOverrides postInstall
389389
, "'';"
390390
]
391391

392-
pandocOverrides :: Derivation -> Derivation
393-
pandocOverrides = set phaseOverrides postInstall
392+
pandocPre3110Overrides :: Derivation -> Derivation
393+
pandocPre3110Overrides = set phaseOverrides postInstall
394394
where
395395
postInstall = unlines [ "postInstall = ''"
396396
, " mkdir -p $out/share/man/man1"

0 commit comments

Comments
 (0)