Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-02-06 00:35:48 +00:00
committed by GitHub
78 changed files with 2066 additions and 1290 deletions
+6
View File
@@ -1960,6 +1960,8 @@ in {
dpkt = callPackage ../development/python-modules/dpkt { };
drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { };
drf-yasg = callPackage ../development/python-modules/drf-yasg { };
drms = callPackage ../development/python-modules/drms { };
@@ -2087,6 +2089,8 @@ in {
inherit (pkgs.darwin.apple_sdk.frameworks) Security;
};
etebase-server = callPackage ../servers/etebase { };
etesync = callPackage ../development/python-modules/etesync { };
eth-hash = callPackage ../development/python-modules/eth-hash { };
@@ -5930,6 +5934,8 @@ in {
pyslurm = callPackage ../development/python-modules/pyslurm { slurm = pkgs.slurm; };
pysma = callPackage ../development/python-modules/pysma { };
pysmb = callPackage ../development/python-modules/pysmb { };
pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkg-config; };