Merge pull request #18272 from joachifm/xapianBindings

xapianBindings: 1.2.23 -> 1.4.0
This commit is contained in:
Joachim F 2016-09-04 17:12:45 +02:00 committed by GitHub
commit 50d07b37ec
3 changed files with 22 additions and 7 deletions

View file

@ -1,15 +1,18 @@
{ stdenv, composableDerivation, fetchurl, xapian, pkgconfig, zlib
, python ? null, php ? null, ruby ? null }:
, python ? null, sphinx ? null, php ? null, ruby ? null }:
assert (python != null) -> (sphinx != null);
let inherit (composableDerivation) wwf; in
composableDerivation.composableDerivation {} rec {
name = "xapian-bindings-1.2.23";
name = "xapian-bindings-${version}";
version = (builtins.parseDrvName xapian.name).version;
src = fetchurl {
url = "http://oligarchy.co.uk/xapian/1.2.23/${name}.tar.xz";
sha256 = "05929d9bq9df25kh2i6gk2w09w7p5qknf9cc7mrm2g46finbbd0r";
url = "http://oligarchy.co.uk/xapian/${version}/${name}.tar.xz";
sha256 = "0lv2zblayfax4v7z3sj067b0av0phf3gc2s2d1cvkw0bkl07mv1s";
};
buildInputs = [ xapian pkgconfig zlib ];
@ -19,7 +22,18 @@ composableDerivation.composableDerivation {} rec {
wwf {
name = "python";
enable = {
buildInputs = [ python ];
buildInputs = [ python sphinx ];
# Our `sphinx-build` binary is a shell wrapper around
# `sphinx-build` python code. Makefile tries to execute it
# using python2 and fails. Fixing that here.
patchPhase = ''
for a in python/Makefile* ; do
substituteInPlace $a \
--replace '$(PYTHON2) $(SPHINX_BUILD)' '$(SPHINX_BUILD)'
done
'';
# export same env vars as in pythonNew
preConfigure = ''
export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "xapian-omega-${version}";
version = "1.4.0";
version = (builtins.parseDrvName xapian.name).version;
src = fetchurl {
url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";

View file

@ -9806,9 +9806,10 @@ in
xapianBindings = callPackage ../development/libraries/xapian/bindings { # TODO perl php Java, tcl, C#, python
php = php56;
sphinx = pythonPackages.sphinx;
};
xapian-omega = callPackage ../tools/misc/xapian-omega {
xapian-omega = callPackage ../development/libraries/xapian/tools/omega {
libmagic = file;
};