Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát
2019-01-02 17:19:23 +01:00
89 changed files with 1089 additions and 847 deletions

View File

@@ -5139,6 +5139,14 @@ in {
importlib-resources = callPackage ../development/python-modules/importlib-resources {};
srptools = callPackage ../development/python-modules/srptools { };
curve25519-donna = callPackage ../development/python-modules/curve25519-donna { };
pyatv = callPackage ../development/python-modules/pyatv { };
pybotvac = callPackage ../development/python-modules/pybotvac { };
});
in fix' (extends overrides packages)