1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 12:11:28 +00:00

Merge pull request #132201 from alyssais/notmuch-0.32.2

notmuch: 0.32.1 -> 0.32.2; clarify license
This commit is contained in:
Florian Klink 2021-07-31 21:25:15 +02:00 committed by GitHub
commit 1cfc98dca0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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