Merge pull request #53149 from jtojnar/qrencode-cleanup

qrencode: merge with libqrencode
This commit is contained in:
Jan Tojnar
2019-01-02 02:18:22 +01:00
committed by GitHub
13 changed files with 66 additions and 76 deletions

View File

@@ -171338,7 +171338,7 @@ self: {
"qr-imager" = callPackage
({ mkDerivation, base, binary, bytestring, cryptonite, directory
, haskell-qrencode, hspec, jose-jwt, JuicyPixels, libqrencode
, haskell-qrencode, hspec, jose-jwt, JuicyPixels, qrencode
, microlens, process, split, vector
}:
mkDerivation {
@@ -171349,12 +171349,12 @@ self: {
base binary bytestring cryptonite directory haskell-qrencode
jose-jwt JuicyPixels microlens process split vector
];
libraryPkgconfigDepends = [ libqrencode ];
libraryPkgconfigDepends = [ qrencode ];
testHaskellDepends = [ base hspec ];
description = "Library to generate images";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libqrencode;};
}) {inherit (pkgs) qrencode;};
"qr-repa" = callPackage
({ mkDerivation, aeson, base, bytestring, cryptonite, directory