Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-02-27 18:16:41 +00:00
committed by GitHub
45 changed files with 550 additions and 223 deletions
+14
View File
@@ -2808,6 +2808,8 @@ in {
graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { inherit (pkgs) pkg-config; };
graphtage = callPackage ../development/python-modules/graphtage { };
graphviz = callPackage ../development/python-modules/graphviz { inherit (pkgs) graphviz; };
grappelli_safe = callPackage ../development/python-modules/grappelli_safe { };
@@ -3377,6 +3379,8 @@ in {
jsmin = callPackage ../development/python-modules/jsmin { };
json5 = callPackage ../development/python-modules/json5 { };
jsondate = callPackage ../development/python-modules/jsondate { };
jsondiff = callPackage ../development/python-modules/jsondiff { };
@@ -5325,6 +5329,8 @@ in {
pycdio = callPackage ../development/python-modules/pycdio { };
pycec = callPackage ../development/python-modules/pycec { };
pycfdns = callPackage ../development/python-modules/pycfdns { };
pychannels = callPackage ../development/python-modules/pychannels { };
@@ -6095,6 +6101,8 @@ in {
inherit (pkgs) bash subversion apr aprutil expat neon openssl;
};
pyswitchbot = callPackage ../development/python-modules/pyswitchbot { };
pysychonaut = callPackage ../development/python-modules/pysychonaut { };
pysyncobj = callPackage ../development/python-modules/pysyncobj { };
@@ -6313,6 +6321,8 @@ in {
python3-openid = callPackage ../development/python-modules/python3-openid { };
python-awair = callPackage ../development/python-modules/python-awair { };
python-axolotl = callPackage ../development/python-modules/python-axolotl { };
python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { };
@@ -7288,6 +7298,8 @@ in {
simplegeneric = callPackage ../development/python-modules/simplegeneric { };
simplehound = callPackage ../development/python-modules/simplehound { };
simplejson = callPackage ../development/python-modules/simplejson { };
simplekml = callPackage ../development/python-modules/simplekml { };
@@ -8041,6 +8053,8 @@ in {
twine = callPackage ../development/python-modules/twine { };
twinkly-client = callPackage ../development/python-modules/twinkly-client { };
twisted = callPackage ../development/python-modules/twisted { };
twitch-python = callPackage ../development/python-modules/twitch-python { };