Merge master into staging-next

2019-01-03 20:07:35 +01:00
parent 092e3b50a8 4b5b8850d8
commit 2da31b80bb
82 changed files with 403 additions and 294 deletions
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5151,6 +5151,8 @@ in {

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

+  casttube = callPackage ../development/python-modules/casttube { };
+
 });

 in fix' (extends overrides packages)