Merge master into staging-next
This commit is contained in:
@@ -910,7 +910,7 @@ in {
|
||||
|
||||
blockdiag = callPackage ../development/python-modules/blockdiag { };
|
||||
|
||||
blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { };
|
||||
blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29
|
||||
|
||||
block-io = callPackage ../development/python-modules/block-io { };
|
||||
|
||||
@@ -2757,6 +2757,8 @@ in {
|
||||
|
||||
hiyapyco = callPackage ../development/python-modules/hiyapyco { };
|
||||
|
||||
hjson = callPackage ../development/python-modules/hjson { };
|
||||
|
||||
hkdf = callPackage ../development/python-modules/hkdf { };
|
||||
|
||||
hmmlearn = callPackage ../development/python-modules/hmmlearn { };
|
||||
@@ -2896,6 +2898,8 @@ in {
|
||||
|
||||
ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { };
|
||||
|
||||
ifcopenshell = callPackage ../development/python-modules/ifcopenshell { };
|
||||
|
||||
ignite = callPackage ../development/python-modules/ignite { };
|
||||
|
||||
ihatemoney = callPackage ../development/python-modules/ihatemoney { };
|
||||
@@ -7893,6 +7897,8 @@ in {
|
||||
phantomjsSupport = false;
|
||||
};
|
||||
|
||||
youtube-dlc = callPackage ../development/python-modules/youtube-dlc { };
|
||||
|
||||
yowsup = callPackage ../development/python-modules/yowsup { };
|
||||
|
||||
yq = callPackage ../development/python-modules/yq { };
|
||||
|
||||
Reference in New Issue
Block a user