public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #125433 from sternenseemann/greenclip-fix

Browse Source 
[21.05] haskellPackages.greenclip: unbreak
This commit is contained in:
Dennis Gosnell 2021-06-03 09:30:14 +09:00 committed by GitHub
commit e5e05cd00f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/haskell-modules/cabal2nix-unstable.nix
View File

@ -8,10 +8,10 @@
}: }:
mkDerivation { mkDerivation {
pname = "cabal2nix"; pname = "cabal2nix";
version = "unstable-2021-05-06"; version = "unstable-2021-05-28";
src = fetchzip { src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/b598bc4682b0827554b5780acdd6f948d320283b.tar.gz"; url = "https://github.com/NixOS/cabal2nix/archive/5fb325e094af91328e02cc2ecfd211feaeb135a7.tar.gz";
sha256 = "04afm56cyhj2l41cvq4z11k92jjchr21a8vg9pjaz438pma7jgw1"; sha256 = "1zbd336s99rgk24yjqlp012d0f66s5nf190sjmsl7mfhqx9j2y4l";
}; };
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;

1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View File

@ -1675,7 +1675,6 @@ broken-packages:
- grasp - grasp
- gray-code - gray-code
- greencard - greencard
- greenclip
- greg-client - greg-client
- gremlin-haskell - gremlin-haskell
- Grempa - Grempa

18
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -41557,7 +41557,7 @@ self: {
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none; hydraPlatforms = lib.platforms.none;
broken = true; broken = true;
}) {wlc = null;}; }) {inherit (pkgs) wlc;};
"bindings-yices" = callPackage "bindings-yices" = callPackage
({ mkDerivation, base, gmp, yices }: ({ mkDerivation, base, gmp, yices }:
@ -110752,9 +110752,9 @@ self: {
"greenclip" = callPackage "greenclip" = callPackage
({ mkDerivation, base, binary, bytestring, directory, exceptions ({ mkDerivation, base, binary, bytestring, directory, exceptions
, hashable, libXau, microlens, microlens-mtl, protolude, text , hashable, libXau, libXScrnSaver, microlens, microlens-mtl
, tomland, unix, vector, wordexp, X11, xcb, xdmcp, xlibsWrapper , protolude, text, tomland, unix, vector, wordexp, X11, xcb, xdmcp
, xscrnsaver , xlibsWrapper
}: }:
mkDerivation { mkDerivation {
pname = "greenclip"; pname = "greenclip";
@ -110767,14 +110767,12 @@ self: {
microlens-mtl protolude text tomland unix vector wordexp X11 microlens-mtl protolude text tomland unix vector wordexp X11
]; ];
executablePkgconfigDepends = [ executablePkgconfigDepends = [
libXau xcb xdmcp xlibsWrapper xscrnsaver libXau libXScrnSaver xcb xdmcp xlibsWrapper
]; ];
description = "Simple clipboard manager to be integrated with rofi"; description = "Simple clipboard manager to be integrated with rofi";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none; }) {inherit (pkgs.xorg) libXScrnSaver; inherit (pkgs.xorg) libXau;
broken = true; xcb = null; xdmcp = null; inherit (pkgs) xlibsWrapper;};
}) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null;
inherit (pkgs) xlibsWrapper; xscrnsaver = null;};
"greg-client" = callPackage "greg-client" = callPackage
({ mkDerivation, base, binary, bytestring, clock, hostname, network ({ mkDerivation, base, binary, bytestring, clock, hostname, network
@ -280222,7 +280220,7 @@ self: {
description = "Haskell bindings for the wlc library"; description = "Haskell bindings for the wlc library";
license = lib.licenses.isc; license = lib.licenses.isc;
hydraPlatforms = lib.platforms.none; hydraPlatforms = lib.platforms.none;
}) {wlc = null;}; }) {inherit (pkgs) wlc;};
"wobsurv" = callPackage "wobsurv" = callPackage
({ mkDerivation, aeson, attoparsec, base-prelude, bytestring ({ mkDerivation, aeson, attoparsec, base-prelude, bytestring