diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 036afbed5990..7ee869b53c35 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, python +, python3 , pkg-config , readline , tdb @@ -16,49 +16,40 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "1.3.3"; + version = "2.1.1"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - sha256 = "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b"; + sha256 = "jO+y8l/KkT+hinktDvsDrwf4f1uVGkze0DD1uY8lx7A="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config + python3 wafHook + libxslt + docbook-xsl-nons + docbook_xml_dtd_42 ]; buildInputs = [ - python - readline + python3 + readline # required to build python tdb talloc tevent popt - libxslt - docbook-xsl-nons - docbook_xml_dtd_42 cmocka ]; - patches = [ - # CVE-2019-3824 - # downloading the patch from debian as they have ported the patch from samba to ldb but otherwise is identical to - # https://bugzilla.samba.org/attachment.cgi?id=14857 - (fetchurl { - name = "CVE-2019-3824.patch"; - url = "https://sources.debian.org/data/main/l/ldb/2:1.1.27-1+deb9u1/debian/patches/CVE-2019-3824-master-v4-5-02.patch"; - sha256 = "1idnqckvjh18rh9sbq90rr4sxfviha9nd1ca9pd6lai0y6r6q4yd"; - }) - ]; - wafPath = "buildtools/bin/waf"; wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" + "--without-ldb-lmdb" ]; stripDebugList = "bin lib modules"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72a76af34036..7aa7435916bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12341,9 +12341,7 @@ in ldacbt = callPackage ../development/libraries/ldacbt { }; - ldb = callPackage ../development/libraries/ldb { - python = python2; - }; + ldb = callPackage ../development/libraries/ldb { }; lensfun = callPackage ../development/libraries/lensfun {};