diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-07-31 09:34:41 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-07-31 09:35:55 +0000 |
| commit | 15eec2111fc06cca2b0abd7b3de1b6922fabf21e (patch) | |
| tree | d785cad0fc251f960ca26547a1a8b33ae291a788 /pkgs | |
| parent | d55bba14daa28dc4df9014a1f2774cab998b82a4 (diff) | |
| download | nixpkgs-15eec2111fc06cca2b0abd7b3de1b6922fabf21e.tar nixpkgs-15eec2111fc06cca2b0abd7b3de1b6922fabf21e.tar.gz nixpkgs-15eec2111fc06cca2b0abd7b3de1b6922fabf21e.tar.bz2 nixpkgs-15eec2111fc06cca2b0abd7b3de1b6922fabf21e.tar.lz nixpkgs-15eec2111fc06cca2b0abd7b3de1b6922fabf21e.tar.xz nixpkgs-15eec2111fc06cca2b0abd7b3de1b6922fabf21e.tar.zst nixpkgs-15eec2111fc06cca2b0abd7b3de1b6922fabf21e.zip | |
notmuch: 0.32.1 -> 0.32.2; clarify license
Also fix an incorrect (but apparently harmless) use of lib.optional.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/mailreaders/notmuch/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index dceb9c92deb..71cb68d0deb 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -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; }; |