From 3b9a8f54260e20f8eb794aa70fb83d627450c666 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 8 Jun 2020 16:59:31 +0300 Subject: [PATCH 1/4] neomutt: Make it not reference .dev outputs. --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index ad7b4debd3f2..b821c830a97a 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -60,6 +60,9 @@ stdenv.mkDerivation rec { "--sasl" "--with-homespool=mailbox" "--with-mailpath=" + # To make it not reference .dev outputs. See: + # https://github.com/neomutt/neomutt/pull/2367 + "--disable-include-path-in-cflags" # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail "ac_cv_path_SENDMAIL=sendmail" "--zlib" From b8f65212ec43b7671447b3dd83d365d134224a81 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 8 Jun 2020 17:01:42 +0300 Subject: [PATCH 2/4] neomutt: make manual.txt not empty Without elinks / w3m / lynx in the nativeBuildInputs, there are these errors in the build: LC_ALL=C w3m -dump -O UTF8 docs/manual.html > docs/manual.txt || \ LC_ALL=C lynx -dump -nolist -with_backspaces \ -display_charset=us-ascii docs/manual.html > docs/manual.txt || \ LC_ALL=C elinks -dump -no-numbering -no-references \ docs/manual.html | sed -e 's,\\001, ,g' > docs/manual.txt /nix/store/xfbmj7sl2ikicym9x3yq7cms5qx1w39k-bash-4.4-p23/bin/bash: w3m: command not found /nix/store/xfbmj7sl2ikicym9x3yq7cms5qx1w39k-bash-4.4-p23/bin/bash: line 1: lynx: command not found /nix/store/xfbmj7sl2ikicym9x3yq7cms5qx1w39k-bash-4.4-p23/bin/bash: line 3: elinks: command not found --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index b821c830a97a..0aa41e77e224 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,6 +1,6 @@ { 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 +, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, elinks, mailcap, runtimeShell, sqlite, zlib , glibcLocales }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib + docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib elinks ]; enableParallelBuilding = true; From b58227a4c07e6e39dd8e191b8a8cd6c8ef28ff49 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 8 Jun 2020 17:46:28 +0300 Subject: [PATCH 3/4] neomutt: Remove old fixes for failing tests Includes both rfc2047 tests workarounds and locale workarounds. Fixes #86896. See https://github.com/neomutt/neomutt/pull/2314 . --- .../networking/mailreaders/neomutt/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 0aa41e77e224..340d4cb3939f 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -42,12 +42,6 @@ stdenv.mkDerivation rec { # and use a far more comprehensive list than the one shipped with neomutt substituteInPlace sendlib.c \ --replace /etc/mime.types ${mailcap}/etc/mime.types - - # The string conversion tests all fail with the first version of neomutt - # that has tests (20180223) as well as 20180716 so we disable them for now. - # I don't know if that is related to the tests or our build environment. - # Try again with a later release. - sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c ''; configureFlags = [ @@ -89,10 +83,8 @@ stdenv.mkDerivation rec { (cd test-files && ./setup.sh) export NEOMUTT_TEST_DIR=$(pwd)/test-files - export LC_ALL="en_US.UTF-8" ''; - checkInputs = [ glibcLocales ]; checkTarget = "test"; postCheck = "unset NEOMUTT_TEST_DIR"; From 499d18849f334ba5ded1ccffc9345c7d3d0a3c40 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 19 Jun 2020 19:19:08 +0200 Subject: [PATCH 4/4] neomutt: 20200501 -> 20200619 https://github.com/neomutt/neomutt/releases/tag/20200619 --- .../networking/mailreaders/neomutt/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 340d4cb3939f..a03f559af8a4 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "20200501"; + version = "20200619"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "1xrs2bagrcg489zp7g39l3rrpgz8n1ji9cbr21wrnasfbhqcsmnx"; + sha256 = "0dhdpd0wdk5bam0q7cvjy4f451ai0mapmyrar7r7m5dnn6lcwvfv"; }; buildInputs = [ @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { --replace /etc/mime.types ${mailcap}/etc/mime.types ''; + preBuild = '' + export HOME=$(mktemp -d) + ''; + configureFlags = [ "--enable-autocrypt" "--gpgme" @@ -77,9 +81,10 @@ stdenv.mkDerivation rec { cp -r ${fetchFromGitHub { owner = "neomutt"; repo = "neomutt-test-files"; - rev = "1ee274e9ae1330fb901eb7b8275b3079d7869222"; - sha256 = "0dhilz4rr7616jh8jcvh50a3rr09in43nsv72mm6f3vfklcqincp"; + rev = "8629adab700a75c54e8e28bf05ad092503a98f75"; + sha256 = "1ci04nqkab9mh60zzm66sd6mhsr6lya8wp92njpbvafc86vvwdlr"; }} $(pwd)/test-files + chmod -R +w test-files (cd test-files && ./setup.sh) export NEOMUTT_TEST_DIR=$(pwd)/test-files