Merge pull request #208577 from r-ryantm/auto-update/recoll
python310Packages.recoll: 1.33.2 -> 1.33.4
This commit is contained in:
commit
3e4d56e155
|
@ -35,16 +35,25 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "recoll";
|
pname = "recoll";
|
||||||
version = "1.33.2";
|
version = "1.33.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz";
|
url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz";
|
||||||
sha256 = "sha256-ql4VHiblIn8uihUbF1htPnpvjw0qMxdzW8HLGlUrZW0=";
|
sha256 = "sha256-ffD49sGYWYEWAFPRtpyDU/CYFvkrEDL21Ddq3QsXCvc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = [ "--enable-recollq" "--disable-webkit" "--without-systemd" ]
|
configureFlags = [
|
||||||
++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ]
|
"--enable-recollq"
|
||||||
++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]);
|
"--disable-webkit"
|
||||||
|
"--without-systemd"
|
||||||
|
] ++ lib.optionals (!withGui) [
|
||||||
|
"--disable-qtgui"
|
||||||
|
"--disable-x11mon"
|
||||||
|
] ++ (if stdenv.isLinux then [
|
||||||
|
"--with-inotify"
|
||||||
|
] else [
|
||||||
|
"--without-inotify"
|
||||||
|
]);
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = [ "-DNIXPKGS" ];
|
NIX_CFLAGS_COMPILE = [ "-DNIXPKGS" ];
|
||||||
|
|
||||||
|
@ -54,13 +63,23 @@ mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
file pkg-config python3Packages.setuptools which
|
file
|
||||||
|
pkg-config
|
||||||
|
python3Packages.setuptools
|
||||||
|
which
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
bison chmlib python3Packages.python xapian zlib
|
bison
|
||||||
] ++ lib.optional withGui qtbase
|
chmlib
|
||||||
++ lib.optional stdenv.isDarwin libiconv;
|
python3Packages.python
|
||||||
|
xapian
|
||||||
|
zlib
|
||||||
|
] ++ lib.optional withGui [
|
||||||
|
qtbase
|
||||||
|
] ++ lib.optional stdenv.isDarwin [
|
||||||
|
libiconv
|
||||||
|
];
|
||||||
|
|
||||||
# the filters search through ${PATH} using a sh proc 'checkcmds' for the
|
# the filters search through ${PATH} using a sh proc 'checkcmds' for the
|
||||||
# filtering utils. Short circuit this by replacing the filtering command with
|
# filtering utils. Short circuit this by replacing the filtering command with
|
||||||
|
@ -108,7 +127,8 @@ mkDerivation rec {
|
||||||
members, email attachments.
|
members, email attachments.
|
||||||
'';
|
'';
|
||||||
homepage = "https://www.lesbonscomptes.com/recoll/";
|
homepage = "https://www.lesbonscomptes.com/recoll/";
|
||||||
license = licenses.gpl2;
|
changelog = "https://www.lesbonscomptes.com/recoll/pages/release-${version}.html";
|
||||||
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = with maintainers; [ jcumming ];
|
maintainers = with maintainers; [ jcumming ];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue