@@ -6,13 +6,13 @@
66, javahlBindings ? false
77, saslSupport ? false
88, lib, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc
9−, apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
9+, apacheHttpd ? null, expat, swig ? null, jdk ? null, python3 ? null, py3c ? null, perl ? null
1010, sasl ? null, serf ? null
1111}:
1212
1313assert bdbSupport -> aprutil.bdbSupport;
1414assert httpServer -> apacheHttpd != null;
15−assert pythonBindings -> swig != null && python != null;
15+assert pythonBindings -> swig != null && python3 != null && py3c != null;
1616assert javahlBindings -> jdk != null && perl != null;
1717
1818let
@@ -31,7 +31,7 @@ let
3131
3232 buildInputs = [ zlib apr aprutil sqlite openssl lz4 utf8proc ]
3333 ++ lib.optional httpSupport serf
34− ++ lib.optional pythonBindings python
34+ ++ lib.optionals pythonBindings [ python3 py3c ]
3535 ++ lib.optional perlBindings perl
3636 ++ lib.optional saslSupport sasl;
3737
@@ -91,7 +91,7 @@ let
9191
9292 enableParallelBuilding = true;
9393
94− checkInputs = [ python ];
94+ checkInputs = [ python3 ];
9595 doCheck = false; # fails 10 out of ~2300 tests
9696
9797 meta = with lib; {
@@ -116,8 +116,7 @@ in {
116116 };
117117
118118 subversion = common {
119− version = "1.12.2";
120− sha256 = "0wgpw3kzsiawzqk4y0xgh1z93kllxydgv4lsviim45y5wk4bbl1v";
121− extraPatches = [ ./CVE-2020-17525.patch ];
119+ version = "1.14.1";
120+ sha256 = "1ag1hvcm9q92kgalzbbgcsq9clxnzmbj9nciz9lmabjx4lyajp9c";
122121 };
123122}