git.iko.soy/typeable/cabal2nix
on master help sign in
yaml: 'system-libyaml' support is broken in versions prior to 0.10.1.1
67e3189Peter Simons
src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+1−1
compare with master
unifiedsplit
@@ -56,7 +56,7 @@ configureCabalFlags' (PackageIdentifier name version)
56 | name == "snap-server" = [enable "openssl"]
56 | name == "snap-server" = [enable "openssl"]
57 | name == "xmobar" = [enable "with_alsa", enable "with_conduit", enable "with_datezone", enable "with_dbus", enable "with_inotify", enable "with_iwlib", enable "with_mpd", enable "with_mpris", enable "with_rtsopts", enable "with_threaded", enable "with_utf8", enable "with_uvmeter", enable "with_weather", enable "with_xft", enable "with_xpm"]
57 | name == "xmobar" = [enable "with_alsa", enable "with_conduit", enable "with_datezone", enable "with_dbus", enable "with_inotify", enable "with_iwlib", enable "with_mpd", enable "with_mpris", enable "with_rtsopts", enable "with_threaded", enable "with_utf8", enable "with_uvmeter", enable "with_weather", enable "with_xft", enable "with_xpm"]
58 | name == "xmonad-extras" = [disable "with_hlist", enable "with_split", enable "with_parsec"]
58 | name == "xmonad-extras" = [disable "with_hlist", enable "with_split", enable "with_parsec"]
59− | name == "yaml" = [enable "system-libyaml"]
59+ | name == "yaml" = [("system-libyaml", version >= "0.10.1.1")]
60 | name == "yi" = [enable "pango", enable "vty"]
60 | name == "yi" = [enable "pango", enable "vty"]
61 | otherwise = []
61 | otherwise = []
62
62
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+1
@@ -172,6 +172,7 @@ libNixName "Xrender" = return "libXrender"
172libNixName "Xss" = return "libXScrnSaver"
172libNixName "Xss" = return "libXScrnSaver"
173libNixName "Xtst" = return "libXtst"
173libNixName "Xtst" = return "libXtst"
174libNixName "Xxf86vm" = return "libXxf86vm"
174libNixName "Xxf86vm" = return "libXxf86vm"
175+libNixName "yaml" = return "libyaml"
175libNixName "yaml-0.1" = return "libyaml"
176libNixName "yaml-0.1" = return "libyaml"
176libNixName "z" = return "zlib"
177libNixName "z" = return "zlib"
177libNixName "zmq" = return "zeromq"
178libNixName "zmq" = return "zeromq"
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs−1
@@ -171,7 +171,6 @@ hooks =
171 , ("wxcore", set (libraryDepends . pkgconfig . contains (pkg "wxGTK")) True)
171 , ("wxcore", set (libraryDepends . pkgconfig . contains (pkg "wxGTK")) True)
172 , ("X11", over (libraryDepends . system) (Set.union (Set.fromList $ map bind ["pkgs.xorg.libXinerama","pkgs.xorg.libXext","pkgs.xorg.libXrender","pkgs.xorg.libXScrnSaver"])))
172 , ("X11", over (libraryDepends . system) (Set.union (Set.fromList $ map bind ["pkgs.xorg.libXinerama","pkgs.xorg.libXext","pkgs.xorg.libXrender","pkgs.xorg.libXScrnSaver"])))
173 , ("xmonad >= 0.14.2", set phaseOverrides xmonadPostInstall)
173 , ("xmonad >= 0.14.2", set phaseOverrides xmonadPostInstall)
174− , ("yaml", set (libraryDepends . system . contains (pkg "libyaml")) True)
175 , ("zip-archive < 0.3.1", over (testDepends . tool) (replace (self "zip") (pkg "zip")))
174 , ("zip-archive < 0.3.1", over (testDepends . tool) (replace (self "zip") (pkg "zip")))
176 , ("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
175 , ("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
177 ]
176 ]