diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-02-19 17:15:31 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-02-19 17:15:31 +0100 |
| commit | 8f50f1ce107914ae5a07bd9aff6649021deb6fca (patch) | |
| tree | 12a65659f7a05af761500651b5260b34eea6abab /pkgs/applications/networking/mailreaders | |
| parent | c34b032ccb5cb1cf282ed141d7f60420879e2b42 (diff) | |
| parent | e4f96ad7d9fa4ff2ada4936cab6abaa8b0e823c0 (diff) | |
Merge branch 'staging-next' into staging
Resolved the following conflicts: - kernel flags between 09176d28a0ebbd8bae35f92406a48cded78ac9f7 and 2b28822d8dec38fd62ef17643ec71da3bb488619 - clojure-lsp between 3fa00685ce21fb1a4218d444d0862ebcb2b99706 and e03c068af5c9ca950214cd6c3b5cfe67f595da88
Diffstat (limited to 'pkgs/applications/networking/mailreaders')
| -rw-r--r-- | pkgs/applications/networking/mailreaders/aerc/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/networking/mailreaders/neomutt/default.nix | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index b43e6bb093c48..3124239b0d9a5 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,7 +1,6 @@ { lib, buildGoModule, fetchurl -, go, ncurses, notmuch, scdoc -, python3, perl, w3m, dante -, fetchFromGitHub +, ncurses, notmuch, scdoc +, python3, w3m, dante }: buildGoModule rec { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index c0ebb3d8078ff..0c02f512dad95 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,8 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript +{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl -, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, runtimeShell, sqlite, zlib -, glibcLocales -, fetchpatch +, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib }: stdenv.mkDerivation rec { |