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: a68f099e182c
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: 668d0ded6bb3
Choose a head ref
  • 5 commits
  • 3 files changed
  • 4 contributors

Commits on Apr 17, 2020

  1. paperwork: unmark as broken on x86

    @symphorien
    symphorien committed Apr 17, 2020
    Copy the full SHA
    b27ac93 View commit details

  2. Merge pull request #85436 from symphorien/paperwork-broken 

    paperwork: unmark as broken
    @worldofpeace
    worldofpeace authored Apr 17, 2020
    Copy the full SHA
    708ed56 View commit details

  3. neomutt: configure with zlib to enable imap compression 

    (cherry picked from commit 45cc3c9)
    @xaverdh @Ma27
    xaverdh authored and Ma27 committed Apr 17, 2020
    Copy the full SHA
    8e053b9 View commit details

  4. 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

(cherry picked from commit 192485f)
    @Ma27
    Ma27 committed Apr 17, 2020
    Copy the full SHA
    e3354df View commit details

  5. grocy: 2.7.0 -> 2.7.1 

    https://github.com/grocy/grocy/releases/tag/v2.7.1
(cherry picked from commit 135ae45)
    @Ma27
    Ma27 committed Apr 17, 2020
    Copy the full SHA
    668d0de View commit details
Showing with 32 additions and 7 deletions.
  1. +28 −4 pkgs/applications/networking/mailreaders/neomutt/default.nix
  2. +2 −1 pkgs/applications/office/paperwork/default.nix
  3. +2 −2 pkgs/servers/grocy/default.nix
32 changes: 28 additions & 4 deletions pkgs/applications/networking/mailreaders/neomutt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,37 @@
{ 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
, 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
mailcap sqlite
];

nativeBuildInputs = [
docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which
docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib
];

enableParallelBuilding = true;
@@ -61,6 +71,7 @@ stdenv.mkDerivation rec {
"--with-mailpath="
# Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
"ac_cv_path_SENDMAIL=sendmail"
"--zlib"
];

# Fix missing libidn in mutt;
@@ -74,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";
3 changes: 2 additions & 1 deletion pkgs/applications/office/paperwork/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, aspellDicts, buildEnv
, gnome3, librsvg
, xvfb_run, dbus, libnotify
, stdenv
}:

python3Packages.buildPythonApplication rec {
@@ -77,6 +78,6 @@ python3Packages.buildPythonApplication rec {
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.aszlig ];
platforms = lib.platforms.linux;
broken = true;
broken = stdenv.isAarch64;
};
}
4 changes: 2 additions & 2 deletions pkgs/servers/grocy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "grocy";
version = "2.7.0";
version = "2.7.1";

src = fetchurl {
url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip";
sha256 = "10da7s8yc3adqzd8446ksgq61zyzxb4qbnwkzj11qh64y5hyj50q";
sha256 = "0ab1yxj499vadakq2c1lils3ir6fm02wrdgrirrlar4s4z6c4p7r";
};

nativeBuildInputs = [ unzip ];