Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-11-21 08:43:46 +01:00
129 changed files with 5263 additions and 10739 deletions
+8 -3
View File
@@ -1989,6 +1989,8 @@ in {
Fabric = callPackage ../development/python-modules/Fabric { };
fabulous = callPackage ../development/python-modules/fabulous { };
facebook-sdk = callPackage ../development/python-modules/facebook-sdk { };
face = callPackage ../development/python-modules/face { };
@@ -2369,6 +2371,8 @@ in {
getmac = callPackage ../development/python-modules/getmac { };
getkey = callPackage ../development/python-modules/getkey { };
gevent = callPackage ../development/python-modules/gevent { };
geventhttpclient = callPackage ../development/python-modules/geventhttpclient { };
@@ -3547,8 +3551,6 @@ in {
lockfile = callPackage ../development/python-modules/lockfile { };
locustio = callPackage ../development/python-modules/locustio { };
Logbook = callPackage ../development/python-modules/Logbook { };
logfury = callPackage ../development/python-modules/logfury { };
@@ -4358,7 +4360,10 @@ in {
paperspace = callPackage ../development/python-modules/paperspace { };
paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { };
openpaperwork-core = callPackage ../applications/office/paperwork/openpaperwork-core.nix { };
openpaperwork-gtk = callPackage ../applications/office/paperwork/openpaperwork-gtk.nix { };
paperwork-backend = callPackage ../applications/office/paperwork/paperwork-backend.nix { };
paperwork-shell = callPackage ../applications/office/paperwork/paperwork-shell.nix { };
papis = callPackage ../development/python-modules/papis { };