notmuch: 0.32.1 -> 0.32.2; clarify license

Also fix an incorrect (but apparently harmless) use of lib.optional.
This commit is contained in:
Alyssa Ross 2021-07-31 09:34:41 +00:00
parent d55bba14da
commit 15eec2111f
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0

View File

@ -12,7 +12,7 @@
with lib;
stdenv.mkDerivation rec {
version = "0.32.1";
version = "0.32.2";
pname = "notmuch";
passthru = {
@ -20,10 +20,9 @@ stdenv.mkDerivation rec {
inherit version;
};
src = fetchgit {
url = "https://git.notmuchmail.org/git/notmuch";
sha256 = "sha256:06r0hdz8mxnzag74md62a9m6c2zm0fxn45n4n1c26j5cmrys7j16";
rev = version;
src = fetchurl {
url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
sha256 = "1myylb19hj5nb1vriqng252vfjwwkgbi3gxj93pi2q1fzyw7w2lf";
};
nativeBuildInputs = [
@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
doxygen # (optional) api docs
pythonPackages.sphinx # (optional) documentation -> doc/INSTALL
texinfo # (optional) documentation -> doc/INSTALL
] ++ optional withEmacs [ emacs ];
] ++ optional withEmacs emacs;
buildInputs = [
gnupg # undefined dependencies
@ -103,7 +102,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Mail indexer";
homepage = "https://notmuchmail.org/";
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ flokli puckipedia ];
platforms = platforms.unix;
};