pyrox.dev
Merge pull request #11812 from bnikolic/recoll-update
recoll: 1.20.6 -> 1.21.3
zimbatm.tngl.sh
+9
-5
pkgs/applications/search/recoll/default.nix
+9
-5
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 ./versionawk.patch ];
19
+
18
20
configureFlags = [ "--with-inotify" ];
19
21
20
-
buildInputs = [ qt4 xapian file python ];
22
+
buildInputs = [ qt4 xapian file python bison];
21
23
22
24
# the filters search through ${PATH} using a sh proc 'checkcmds' for the
23
25
# filtering utils. Short circuit this by replacing the filtering command with
···
29
31
substituteInPlace $f --replace catppt ${catdoc}/bin/catppt
30
32
substituteInPlace $f --replace djvused ${djvulibre}/bin/djvused
31
33
substituteInPlace $f --replace djvutxt ${djvulibre}/bin/djvutxt
32
-
substituteInPlace $f --replace grep ${gnugrep}/bin/grep
34
+
substituteInPlace $f --replace egrep ${gnugrep}/bin/egrep
33
35
substituteInPlace $f --replace groff ${groff}/bin/groff
34
36
substituteInPlace $f --replace gunzip ${gzip}/bin/gunzip
35
37
substituteInPlace $f --replace iconv ${libiconv}/bin/iconv
···
47
49
substituteInPlace $f --replace /usr/bin/perl ${perl}/bin/perl
48
50
done
49
51
'';
52
+
53
+
enableParallelBuilding = true;
50
54
51
55
meta = with stdenv.lib; {
52
56
description = "A full-text search tool";
+12
pkgs/applications/search/recoll/nodeblayout.patch
+12
pkgs/applications/search/recoll/nodeblayout.patch
···
1
+
diff -ru recoll-1.21.3-orig/recollinstall.in recoll-1.21.3/recollinstall.in
2
+
--- recoll-1.21.3-orig/recollinstall.in 2015-09-28 08:08:42.000000000 +0100
3
+
+++ recoll-1.21.3/recollinstall.in 2015-12-13 22:48:30.361776374 +0000
4
+
@@ -45,9 +45,6 @@
5
+
mandir=$DESTDIR/$mandir
6
+
ROOTFORPYTHON="--root=${DESTDIR}"
7
+
fi
8
+
-if test -f /etc/debian_version ; then
9
+
- OPTSFORPYTHON=--install-layout=deb
10
+
-fi
11
+
12
+
echo "Installing to $PREFIX"
+12
pkgs/applications/search/recoll/versionawk.patch
+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