diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index d503463858f7..cf4335115863 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2022-10-22"; + version = "unstable-2022-12-08"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/bf7cc8f202e332953f7fbfc1d90490e4c197d287.tar.gz"; - sha256 = "0fmpfl2nl215aids9yxdmdik77w7cppk900rnx23m07rmwg4xa4f"; + url = "https://github.com/NixOS/cabal2nix/archive/021a48f4b4942462154b06fd81429a248638f87f.tar.gz"; + sha256 = "1is1q5mqi86vzy3ni2959hr95gs9hwd5wiz92hanfli3infg00xc"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e5d166ff2821..d05b0f0fda55 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1,4 +1,4 @@ -/* hackage-packages.nix is an auto-generated file -- DO NOT EDIT! */ +/* hackage-packages.nix is auto-generated by hackage2nix -- DO NOT EDIT MANUALLY! */ { pkgs, lib, callPackage }: @@ -112146,8 +112146,8 @@ self: { "gi-xlib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - , xlibsWrapper + , haskell-gi-base, haskell-gi-overloading, libX11, text + , transformers }: mkDerivation { pname = "gi-xlib"; @@ -112158,10 +112158,10 @@ self: { base bytestring containers haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ xlibsWrapper ]; + libraryPkgconfigDepends = [ libX11 ]; description = "xlib bindings"; license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) xlibsWrapper;}; + }) {inherit (pkgs.xorg) libX11;}; "giak" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers @@ -119428,9 +119428,8 @@ self: { "greenclip" = callPackage ({ mkDerivation, base, binary, bytestring, directory, exceptions - , hashable, libXau, libXScrnSaver, microlens, microlens-mtl + , hashable, libX11, libXau, libXScrnSaver, microlens, microlens-mtl , protolude, text, tomland, unix, vector, wordexp, X11, xcb, xdmcp - , xlibsWrapper }: mkDerivation { pname = "greenclip"; @@ -119443,13 +119442,13 @@ self: { microlens-mtl protolude text tomland unix vector wordexp X11 ]; executablePkgconfigDepends = [ - libXau libXScrnSaver xcb xdmcp xlibsWrapper + libX11 libXau libXScrnSaver xcb xdmcp ]; description = "Simple clipboard manager to be integrated with rofi"; license = lib.licenses.bsd3; mainProgram = "greenclip"; - }) {inherit (pkgs.xorg) libXScrnSaver; inherit (pkgs.xorg) libXau; - xcb = null; xdmcp = null; inherit (pkgs) xlibsWrapper;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; + inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null;}; "greg-client" = callPackage ({ mkDerivation, base, binary, bytestring, clock, hostname, network @@ -120695,16 +120694,16 @@ self: { }) {}; "gtk-traymanager" = callPackage - ({ mkDerivation, base, glib, gtk3, xlibsWrapper }: + ({ mkDerivation, base, glib, gtk3, libX11 }: mkDerivation { pname = "gtk-traymanager"; version = "1.0.1"; sha256 = "0vc1gwhg5l7l5iqb1i3zwd1bsy8fxsiwkwzza7j15zi07f97k7di"; libraryHaskellDepends = [ base glib gtk3 ]; - libraryPkgconfigDepends = [ xlibsWrapper ]; + libraryPkgconfigDepends = [ libX11 ]; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) xlibsWrapper;}; + }) {inherit (pkgs.xorg) libX11;}; "gtk2hs-buildtools" = callPackage ({ mkDerivation, alex, array, base, Cabal, containers, directory