Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2021-03-18 13:35:59 +01:00
206 changed files with 3936 additions and 1371 deletions

View File

@@ -3148,6 +3148,8 @@ in {
hug = callPackage ../development/python-modules/hug { };
huggingface-hub = callPackage ../development/python-modules/huggingface-hub { };
humanfriendly = callPackage ../development/python-modules/humanfriendly { };
humanize = callPackage ../development/python-modules/humanize { };
@@ -7348,7 +7350,7 @@ in {
salmon-mail = callPackage ../development/python-modules/salmon-mail { };
sane = callPackage ../development/python-modules/sane {
inherit (pkgs) saneBackends;
inherit (pkgs) sane-backends;
};
sampledata = callPackage ../development/python-modules/sampledata { };