Merge branch 'master' into staging-next

This commit is contained in:
Martin Weinelt
2021-04-15 01:01:26 +02:00
committed by GitHub
60 changed files with 979 additions and 274 deletions
+6
View File
@@ -1367,6 +1367,8 @@ in {
clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash {};
clickhouse-cli = callPackage ../development/python-modules/clickhouse-cli { };
clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver {};
cliff = callPackage ../development/python-modules/cliff { };
@@ -4478,6 +4480,8 @@ in {
graphvizPkgs = pkgs.graphviz;
};
oci = callPackage ../development/python-modules/oci { };
od = callPackage ../development/python-modules/od { };
odfpy = callPackage ../development/python-modules/odfpy { };
@@ -7651,6 +7655,8 @@ in {
sympy = callPackage ../development/python-modules/sympy { };
systembridge = callPackage ../development/python-modules/systembridge { };
systemd = callPackage ../development/python-modules/systemd {
inherit (pkgs) systemd;
};