summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2021-07-31 21:25:15 +0200
committerGitHub <noreply@github.com>2021-07-31 21:25:15 +0200
commit1cfc98dca074f186b1680f81d1ed4896bd42332a (patch)
treeecf45ac0547c970e91fc3f25ace64f04d83742e3 /pkgs
parentc25566b761275bea3f19bef40acca6c833427541 (diff)
parent15eec2111fc06cca2b0abd7b3de1b6922fabf21e (diff)
downloadnixpkgs-1cfc98dca074f186b1680f81d1ed4896bd42332a.tar
nixpkgs-1cfc98dca074f186b1680f81d1ed4896bd42332a.tar.gz
nixpkgs-1cfc98dca074f186b1680f81d1ed4896bd42332a.tar.bz2
nixpkgs-1cfc98dca074f186b1680f81d1ed4896bd42332a.tar.lz
nixpkgs-1cfc98dca074f186b1680f81d1ed4896bd42332a.tar.xz
nixpkgs-1cfc98dca074f186b1680f81d1ed4896bd42332a.tar.zst
nixpkgs-1cfc98dca074f186b1680f81d1ed4896bd42332a.zip
Merge pull request #132201 from alyssais/notmuch-0.32.2
notmuch: 0.32.1 -> 0.32.2; clarify license
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/mailreaders/notmuch/default.nix13
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 e1a235c8309..07a4ec8a905 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
@@ -97,7 +96,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;
   };