Merge pull request #95239 from DamienCassou/DamienCassou/fix-notmuch-for-emacs27

notmuch: 0.30 -> 0.30.1c80020
This commit is contained in:
adisbladis 2020-08-12 10:08:06 +02:00 committed by GitHub
commit cbab6729cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv { fetchurl, fetchgit, stdenv
, pkgconfig, gnupg , pkgconfig, gnupg
, xapian, gmime, talloc, zlib , xapian, gmime, talloc, zlib
, doxygen, perl, texinfo , doxygen, perl, texinfo
@ -12,17 +12,18 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.30"; version = "0.30.1c80020";
pname = "notmuch"; pname = "notmuch";
passthru = { passthru = {
pythonSourceRoot = "${pname}-${version}/bindings/python"; pythonSourceRoot = "${src.name}/bindings/python";
inherit version; inherit version;
}; };
src = fetchurl { src = fetchgit {
url = "https://notmuchmail.org/releases/${pname}-${version}.tar.xz"; url = "https://git.notmuchmail.org/git/notmuch";
sha256 = "1ylnj12f7xr18v3ckb1nwc2aw2rj3ghqnj5f4rzccr8xw5pslfsy"; sha256 = "0xj944c4ayps1bg21pksjih3y9v6lb34dd582df14i14q0yzji51";
rev = "1c80020e701c7323de137c0616fc8864443d7bd3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -75,6 +76,7 @@ stdenv.mkDerivation rec {
sha256 = "1lk91s00y4qy4pjh8638b5lfkgwyl282g1m27srsf7qfn58y16a2"; sha256 = "1lk91s00y4qy4pjh8638b5lfkgwyl282g1m27srsf7qfn58y16a2";
}; };
in '' in ''
mkdir -p test/test-databases
ln -s ${test-database} test/test-databases/database-v1.tar.xz ln -s ${test-database} test/test-databases/database-v1.tar.xz
''; '';
doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0.3"); doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0.3");