Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c97d90b3c119
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6a83ee4af814
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 19, 2017

  1. neomutt: use mime.types from dedicated mime-types derivation 

    The mime.types file shipped with neomutt is pretty basic so we use the one put
together by Gentoo from a dedicated mime-types derivation as it vastly improves
the handling of attachments.
    @peterhoeg
    peterhoeg committed Nov 19, 2017
    Copy the full SHA
    f16bd1c View commit details

Commits on Nov 20, 2017

  1. Merge pull request #31791 from peterhoeg/f/neomutt 

    neomutt: use mime.types from mime_types
    @grahamc
    grahamc authored Nov 20, 2017
    Copy the full SHA
    6a83ee4 View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 pkgs/applications/networking/mailreaders/neomutt/default.nix
7 changes: 4 additions & 3 deletions pkgs/applications/networking/mailreaders/neomutt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, which, autoreconfHook, makeWrapper, writeScript,
ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl,
lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mime-types }:

let
muttWrapper = writeScript "mutt" ''
@@ -28,6 +28,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
cyrus_sasl gss gpgme kerberos libidn ncurses
notmuch openssl perl lmdb
mime-types
];

nativeBuildInputs = [
@@ -44,8 +45,9 @@ in stdenv.mkDerivation rec {
done
# allow neomutt to map attachments to their proper mime.types if specified wrongly
# and use a far more comprehensive list than the one shipped with neomutt
substituteInPlace sendlib.c \
--replace /etc/mime.types $out/etc/mime.types
--replace /etc/mime.types ${mime-types}/etc/mime.types
'';

configureFlags = [
@@ -72,7 +74,6 @@ in stdenv.mkDerivation rec {

postInstall = ''
cp ${muttWrapper} $out/bin/mutt
mv $out/share/doc/neomutt/mime.types $out/etc
wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/lib/neomutt"
'';