From eb09b1fd856e7346d60188b2df64fdfe758c2fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 15 Sep 2015 12:53:48 +0200 Subject: [PATCH] hackage-packages: revert the xlib renaming changes The file is generated anyway. @peti: is there an easy way to make the generator use different attribute names? (But this case isn't important at all.) --- .../haskell-modules/hackage-packages.nix | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3e85e7374ef..f9f628dab60 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5309,7 +5309,7 @@ self: { description = "A Haskell binding for GLFW"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; "GLFW-OGL" = callPackage ({ mkDerivation, base, libX11, libXrandr, mtl, OGL }: @@ -5323,7 +5323,7 @@ self: { description = "A binding for GLFW (OGL)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXrandr;}; "GLFW-b" = callPackage ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework @@ -5388,7 +5388,7 @@ self: { description = "Open OpenGL context windows in X11 with libX11"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; "GLMatrix" = callPackage ({ mkDerivation, base, OpenGLRaw }: @@ -6903,7 +6903,7 @@ self: { license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; - inherit (pkgs.xorg) libX11;}; + inherit (pkgs.xlibs) libX11;}; "HGamer3D-SFML-Binding" = callPackage ({ mkDerivation, base, hg3dsfml050, HGamer3D-Data, sfml-audio @@ -16518,9 +16518,9 @@ self: { homepage = "https://github.com/haskell-pkg-janitors/X11"; description = "A binding to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; - inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; - inherit (pkgs.xorg) libXrender;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; + inherit (pkgs.xlibs) libXinerama; inherit (pkgs.xlibs) libXrandr; + inherit (pkgs.xlibs) libXrender;}; "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: @@ -16536,7 +16536,7 @@ self: { description = "Missing bindings to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libX11;}; + }) {inherit (pkgs.xlibs) libX11;}; "X11-rm" = callPackage ({ mkDerivation, base, X11 }: @@ -16588,7 +16588,7 @@ self: { libraryPkgconfigDepends = [ libXft ]; description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts"; license = "LGPL"; - }) {inherit (pkgs.xorg) libXft;}; + }) {inherit (pkgs.xlibs) libXft;}; "X11-xshape" = callPackage ({ mkDerivation, base, X11 }: @@ -16625,7 +16625,7 @@ self: { description = "Bindings for the DirectX XInput library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) xinput;}; + }) {inherit (pkgs.xlibs) xinput;}; "XMMS" = callPackage ({ mkDerivation, base, containers, xmmsclient, xmmsclient-glib }: @@ -16693,7 +16693,7 @@ self: { libraryPkgconfigDepends = [ libXau ]; description = "A binding to the X11 authentication library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libXau;}; + }) {inherit (pkgs.xlibs) libXau;}; "Xec" = callPackage ({ mkDerivation, base, binary, bytestring, cairo, containers @@ -22017,7 +22017,7 @@ self: { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; - }) {inherit (pkgs.xorg) libXScrnSaver;}; + }) {inherit (pkgs.xlibs) libXScrnSaver;}; "archive" = callPackage ({ mkDerivation, base, bytestring, debian, debian-mirror, directory @@ -26520,10 +26520,10 @@ self: { jailbreak = true; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; - inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; - inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; - inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXcursor; + inherit (pkgs.xlibs) libXext; inherit (pkgs.xlibs) libXfixes; + inherit (pkgs.xlibs) libXi; inherit (pkgs.xlibs) libXinerama; + inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; inherit (pkgs) mesa;}; "bindings-K8055" = callPackage @@ -60530,13 +60530,13 @@ self: { }) {}; "gtk-traymanager" = callPackage - ({ mkDerivation, base, glib, gtk, xlibsWrapper }: + ({ mkDerivation, base, glib, gtk, x11 }: mkDerivation { pname = "gtk-traymanager"; version = "0.1.5"; sha256 = "1582e229aafe22cf5499fe1519e2ff4f49cecbe83a6eb1a8de04f45dd44df443"; libraryHaskellDepends = [ base glib gtk ]; - libraryPkgconfigDepends = [ xlibsWrapper ]; + libraryPkgconfigDepends = [ x11 ]; homepage = "http://github.com/travitch/gtk-traymanager"; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; @@ -71956,7 +71956,7 @@ self: { description = "Core library for hoodle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXi;}; "hoodle-extra" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base @@ -101655,7 +101655,7 @@ self: { description = "Oculus Rift ffi providing head tracking data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXinerama; inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;}; "oeis" = callPackage @@ -123173,7 +123173,7 @@ self: { description = "A programming language for simple GUIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libXft;}; + }) {inherit (pkgs.xlibs) libXft;}; "singleton-nats" = callPackage ({ mkDerivation, base, singletons }: @@ -145274,7 +145274,7 @@ self: { description = "wxHaskell C++ wrapper"; license = "unknown"; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; "wxcore" = callPackage @@ -145435,7 +145435,7 @@ self: { description = "Haskell FFI bindings for X11 XInput library (-lXi)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libXi;}; + }) {inherit (pkgs.xlibs) libXi;}; "x509" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base @@ -146584,8 +146584,8 @@ self: { description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {Xrender = null; inherit (pkgs.xorg) libXpm; - inherit (pkgs.xorg) libXrandr; inherit (pkgs) wirelesstools;}; + }) {Xrender = null; inherit (pkgs.xlibs) libXpm; + inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;}; "xmonad" = callPackage ({ mkDerivation, base, containers, directory, extensible-exceptions @@ -147043,7 +147043,7 @@ self: { librarySystemDepends = [ libXtst ]; description = "Thin FFI bindings to X11 XTest library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libXtst;}; + }) {inherit (pkgs.xlibs) libXtst;}; "xturtle" = callPackage ({ mkDerivation, base, convertible, Imlib, setlocale, X11, X11-xft