lol

recoll: 1.20.6 -> 1.21.3

Add dependency on bison. Correct corruption caused by substituteInPlace
replacing non-commands in the filters

+18 -6
+6 -6
pkgs/applications/search/recoll/default.nix
··· 1 - { stdenv, fetchurl 1 + { stdenv, fetchurl, bison 2 2 , qt4, xapian, file, python, perl 3 3 , djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx 4 4 , libwpd, unrtf, untex ··· 7 7 assert stdenv.system != "powerpc-linux"; 8 8 9 9 stdenv.mkDerivation rec { 10 - ver = "1.20.6"; 10 + ver = "1.21.3"; 11 11 name = "recoll-${ver}"; 12 12 13 13 src = fetchurl { 14 14 url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz"; 15 - sha256 = "0ympk2w21cxfvysyx96p0npsa54csfc84cicpi8nsj1qp824zxwq"; 15 + sha256 = "66f039f08b149d5e4840664d4a636f6b55145b02072f87aab83282ebe0cd593a"; 16 16 }; 17 17 18 - patches = [ ./nodeblayout.patch ]; 18 + patches = [ ./nodeblayout.patch ./versionawk.patch ]; 19 19 20 20 configureFlags = [ "--with-inotify" ]; 21 21 22 - buildInputs = [ qt4 xapian file python ]; 22 + buildInputs = [ qt4 xapian file python bison]; 23 23 24 24 # the filters search through ${PATH} using a sh proc 'checkcmds' for the 25 25 # filtering utils. Short circuit this by replacing the filtering command with ··· 31 31 substituteInPlace $f --replace catppt ${catdoc}/bin/catppt 32 32 substituteInPlace $f --replace djvused ${djvulibre}/bin/djvused 33 33 substituteInPlace $f --replace djvutxt ${djvulibre}/bin/djvutxt 34 - substituteInPlace $f --replace grep ${gnugrep}/bin/grep 34 + substituteInPlace $f --replace egrep ${gnugrep}/bin/egrep 35 35 substituteInPlace $f --replace groff ${groff}/bin/groff 36 36 substituteInPlace $f --replace gunzip ${gzip}/bin/gunzip 37 37 substituteInPlace $f --replace iconv ${libiconv}/bin/iconv
+12
pkgs/applications/search/recoll/versionawk.patch
··· 1 + diff -ru recoll-1.21.3-orig/filters/rclpdf recoll-1.21.3/filters/rclpdf 2 + --- recoll-1.21.3-orig/filters/rclpdf 2015-09-28 08:08:15.000000000 +0100 3 + +++ recoll-1.21.3/filters/rclpdf 2015-12-14 21:37:01.984945925 +0000 4 + @@ -129,7 +129,7 @@ 5 + { 6 + # Test poppler version: at some point before 0.24, poppler began 7 + # to properly escape text inside the header (but not the body). 8 + - XYZ=`pdftotext -v 2>&1 | awk '/pdftotext/{print $3}'` 9 + + XYZ=`pdftotext -v 2>&1 | awk '/version/{print $3}'` 10 + MAJOR=`echo $XYZ | cut -d. -f 1` 11 + MINOR=`echo $XYZ | cut -d. -f 2` 12 + escapeheader=1