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: 42f2d370a53d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 192485f8fab8
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 17, 2020

  1. neomutt: 20200320 -> 20200417 

    https://github.com/neomutt/neomutt/releases/tag/20200417

To fix the tests, I had to copy the recently created
`neomutt-test-files`[1] repository into the build-environment.

Also applied a patch from master[2] which ensures that the
`change-folder` macro actually switches to the specified folder.

[1] https://github.com/neomutt/neomutt-test-files
[2] neomutt/neomutt@9e7537c
    @Ma27
    Ma27 committed Apr 17, 2020
    Copy the full SHA
    192485f View commit details
Showing with 25 additions and 2 deletions.
  1. +25 −2 pkgs/applications/networking/mailreaders/neomutt/default.nix
27 changes: 25 additions & 2 deletions pkgs/applications/networking/mailreaders/neomutt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,29 @@
{ stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript
, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite, zlib
, fetchpatch
}:

stdenv.mkDerivation rec {
version = "20200320";
version = "20200417";
pname = "neomutt";

src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = version;
sha256 = "06xcl9pr8dna4kqjaqm7ss50gdy185425bwl31i0xs3l11cyjap4";
sha256 = "0s7943r2s14kavyjf7i70vca252l626539i09a9vk0i9sfi35vx5";
};

patches = [
# Remove on next release. Fixes the `change-folder`
# macro (https://github.com/neomutt/neomutt/issues/2268)
(fetchpatch {
url = "https://github.com/neomutt/neomutt/commit/9e7537caddb9c6adc720bb3322a7512cf51ab025.patch";
sha256 = "1vmlvgnhx1ra3rnyjkpkv6lrqw8xfh2kkmqp43fqn9lnk3pkjxvv";
})
];

buildInputs = [
cyrus_sasl gss gpgme kerberos libidn ncurses
notmuch openssl perl lmdb
@@ -75,7 +85,20 @@ stdenv.mkDerivation rec {

doCheck = true;

preCheck = ''
cp -r ${fetchFromGitHub {
owner = "neomutt";
repo = "neomutt-test-files";
rev = "1ee274e9ae1330fb901eb7b8275b3079d7869222";
sha256 = "0dhilz4rr7616jh8jcvh50a3rr09in43nsv72mm6f3vfklcqincp";
}} $(pwd)/test-files
(cd test-files && ./setup.sh)
export NEOMUTT_TEST_DIR=$(pwd)/test-files
'';

checkTarget = "test";
postCheck = "unset NEOMUTT_TEST_DIR";

meta = with stdenv.lib; {
description = "A small but very powerful text-based mail client";