Merge staging-next into staging

2021-02-03 12:22:13 +00:00
parent 7e55500f54 aff7220211
commit 8ab0b85ead
23 changed files with 159 additions and 100 deletions
@@ -3479,6 +3479,8 @@ in {

  keyrings-alt = callPackage ../development/python-modules/keyrings-alt { };

+  keystone-engine = callPackage ../development/python-modules/keystone-engine { };
+
  keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; };

  kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { python3 = python; }).src);