@@ -1,43 +1,69 @@
11{ stdenv
2+, lib
23, buildPythonPackage
34, fetchurl
4−, pkgs
55, isPy3k
66, python
7+, apr
8+, aprutil
9+, bash
10+, e2fsprogs
11+, expat
12+, gcc
13+, glibcLocales
14+, neon
15+, openssl
16+, pycxx
17+, subversion
718}:
819
920buildPythonPackage rec {
1021 pname = "pysvn";
11− version = "1.8.0";
12− disabled = isPy3k;
22+ version = "1.9.12";
1323 format = "other";
1424
1525 src = fetchurl {
1626 url = "http://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz";
17− sha256 = "0srjr2qgxfs69p65d9vvdib2lc142x10w8afbbdrqs7dhi46yn9r";
27+ sha256 = "sRPa4wNyjDmGdF1gTOgLS0pnrdyZwkkH4/9UCdh/R9Q=";
1828 };
1929
20− buildInputs = [ pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ]
21− ++ (if stdenv.isLinux then [pkgs.e2fsprogs] else []);
30+ buildInputs = [ bash subversion apr aprutil expat neon openssl ]
31+ ++ lib.optionals stdenv.isLinux [ e2fsprogs ]
32+ ++ lib.optionals stdenv.isDarwin [ gcc ];
2233
23− # There seems to be no way to pass that path to configure.
24− NIX_CFLAGS_COMPILE="-I${pkgs.aprutil.dev}/include/apr-1";
34+ postPatch = ''
35+ sed -i "117s|append(|insert(0, |" Tests/benchmark_diff.py
36+ '';
2537
2638 preConfigure = ''
2739 cd Source
2840 ${python.interpreter} setup.py backport
2941 ${python.interpreter} setup.py configure \
30− --apr-inc-dir=${pkgs.apr.dev}/include \
31− --apu-inc-dir=${pkgs.aprutil.dev}/include \
32− --apr-lib-dir=${pkgs.apr.out}/lib \
33− --svn-lib-dir=${pkgs.subversion.out}/lib \
34− --svn-bin-dir=${pkgs.subversion.out}/bin \
35− --svn-root-dir=${pkgs.subversion.dev}
36− '' + (if !stdenv.isDarwin then "" else ''
42+ --apr-inc-dir=${apr.dev}/include \
43+ --apu-inc-dir=${aprutil.dev}/include \
44+ --pycxx-dir=${pycxx.dev}/include \
45+ --svn-inc-dir=${subversion.dev}/include/subversion-1 \
46+ --pycxx-src-dir=${pycxx.dev}/src \
47+ --apr-lib-dir=${apr.out}/lib \
48+ --svn-lib-dir=${subversion.out}/lib \
49+ --svn-bin-dir=${subversion.out}/bin
50+ '' + (lib.optionalString (stdenv.isDarwin && !isPy3k) ''
3751 sed -i -e 's|libpython2.7.dylib|lib/libpython2.7.dylib|' Makefile
3852 '');
3953
40− checkPhase = "make -C ../Tests";
54+ checkInputs = [ glibcLocales ];
55+ checkPhase = ''
56+ runHook preCheck
57+
58+ # It is not only shebangs, some tests also write scripts dynamically
59+ # so it is easier to simply search and replace
60+ sed -i "s|/bin/bash|${bash}/bin/bash|" ../Tests/test-*.sh
61+ make -C ../Tests
62+
63+ runHook postCheck
64+ '';
65+
66+ pythonImportCheck = [ "pysvn" ];
4167
4268 installPhase = ''
4369 dest=$(toPythonPath $out)/pysvn
@@ -45,15 +71,14 @@ buildPythonPackage rec {
4571 cp pysvn/__init__.py $dest/
4672 cp pysvn/_pysvn*.so $dest/
4773 mkdir -p $out/share/doc
48− mv -v ../Docs $out/share/doc/pysvn-1.7.2
49− rm -v $out/share/doc/pysvn-1.7.2/generate_cpp_docs_from_html_docs.py
74+ mv -v ../Docs $out/share/doc/pysvn-${version}
75+ rm -v $out/share/doc/pysvn-${version}/generate_cpp_docs_from_html_docs.py
5076 '';
5177
5278 meta = with stdenv.lib; {
5379 description = "Python bindings for Subversion";
5480 homepage = "http://pysvn.tigris.org/";
5581 license = licenses.asl20;
56− broken = true;
5782 };
5883
5984}