Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 48a6a8b97c32
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c9ad46815a35
Choose a head ref
  • 5 commits
  • 2 files changed
  • 3 contributors

Commits on Jun 19, 2020

  1. jhead: 3.03 -> 3.04

    (cherry picked from commit 7395b11)
    rycee committed Jun 19, 2020
    Copy the full SHA
    8b38149 View commit details
  2. neomutt: Make it not reference .dev outputs.

    (cherry picked from commit 3b9a8f5)
    doronbehar authored and Ma27 committed Jun 19, 2020
    Copy the full SHA
    2a0c129 View commit details
  3. 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
    
    (cherry picked from commit b8f6521)
    doronbehar authored and Ma27 committed Jun 19, 2020
    Copy the full SHA
    5ca29c7 View commit details
  4. neomutt: Remove old fixes for failing tests

    Includes both rfc2047 tests workarounds and locale workarounds.
    Fixes #86896. See neomutt/neomutt#2314 .
    
    (cherry picked from commit b58227a)
    doronbehar authored and Ma27 committed Jun 19, 2020
    Copy the full SHA
    657aa0b View commit details
  5. Copy the full SHA
    c9ad468 View commit details
Showing with 20 additions and 27 deletions.
  1. +13 −13 pkgs/applications/networking/mailreaders/neomutt/default.nix
  2. +7 −14 pkgs/tools/graphics/jhead/default.nix
26 changes: 13 additions & 13 deletions pkgs/applications/networking/mailreaders/neomutt/default.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{ 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
}:

stdenv.mkDerivation rec {
version = "20200501";
version = "20200619";
pname = "neomutt";

src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = version;
sha256 = "1xrs2bagrcg489zp7g39l3rrpgz8n1ji9cbr21wrnasfbhqcsmnx";
sha256 = "0dhdpd0wdk5bam0q7cvjy4f451ai0mapmyrar7r7m5dnn6lcwvfv";
};

buildInputs = [
@@ -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;
@@ -42,12 +42,10 @@ 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
preBuild = ''
export HOME=$(mktemp -d)
'';

configureFlags = [
@@ -60,6 +58,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"
@@ -80,16 +81,15 @@ 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
export LC_ALL="en_US.UTF-8"
'';

checkInputs = [ glibcLocales ];
checkTarget = "test";
postCheck = "unset NEOMUTT_TEST_DIR";

21 changes: 7 additions & 14 deletions pkgs/tools/graphics/jhead/default.nix
Original file line number Diff line number Diff line change
@@ -2,34 +2,27 @@

stdenv.mkDerivation rec {
pname = "jhead";
version = "3.03";
version = "3.04";

src = fetchurl {
url = "http://www.sentex.net/~mwandel/jhead/${pname}-${version}.tar.gz";
sha256 = "1hn0yqcicq3qa20h1g313l1a671r8mccpb9gz0w1056r500lw6c2";
sha256 = "1j831bqw1qpkbchdriwcy3sgzvbagaj45wlc124fs9bc9z7vp2gg";
};

patches = [
(fetchpatch {
name = "CVE-2019-1010301.patch";
url = "https://sources.debian.org/data/main/j/jhead/1:3.03-3/debian/patches/36_CVE-2019-1010301";
sha256 = "1vvrg50z5y7sjhfi973wh1q1v79sqp7hk5d4z0dlnx3fqgkjrx7q";
})
(fetchpatch {
name = "CVE-2019-1010302.patch";
url = "https://sources.debian.org/data/main/j/jhead/1:3.03-3/debian/patches/37_CVE-2019-1010302";
sha256 = "1h11mpsi7hpwbi8kpnkjwn6zpqf88f132h0rsg8sggcs3vva2x8y";
url = "https://sources.debian.org/data/main/j/jhead/1:3.04-2/debian/patches/01_gpsinfo.c";
sha256 = "0r8hdbfrdxip4dwz5wqsv47a29j33cx7w5zx4jdhp5l1ihg003lz";
})
];

buildInputs = [ libjpeg ];

patchPhase = ''
substituteInPlace makefile \
--replace /usr/local/bin $out/bin
makeFlags = [ "CPPFLAGS=" "CFLAGS=-O3" "LDFLAGS=" ];

patchPhase = ''
sed -i '/dpkg-buildflags/d' makefile
substituteInPlace jhead.c \
--replace "\" Compiled: \"__DATE__" "" \
--replace "jpegtran -trim" "${libjpeg.bin}/bin/jpegtran -trim"
'';