From 5108c4c7b277c9adaa97173e31ffe420aff31f11 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Mon, 10 Apr 2017 16:00:25 +0200 Subject: [PATCH] notmuch: fix homepage and notmuch-mutt license (#24777) * notmuch: fix homepage and notmuch-mutt license notmuch-mutt's license is GPLv3. might have been changed when it was upstreamed. * fix scheme * fix typo in url * fix field alignment * use with to make statements shorter --- .../networking/mailreaders/notmuch/default.nix | 9 +++++---- .../applications/networking/mailreaders/notmuch/mutt.nix | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 212d366facb..7c48075704e 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -97,10 +97,11 @@ stdenv.mkDerivation rec { ''; dontGzipMan = true; # already compressed - meta = { + meta = with stdenv.lib; { description = "Mail indexer"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ chaoflow garbas ]; - platforms = stdenv.lib.platforms.unix; + homepage = https://notmuchmail.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ chaoflow garbas ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix index 6d08ad724b2..410e5e10ceb 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; description = "Mutt support for notmuch"; - homepage = http://notmuchmua.org/; - license = with licenses; mit; + homepage = https://notmuchmail.org/; + license = with licenses; gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; };