Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0622e877f1b2
Choose a base ref
...
head repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a16f8c94d3ee
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 27, 2018

  1. pandoc: add post-process hook to move the man pages into the right lo… 

    …cation

Fixes NixOS/nixpkgs#50325.
    @peti
    peti committed Nov 27, 2018
    3
    Copy the full SHA
    a16f8c9 View commit details
Showing with 10 additions and 1 deletion.
  1. +10 −1 src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs
11 changes: 10 additions & 1 deletion src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs
View file
Original file line number Diff line number Diff line change
@@ -148,7 +148,7 @@ hooks =
, ("numeric-qq", set doCheck False) -- test suite doesn't finish even after 1+ days
, ("opencv", opencvOverrides)
, ("pandoc >= 1.16.0.2", set doCheck False) -- https://github.com/jgm/pandoc/issues/2709 and https://github.com/fpco/stackage/issues/1332
, ("pandoc", set jailbreak False) -- jailbreak-cabal break the build
, ("pandoc", pandocOverrides)
, ("pandoc-citeproc", set doCheck False) -- https://github.com/jgm/pandoc-citeproc/issues/172
, ("purescript", set doCheck False) -- test suite doesn't cope with Nix build env
, ("proto-lens-protobuf-types", set (libraryDepends . tool . contains (pkg "protobuf")) True)
@@ -381,3 +381,12 @@ gtkglextHook = over (libraryDepends . system) (Set.union (Set.fromList deps))
, "pkgs.xorg.libXt"
, "pkgs.xorg.libXmu"
]

pandocOverrides :: Derivation -> Derivation
pandocOverrides = set phaseOverrides postInstall
where
postInstall = unlines [ "postInstall = ''"
, " mkdir -p $out/share"
, " mv $data/*/*/man $out/share/"
, "'';"
]