ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

xapianBindings: 1.2.23 -> 1.4.0

Browse Source 
The xapianBindings version is now directly tied to the input xapian
version, to ensure that they're in synch.

Also, as of this version, sphinx is required to build documentation
for the python bindings.
This commit is contained in:
Joachim Fasting 2016-09-03 21:40:16 +02:00
parent dcaee87529
commit ad815f4206
No known key found for this signature in database
GPG Key ID: 7544761007FE4E08
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/xapian/bindings/default.nix
View File

@ -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,7 @@ composableDerivation.composableDerivation {} rec {
wwf { wwf {
name = "python"; name = "python";
enable = { enable = {
buildInputs = [ python ]; buildInputs = [ python sphinx ];
# 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

1
pkgs/top-level/all-packages.nix
View File

@ -9800,6 +9800,7 @@ 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 ../tools/misc/xapian-omega {