Merge pull request #18272 from joachifm/xapianBindings
xapianBindings: 1.2.23 -> 1.4.0
This commit is contained in:
commit
50d07b37ec
|
@ -1,15 +1,18 @@
|
||||||
{ stdenv, composableDerivation, fetchurl, xapian, pkgconfig, zlib
|
{ 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
|
let inherit (composableDerivation) wwf; in
|
||||||
|
|
||||||
composableDerivation.composableDerivation {} rec {
|
composableDerivation.composableDerivation {} rec {
|
||||||
|
|
||||||
name = "xapian-bindings-1.2.23";
|
name = "xapian-bindings-${version}";
|
||||||
|
version = (builtins.parseDrvName xapian.name).version;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://oligarchy.co.uk/xapian/1.2.23/${name}.tar.xz";
|
url = "http://oligarchy.co.uk/xapian/${version}/${name}.tar.xz";
|
||||||
sha256 = "05929d9bq9df25kh2i6gk2w09w7p5qknf9cc7mrm2g46finbbd0r";
|
sha256 = "0lv2zblayfax4v7z3sj067b0av0phf3gc2s2d1cvkw0bkl07mv1s";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ xapian pkgconfig zlib ];
|
buildInputs = [ xapian pkgconfig zlib ];
|
||||||
|
@ -19,7 +22,18 @@ composableDerivation.composableDerivation {} rec {
|
||||||
wwf {
|
wwf {
|
||||||
name = "python";
|
name = "python";
|
||||||
enable = {
|
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
|
# export same env vars as in pythonNew
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages
|
export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "xapian-omega-${version}";
|
name = "xapian-omega-${version}";
|
||||||
version = "1.4.0";
|
version = (builtins.parseDrvName xapian.name).version;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
|
url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
|
|
@ -9806,9 +9806,10 @@ in
|
||||||
|
|
||||||
xapianBindings = callPackage ../development/libraries/xapian/bindings { # TODO perl php Java, tcl, C#, python
|
xapianBindings = callPackage ../development/libraries/xapian/bindings { # TODO perl php Java, tcl, C#, python
|
||||||
php = php56;
|
php = php56;
|
||||||
|
sphinx = pythonPackages.sphinx;
|
||||||
};
|
};
|
||||||
|
|
||||||
xapian-omega = callPackage ../tools/misc/xapian-omega {
|
xapian-omega = callPackage ../development/libraries/xapian/tools/omega {
|
||||||
libmagic = file;
|
libmagic = file;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue