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: 06cc00ac5270
Choose a base ref
...
head repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7ccbd668d1f9
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 22, 2018

  1. PostProcess.hs: Cabal 2.2.0.1 has undeclared setup dependencies 

    NixOS/nixpkgs#41939
haskell/cabal#5391
    @peti
    peti committed Jun 22, 2018
    Copy the full SHA
    7ccbd66 View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs
1 change: 1 addition & 0 deletions src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs
View file
Original file line number Diff line number Diff line change
@@ -43,6 +43,7 @@ hooks =
, ("bindings-lxc", over (metaSection . platforms) (Set.filter (\(Platform _ os) -> os == Linux))) , ("bustle", set (libraryDepends . pkgconfig . contains "system-glib = pkgs.glib") True)
, ("bustle", set (libraryDepends . pkgconfig . contains "system-glib = pkgs.glib") True)
, ("Cabal", set doCheck False) -- test suite doesn't work in Nix
, ("Cabal >2.2", over (setupDepends . haskell) (Set.union (Set.fromList [bind "self.mtl", bind "self.parsec"]))) -- https://github.com/haskell/cabal/issues/5391
, ("cabal-helper", set doCheck False) -- https://github.com/DanielG/cabal-helper/issues/17
, ("cabal-install", set doCheck False . set phaseOverrides cabalInstallPostInstall)
, ("darcs", set phaseOverrides darcsInstallPostInstall . set doCheck False)