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

Commits on Aug 26, 2018

  1. yaml: work around incomplete dependency specification in upstream Cab… 

    …al file

Fixes #372.
    @peti
    peti committed Aug 26, 2018
    Copy the full SHA
    db540bc 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
@@ -171,6 +171,7 @@ hooks =
, ("wxcore", set (libraryDepends . pkgconfig . contains (pkg "wxGTK")) True)
, ("X11", over (libraryDepends . system) (Set.union (Set.fromList $ map bind ["pkgs.xorg.libXinerama","pkgs.xorg.libXext","pkgs.xorg.libXrender","pkgs.xorg.libXScrnSaver"])))
, ("xmonad >= 0.14.2", set phaseOverrides xmonadPostInstall)
, ("yaml", set (libraryDepends . system . contains (pkg "libyaml")) True)
, ("zip-archive < 0.3.1", over (testDepends . tool) (replace (self "zip") (pkg "zip")))
, ("zip-archive >= 0.3.1 && < 0.3.2.3", over (testDepends . tool) (Set.union (Set.fromList [pkg "zip", pkg "unzip"]))) -- https://github.com/jgm/zip-archive/issues/35
]