git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #280 from mdorman/master
5c18fb5Peter Simons
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+2−2
compare with master
unifiedsplit
@@ -143,8 +143,8 @@ libNixName "wayland-cursor" = return "wayland"
143libNixName "wayland-egl" = return "mesa"
143libNixName "wayland-egl" = return "mesa"
144libNixName "wayland-server" = return "wayland"
144libNixName "wayland-server" = return "wayland"
145-- These are the old APIs, of which 2.4 is the last provider, so map directly to that
145-- These are the old APIs, of which 2.4 is the last provider, so map directly to that
146−libNixName "javascriptcoregtk-3.0" = return "webkitgtk24x"
146+libNixName "javascriptcoregtk-3.0" = return "webkitgtk24x-gtk3"
147−libNixName "webkitgtk-3.0" = return "webkitgtk24x"
147+libNixName "webkitgtk-3.0" = return "webkitgtk24x-gtk3"
148-- This is the current API, so let it reference an alias for the latest version
148-- This is the current API, so let it reference an alias for the latest version
149libNixName "javascriptcoregtk-4.0" = return "webkitgtk"
149libNixName "javascriptcoregtk-4.0" = return "webkitgtk"
150libNixName "webkit2gtk-4.0" = return "webkitgtk"
150libNixName "webkit2gtk-4.0" = return "webkitgtk"