pyrox.dev
Merge pull request #160575 from DamienCassou/notmuch-0.35
authored by Doron Behar and committed by GitHub 5a4251a7 53646c00
+5
-7
pkgs/applications/networking/mailreaders/notmuch/default.nix
+5
-7
pkgs/applications/networking/mailreaders/notmuch/default.nix
···
2
, pkg-config, gnupg
3
, xapian, gmime, talloc, zlib
4
, doxygen, perl, texinfo
5
, pythonPackages
6
, emacs
7
, ruby
8
, which, dtach, openssl, bash, gdb, man
9
, withEmacs ? true
10
, withRuby ? true
···
12
13
stdenv.mkDerivation rec {
14
pname = "notmuch";
15
-
version = "0.34.3";
16
17
src = fetchurl {
18
url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
19
-
sha256 = "sha256-P+kQSDv9gVpcO5UOImp7yoFWBT/TLXrR6xoKijrK6Ig=";
20
};
21
-
22
-
patches = [
23
-
# https://nmbug.notmuchmail.org/nmweb/show/87o84iza9r.fsf%40starbuck.i-did-not-set--mail-host-address--so-tickle-me
24
-
./test-fix-support-for-gpgsm-in-gnupg-2.3.patch
25
-
];
26
27
nativeBuildInputs = [
28
pkg-config
···
100
101
passthru = {
102
pythonSourceRoot = "notmuch-${version}/bindings/python";
103
inherit version;
104
};
105
···
2
, pkg-config, gnupg
3
, xapian, gmime, talloc, zlib
4
, doxygen, perl, texinfo
5
+
, notmuch
6
, pythonPackages
7
, emacs
8
, ruby
9
+
, testVersion
10
, which, dtach, openssl, bash, gdb, man
11
, withEmacs ? true
12
, withRuby ? true
···
14
15
stdenv.mkDerivation rec {
16
pname = "notmuch";
17
+
version = "0.35";
18
19
src = fetchurl {
20
url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
21
+
sha256 = "0fdc81m24xrbhfrhw00g12ak4b8hap4961sq7ap6q2pjqhac8cd8";
22
};
23
24
nativeBuildInputs = [
25
pkg-config
···
97
98
passthru = {
99
pythonSourceRoot = "notmuch-${version}/bindings/python";
100
+
tests.version = testVersion { package = notmuch; };
101
inherit version;
102
};
103
-28
pkgs/applications/networking/mailreaders/notmuch/test-fix-support-for-gpgsm-in-gnupg-2.3.patch
-28
pkgs/applications/networking/mailreaders/notmuch/test-fix-support-for-gpgsm-in-gnupg-2.3.patch
···
1
-
From a642ad542e3d3f34e949c5c66923ca8a6e6cbbd8 Mon Sep 17 00:00:00 2001
2
-
From: Stig Palmquist <stig@stig.io>
3
-
Date: Tue, 11 Jan 2022 13:23:13 +0100
4
-
Subject: [PATCH] test: fix support for gpgsm in gnupg 2.3
5
-
6
-
gpgsm --list-keys output changed the label for fingerprints from
7
-
"fingerprint: " to "sha[12] fpr: " breaking tests with gnupg 2.3. this
8
-
adds support for both.
9
-
---
10
-
test/test-lib.sh | 2 +-
11
-
1 file changed, 1 insertion(+), 1 deletion(-)
12
-
13
-
diff --git a/test/test-lib.sh b/test/test-lib.sh
14
-
index 6bc0b723..3de608f9 100644
15
-
--- a/test/test-lib.sh
16
-
+++ b/test/test-lib.sh
17
-
@@ -145,7 +145,7 @@ add_gpgsm_home () {
18
-
mkdir -p -m 0700 "$GNUPGHOME"
19
-
gpgsm --batch --no-tty --no-common-certs-import --pinentry-mode=loopback --passphrase-fd 3 \
20
-
--disable-dirmngr --import >"$GNUPGHOME"/import.log 2>&1 3<<<'' <$NOTMUCH_SRCDIR/test/smime/0xE0972A47.p12
21
-
- fpr=$(gpgsm --batch --list-key test_suite@notmuchmail.org | sed -n 's/.*fingerprint: //p')
22
-
+ fpr=$(gpgsm --batch --list-key test_suite@notmuchmail.org | sed -n 's/.*\(fingerprint\|sha1 fpr\): //p')
23
-
echo "$fpr S relax" >> "$GNUPGHOME/trustlist.txt"
24
-
gpgsm --quiet --batch --no-tty --no-common-certs-import --disable-dirmngr --import < $NOTMUCH_SRCDIR/test/smime/ca.crt
25
-
echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$GNUPGHOME/trustlist.txt"
26
-
--
27
-
2.34.1
28
-
···