Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-05-03 12:26:48 +00:00
committed by GitHub
54 changed files with 5375 additions and 722 deletions
+5 -1
View File
@@ -615,6 +615,8 @@ in {
autograd = callPackage ../development/python-modules/autograd { };
autoit-ripper = callPackage ../development/python-modules/autoit-ripper { };
autologging = callPackage ../development/python-modules/autologging { };
automat = callPackage ../development/python-modules/automat { };
@@ -3565,6 +3567,8 @@ in {
karton-asciimagic = callPackage ../development/python-modules/karton-asciimagic { };
karton-autoit-ripper = callPackage ../development/python-modules/karton-autoit-ripper { };
karton-classifier = callPackage ../development/python-modules/karton-classifier { };
karton-config-extractor = callPackage ../development/python-modules/karton-config-extractor { };
@@ -5077,7 +5081,7 @@ in {
poolsense = callPackage ../development/python-modules/poolsense { };
poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 {
inherit (pkgs.qt5) qtbase;
inherit (pkgs.qt5) qtbase qmake;
inherit (pkgs.libsForQt5) poppler;
};