summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-06-03 00:33:11 +0200
committersternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-06-03 00:35:41 +0200
commit29a8095f13ee51d706731a30a96f023947892a6e (patch)
tree8ba1d2ab746a06db31341c343f0871d3c4070a65
parenthaskellPackages.cabal2nix-unstable: update to latest version from github (diff)
downloadnixpkgs-29a8095f13ee51d706731a30a96f023947892a6e.tar.gz
hackage-packages.nix: Regenerate based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh Main point here is to apply the new cabal2nix-unstable generation with a libNixName entry for libXScrnSaver, so greenclip builds again.
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 95399b7ba502..bf083d390f7b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -41557,7 +41557,7 @@ self: {
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {wlc = null;};
+ }) {inherit (pkgs) wlc;};
"bindings-yices" = callPackage
({ mkDerivation, base, gmp, yices }:
@@ -110752,9 +110752,9 @@ self: {
"greenclip" = callPackage
({ mkDerivation, base, binary, bytestring, directory, exceptions
- , hashable, libXau, microlens, microlens-mtl, protolude, text
- , tomland, unix, vector, wordexp, X11, xcb, xdmcp, xlibsWrapper
- , xscrnsaver
+ , hashable, libXau, libXScrnSaver, microlens, microlens-mtl
+ , protolude, text, tomland, unix, vector, wordexp, X11, xcb, xdmcp
+ , xlibsWrapper
}:
mkDerivation {
pname = "greenclip";
@@ -110767,14 +110767,14 @@ self: {
microlens-mtl protolude text tomland unix vector wordexp X11
];
executablePkgconfigDepends = [
- libXau xcb xdmcp xlibsWrapper xscrnsaver
+ libXau libXScrnSaver xcb xdmcp xlibsWrapper
];
description = "Simple clipboard manager to be integrated with rofi";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null;
- inherit (pkgs) xlibsWrapper; xscrnsaver = null;};
+ }) {inherit (pkgs.xorg) libXScrnSaver; inherit (pkgs.xorg) libXau;
+ xcb = null; xdmcp = null; inherit (pkgs) xlibsWrapper;};
"greg-client" = callPackage
({ mkDerivation, base, binary, bytestring, clock, hostname, network
@@ -280222,7 +280222,7 @@ self: {
description = "Haskell bindings for the wlc library";
license = lib.licenses.isc;
hydraPlatforms = lib.platforms.none;
- }) {wlc = null;};
+ }) {inherit (pkgs) wlc;};
"wobsurv" = callPackage
({ mkDerivation, aeson, attoparsec, base-prelude, bytestring