@@ -148,7 +148,8 @@ hooks =
148148 , ("numeric-qq", set doCheck False) -- test suite doesn't finish even after 1+ days
149149 , ("opencv", opencvOverrides)
150150 , ("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
151− , ("pandoc", pandocOverrides)
151+ , ("pandoc < 2.6", pandocPre26Overrides)
152+ , ("pandoc >= 2.6", pandocOverrides)
152153 , ("pandoc-citeproc", set doCheck False) -- https://github.com/jgm/pandoc-citeproc/issues/369
153154 , ("purescript", set doCheck False) -- test suite doesn't cope with Nix build env
154155 , ("proto-lens-protobuf-types", set (libraryDepends . tool . contains (pkg "protobuf")) True)
@@ -383,11 +384,20 @@ gtkglextHook = over (libraryDepends . system) (Set.union (Set.fromList deps))
383384 , "pkgs.xorg.libXmu"
384385 ]
385386
386−pandocOverrides :: Derivation -> Derivation
387−pandocOverrides = set phaseOverrides postInstall
387+pandocPre26Overrides :: Derivation -> Derivation
388+pandocPre26Overrides = set phaseOverrides postInstall
388389 where
389390 postInstall = unlines [ "postInstall = ''"
390391 , " mkdir -p $out/share"
391392 , " mv $data/*/*/man $out/share/"
392393 , "'';"
393394 ]
395+
396+pandocOverrides :: Derivation -> Derivation
397+pandocOverrides = set phaseOverrides postInstall
398+ where
399+ postInstall = unlines [ "postInstall = ''"
400+ , " mkdir -p $out/share/man/man1"
401+ , " mv \"man/\"*.1 $out/share/man/man1/"
402+ , "'';"
403+ ]