Merge staging-next into staging

2021-03-30 18:15:09 +00:00
parent 17a7be16a1 f555f95ed8
commit 01b3d1558f
353 changed files with 2868 additions and 1956 deletions
@@ -6069,7 +6069,9 @@ in {

  pyosf = callPackage ../development/python-modules/pyosf { };

-  pyosmium = callPackage ../development/python-modules/pyosmium { };
+  pyosmium = callPackage ../development/python-modules/pyosmium {
+    inherit (pkgs) lz4;
+  };

  pyotp = callPackage ../development/python-modules/pyotp { };