From e394e96c51cc7a2858145e710fbedbb2cb57f6ec Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 4 Jan 2024 16:31:42 +0100 Subject: [PATCH] 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. --- .../Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs b/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs index 9b71779e7..665577654 100644 --- a/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs +++ b/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs @@ -152,7 +152,7 @@ hooks = , ("opencv", opencvOverrides) , ("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 , ("pandoc < 2.6", pandocPre26Overrides) - , ("pandoc >= 2.6", pandocOverrides) + , ("pandoc >= 2.6 && < 3.1.10", pandocPre3110Overrides) -- https://github.com/jgm/pandoc/commit/55227a20273267c236ec039c3e6559287a1dca45 , ("pandoc-citeproc", set doCheck False) -- https://github.com/jgm/pandoc-citeproc/issues/369 , ("purescript", set doCheck False) -- test suite doesn't cope with Nix build env , ("proto-lens-protobuf-types", set (libraryDepends . tool . contains (pkg "protobuf")) True) @@ -389,8 +389,8 @@ pandocPre26Overrides = set phaseOverrides postInstall , "'';" ] -pandocOverrides :: Derivation -> Derivation -pandocOverrides = set phaseOverrides postInstall +pandocPre3110Overrides :: Derivation -> Derivation +pandocPre3110Overrides = set phaseOverrides postInstall where postInstall = unlines [ "postInstall = ''" , " mkdir -p $out/share/man/man1"