git.iko.soy/typeable/cabal2nix
on master help sign in
Update name mapping and resolver lists to cope with disappeared aliases.

See https://github.com/NixOS/cabal2nix/pull/411#issuecomment-469747125 and following comments for details.

commit50125218b2a2bdafe6bbebf28626b85e73900d51 authorPeter Simons <simons@cryp.to> dateTue 5 Mar 2019, 21:01 (8 years ago) parent87c9b8d
2 files changed+7−5
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/FromCabal.hs+1−1 src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+6−4
src/Distribution/Nixpkgs/Haskell/FromCabal.hs+1−1
@@ -139,7 +139,7 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
139139 | i == "gtk2" = binding # (i, path # ["pkgs","gtk2"]) -- TODO: these cases should not be necessary
140140 | i == "gtk3" = binding # (i, path # ["pkgs","gtk3"])
141141 | i == "gtksourceview3" = binding # (i, path # ["pkgs","gtksourceview3"])
142− | i == "vte_291" = binding # (i, path # ["pkgs","vte"])
142+ | i == "vte_291" = binding # (i, path # ["pkgs","vte"])
143143 | Just p <- nixpkgsResolver i, init (view (reference . path) p) `Set.member` goodScopes = p
144144 | otherwise = bindNull i
145145
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+6−4
@@ -55,7 +55,7 @@ libNixName "GL" = return "libGL"
5555libNixName "GLU" = ["libGLU","libGL"]
5656libNixName "glut" = ["freeglut","libGLU","libGL"]
5757libNixName "gnome-keyring" = return "gnome-keyring"
58−libNixName "gnome-keyring-1" = return "libgnome_keyring"
58+libNixName "gnome-keyring-1" = return "libgnome-keyring"
5959libNixName "gnome-vfs-2.0" = return "gnome-vfs"
6060libNixName "gnome-vfs-module-2.0" = return "gnome-vfs_module"
6161libNixName "gobject-2.0" = return "glib"
@@ -84,8 +84,8 @@ libNixName "ImageMagick" = return "imagemagick"
8484libNixName "Imlib2" = return "imlib2"
8585libNixName "iw" = return "wirelesstools"
8686libNixName "jack" = return "libjack2"
87−libNixName "javascriptcoregtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that.
88−libNixName "javascriptcoregtk-4.0" = return "webkitgtk" -- This is the current API, so let it reference an alias for the latest version.
87+libNixName "javascriptcoregtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that.
88+libNixName "javascriptcoregtk-4.0" = return "webkit" -- I have no clue whether this is correct or not.
8989libNixName "jpeg" = return "libjpeg"
9090libNixName "jvm" = return "jdk"
9191libNixName "lapack" = return "liblapack"
@@ -94,6 +94,7 @@ libNixName "ldap" = return "openldap"
9494libNixName "libavutil" = return "ffmpeg"
9595libNixName "libgsasl" = return "gsasl"
9696libNixName "libpcre" = return "pcre"
97+libNixName "libqrencode" = return "qrencode"
9798libNixName "libR" = return "R"
9899libNixName "libsoup-gnome-2.4" = return "libsoup"
99100libNixName "libsystemd" = return "systemd"
@@ -153,7 +154,8 @@ libNixName "wayland-client" = return "wayland"
153154libNixName "wayland-cursor" = return "wayland"
154155libNixName "wayland-egl" = return "libGL"
155156libNixName "wayland-server" = return "wayland"
156−libNixName "webkit2gtk-4.0" = return "webkitgtk" -- This is the current API, so let it reference an alias for the latest version.
157+libNixName "webkit2gtk" = return "webkit"
158+libNixName "webkit2gtk-4.0" = return "webkit"
157159libNixName "webkit2gtk-web-extension-4.0" = return "webkitgtk-web-extension" -- This package doesn't actually exist in nixpkgs at present.
158160libNixName "webkitgtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that
159161libNixName "X11" = return "libX11"