Merge branch 'master' into staging-next

2021-06-26 00:33:58 +02:00
parent bae6b2055f 6845a74d4c
commit d6234c2165
111 changed files with 1069 additions and 420 deletions
--- a/pkgs/development/python-modules/bitarray/default.nix
+++ b/pkgs/development/python-modules/bitarray/default.nix
@@ -1,4 +1,8 @@
-{ lib, buildPythonPackage, fetchPypi, python }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+}:

 buildPythonPackage rec {
  pname = "bitarray";