public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

notmuch: switch to gmime3, make all tests pass with gmime3

Browse Source
This commit is contained in:
Jan Malakhovski 2017-09-01 00:01:42 +00:00
parent 04e97f9868
commit ae86fddd95
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/applications/networking/mailreaders/notmuch/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, fixDarwinDylibNames, gdb { fetchurl, stdenv, fixDarwinDylibNames
, pkgconfig, gnupg , pkgconfig, gnupg
, xapian, gmime, talloc, zlib , xapian, gmime, talloc, zlib
, doxygen, perl , doxygen, perl
@ -6,9 +6,11 @@
, bash-completion , bash-completion
, emacs , emacs
, ruby , ruby
, which, dtach, openssl, bash , which, dtach, openssl, bash, gdb, man
}: }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.25"; version = "0.25";
name = "notmuch-${version}"; name = "notmuch-${version}";
@ -33,18 +35,10 @@ stdenv.mkDerivation rec {
ruby # (optional) ruby bindings ruby # (optional) ruby bindings
which dtach openssl bash # test dependencies which dtach openssl bash # test dependencies
] ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames ++ optional stdenv.isDarwin fixDarwinDylibNames
++ stdenv.lib.optional (!stdenv.isDarwin) gdb; ++ optionals (!stdenv.isDarwin) [ gdb man ]; # test dependencies
doCheck = !stdenv.isDarwin;
checkTarget = "test";
patchPhase = ''
# XXX: disabling few tests since i have no idea how to make them pass for now
rm -f test/T010-help-test.sh \
test/T350-crypto.sh \
test/T355-smime.sh
postPatch = ''
find test -type f -exec \ find test -type f -exec \
sed -i \ sed -i \
-e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \ -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \
@ -65,7 +59,9 @@ stdenv.mkDerivation rec {
done done
''; '';
preFixup = stdenv.lib.optionalString stdenv.isDarwin '' makeFlags = "V=1";
preFixup = optionalString stdenv.isDarwin ''
set -e set -e
die() { die() {
@ -92,12 +88,16 @@ stdenv.mkDerivation rec {
install_name_tool -change "$badname" "$goodname" "$prg" install_name_tool -change "$badname" "$goodname" "$prg"
''; '';
doCheck = !stdenv.isDarwin && (versionAtLeast gmime.version "3.0");
checkTarget = "test V=1";
postInstall = '' postInstall = ''
make install-man make install-man
''; '';
dontGzipMan = true; # already compressed dontGzipMan = true; # already compressed
meta = with stdenv.lib; { meta = {
description = "Mail indexer"; description = "Mail indexer";
homepage = https://notmuchmail.org/; homepage = https://notmuchmail.org/;
license = licenses.gpl3; license = licenses.gpl3;

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

@ -15580,7 +15580,9 @@ with pkgs;
notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { }; notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { };
notmuch = callPackage ../applications/networking/mailreaders/notmuch { }; notmuch = callPackage ../applications/networking/mailreaders/notmuch {
gmime = gmime3;
};
notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { };