git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #95239 from DamienCassou/DamienCassou/fix-notmuch-for-emacs27

notmuch: 0.30 -> 0.30.1c80020

commitcbab6729cdaa42d23d6a54832de6c0e4bb67d6ed authoradisbladis <adisbladis@gmail.com> dateWed 12 Aug 2020, 10:08 (6 years ago) parent800d9e7b24b638
1 file changed+8−6
pkgs/applications/networking/mailreaders/notmuch/default.nix+8−6
pkgs/applications/networking/mailreaders/notmuch/default.nix+8−6
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv
1+{ fetchurl, fetchgit, stdenv
22, pkgconfig, gnupg
33, xapian, gmime, talloc, zlib
44, doxygen, perl, texinfo
@@ -12,17 +12,18 @@
1212with stdenv.lib;
1313
1414stdenv.mkDerivation rec {
15− version = "0.30";
15+ version = "0.30.1c80020";
1616 pname = "notmuch";
1717
1818 passthru = {
19− pythonSourceRoot = "${pname}-${version}/bindings/python";
19+ pythonSourceRoot = "${src.name}/bindings/python";
2020 inherit version;
2121 };
2222
23− src = fetchurl {
24− url = "https://notmuchmail.org/releases/${pname}-${version}.tar.xz";
25− sha256 = "1ylnj12f7xr18v3ckb1nwc2aw2rj3ghqnj5f4rzccr8xw5pslfsy";
23+ src = fetchgit {
24+ url = "https://git.notmuchmail.org/git/notmuch";
25+ sha256 = "0xj944c4ayps1bg21pksjih3y9v6lb34dd582df14i14q0yzji51";
26+ rev = "1c80020e701c7323de137c0616fc8864443d7bd3";
2627 };
2728
2829 nativeBuildInputs = [
@@ -75,6 +76,7 @@ stdenv.mkDerivation rec {
7576 sha256 = "1lk91s00y4qy4pjh8638b5lfkgwyl282g1m27srsf7qfn58y16a2";
7677 };
7778 in ''
79+ mkdir -p test/test-databases
7880 ln -s ${test-database} test/test-databases/database-v1.tar.xz
7981 '';
8082 doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0.3");