Merge pull request #120785 from ivan/fix-grab-site-py-lmdb

This commit is contained in:
Martin Weinelt 2021-04-30 02:16:14 +02:00 committed by GitHub
commit 9a88ed723e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lmdb"; pname = "lmdb";
version = "0.9.28"; version = "0.9.29";
src = fetchgit { src = fetchgit {
url = "https://git.openldap.org/openldap/openldap.git"; url = "https://git.openldap.org/openldap/openldap.git";
rev = "LMDB_${version}"; rev = "LMDB_${version}";
sha256 = "012a8bs49cswsnzw7k4piis5b6dn4by85w7a7mai9i04xcjyy9as"; sha256 = "0airps4cd0d91nbgy7hgvifa801snxwxzwxyr6pdv61plsi7h8l3";
}; };
postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";

View File

@ -4,22 +4,19 @@
, pytestCheckHook , pytestCheckHook
, cffi , cffi
, lmdb , lmdb
, ludios_wpull
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "lmdb"; pname = "lmdb";
version = "1.1.1"; version = "1.2.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "165cd1669b29b16c2d5cc8902b90fede15a7ee475c54d466f1444877a3f511ac"; sha256 = "5f76a90ebd08922acca11948779b5055f7a262687178e9e94f4e804b9f8465bc";
}; };
buildInputs = [ lmdb ]; buildInputs = [ lmdb ];
propogatedBuildInputs = [ ludios_wpull ];
checkInputs = [ cffi pytestCheckHook ]; checkInputs = [ cffi pytestCheckHook ];
LMDB_FORCE_SYSTEM=1; LMDB_FORCE_SYSTEM=1;