Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-02-02 00:42:42 +00:00
committed by GitHub
56 changed files with 585 additions and 184 deletions
+4 -6
View File
@@ -931,14 +931,10 @@ in {
binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { };
binwalk = callPackage ../development/python-modules/binwalk {
pyqtgraph = null;
matplotlib = null;
};
binwalk = callPackage ../development/python-modules/binwalk { };
binwalk-full = appendToName "full" (self.binwalk.override {
pyqtgraph = self.pyqtgraph;
matplotlib = self.matplotlib;
visualizationSupport = true;
});
biopython = callPackage ../development/python-modules/biopython { };
@@ -1488,6 +1484,8 @@ in {
credstash = callPackage ../development/python-modules/credstash { };
criticality-score = callPackage ../development/python-modules/criticality-score { };
croniter = callPackage ../development/python-modules/croniter { };
cryptacular = callPackage ../development/python-modules/cryptacular { };