Merge branch 'master' into staging-next

2020-11-05 09:42:47 +01:00
parent 8a95871193 79b173c358
commit a821be7531
106 changed files with 1203 additions and 794 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 { };