Merge master into staging

2020-11-04 23:57:57 +01:00
parent cc30c161ee 8201f4f6fd
commit 1a5556867e
61 changed files with 925 additions and 701 deletions
@@ -6654,10 +6654,6 @@ in {

  smpplib = callPackage ../development/python-modules/smpplib { };

-  smugline = callPackage ../development/python-modules/smugline { };
-
-  smugpy = callPackage ../development/python-modules/smugpy { };
-
  snack = toPythonModule (pkgs.newt.override { inherit (self) python; });

  snakebite = callPackage ../development/python-modules/snakebite { };