Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2020-10-22 21:20:14 +02:00
103 changed files with 820 additions and 463 deletions
+10
View File
@@ -774,6 +774,8 @@ in {
bap = callPackage ../development/python-modules/bap { bap = pkgs.ocaml-ng.ocamlPackages_4_07.bap; };
baron = callPackage ../development/python-modules/baron { };
base58 = callPackage ../development/python-modules/base58 { };
baselines = callPackage ../development/python-modules/baselines { };
@@ -4364,6 +4366,8 @@ in {
pathtools = callPackage ../development/python-modules/pathtools { };
patool = callPackage ../development/python-modules/patool { };
patsy = callPackage ../development/python-modules/patsy { };
paver = callPackage ../development/python-modules/paver { };
@@ -5259,6 +5263,8 @@ in {
pyparted = callPackage ../development/python-modules/pyparted { };
pypblib = callPackage ../development/python-modules/pypblib { };
pypcap = callPackage ../development/python-modules/pypcap { };
pypdf2 = callPackage ../development/python-modules/pypdf2 { };
@@ -5835,6 +5841,8 @@ in {
python-rtmidi = callPackage ../development/python-modules/python-rtmidi { };
python-sat = callPackage ../development/python-modules/python-sat { };
python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat { };
python_simple_hipchat = self.python-simple-hipchat;
@@ -6104,6 +6112,8 @@ in {
recommonmark = callPackage ../development/python-modules/recommonmark { };
redbaron = callPackage ../development/python-modules/redbaron { };
redis = callPackage ../development/python-modules/redis { };
rednose = callPackage ../development/python-modules/rednose { };