Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-02-07 06:16:10 +00:00
committed by GitHub
19 changed files with 452 additions and 347 deletions
+2
View File
@@ -4895,6 +4895,8 @@ in {
inherit (pkgs.libsForQt5) soqt;
};
pixelmatch = callPackage ../development/python-modules/pixelmatch { };
pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkg-config; };
pkginfo = callPackage ../development/python-modules/pkginfo { };