From cead5384d87d4f702034c468c03624354e025cfe Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 26 Apr 2021 19:57:58 +0000 Subject: [PATCH 1/3] pythonPackages.lmdb: don't depend on ludios_wpull This makes no sense and yet was added in 65eccfad5d32328d12cf8b42d02560905a8c9bae This was breaking the build of python3Packages.lmdb because ludios_wpull does not build on 3.8, only 3.7. --- pkgs/development/python-modules/lmdb/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index fc7748765f31..6980ddcb010a 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -4,7 +4,6 @@ , pytestCheckHook , cffi , lmdb -, ludios_wpull }: buildPythonPackage rec { @@ -18,8 +17,6 @@ buildPythonPackage rec { buildInputs = [ lmdb ]; - propogatedBuildInputs = [ ludios_wpull ]; - checkInputs = [ cffi pytestCheckHook ]; LMDB_FORCE_SYSTEM=1; From 96dacf13c629db8d6e628f60167939a5f5b93a61 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 26 Apr 2021 19:59:28 +0000 Subject: [PATCH 2/3] pythonPackages.lmdb: 1.1.1 -> 1.2.1 --- pkgs/development/python-modules/lmdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index 6980ddcb010a..3e78626238a7 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "lmdb"; - version = "1.1.1"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "165cd1669b29b16c2d5cc8902b90fede15a7ee475c54d466f1444877a3f511ac"; + sha256 = "5f76a90ebd08922acca11948779b5055f7a262687178e9e94f4e804b9f8465bc"; }; buildInputs = [ lmdb ]; From 687563983352b3b40a59f7fb857e8d843769ee60 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 26 Apr 2021 20:29:03 +0000 Subject: [PATCH 3/3] lmdb: 0.9.28 -> 0.9.29 This has a fix for https://bugs.openldap.org/show_bug.cgi?id=9461, thus fixing pythonPackages.lmdb: https://github.com/jnwatson/py-lmdb/issues/278 --- pkgs/development/libraries/lmdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 229e82c323aa..d8d034b04b77 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "lmdb"; - version = "0.9.28"; + version = "0.9.29"; src = fetchgit { url = "https://git.openldap.org/openldap/openldap.git"; rev = "LMDB_${version}"; - sha256 = "012a8bs49cswsnzw7k4piis5b6dn4by85w7a7mai9i04xcjyy9as"; + sha256 = "0airps4cd0d91nbgy7hgvifa801snxwxzwxyr6pdv61plsi7h8l3"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";