Merge branch 'staging-next' into staging

2020-08-23 02:18:27 +02:00
parent 728f8e21d4 91104b5417
commit 58377555ed
516 changed files with 15983 additions and 9551 deletions
--- a/pkgs/development/python-modules/maxminddb/default.nix
+++ b/pkgs/development/python-modules/maxminddb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, pythonAtLeast
+{ stdenv, lib, buildPythonPackage, pythonOlder, pythonAtLeast
 , fetchPypi
 , libmaxminddb
 , ipaddress
@@ -9,6 +9,7 @@
 buildPythonPackage rec {
  version = "2.0.2";
  pname = "maxminddb";
+  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;