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: 216237e349db
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9651e63fa3a1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 20, 2020

  1. mu: 1.2 -> 1.4.1 

    msg2pdf is disabled for now:
https://github.com/djcb/mu/blob/1.4.1/NEWS.org
    @magnetophon
    magnetophon committed Apr 20, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    prusnak Pavol Rusnak
    GPG key ID: 91F3B339B9A02A3D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ed79cb5 View commit details

  2. Merge pull request #85606 from magnetophon/mu 

    mu: 1.2 -> 1.4.1
    @Mic92
    Mic92 authored Apr 20, 2020
    Copy the full SHA
    9651e63 View commit details
Showing with 6 additions and 13 deletions.
  1. +6 −13 pkgs/tools/networking/mu/default.nix
19 changes: 6 additions & 13 deletions pkgs/tools/networking/mu/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,20 +5,15 @@

stdenv.mkDerivation rec {
pname = "mu";
version = "1.2";
version = "1.4.1";

src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = version;
sha256 = "0yhjlj0z23jw3cf2wfnl98y8q6gikvmhkb8vdm87bd7jw0bdnrfz";
sha256 = "0q2ik7fj5k9i76js4ijyxbgrwqff437lass0sd5if2r40rqh0as0";
};

# test-utils coredumps so don't run those
postPatch = ''
sed -i -e '/test-utils/d' lib/parser/Makefile.am
'';

buildInputs = [
sqlite xapian glib gmime3 texinfo emacs guile libsoup icu
] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ];
@@ -27,19 +22,17 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

preConfigure = "./autogen.sh";

preBuild = ''
# Fix mu4e-builddir (set it to $out)
substituteInPlace mu4e/mu4e-meta.el.in \
--replace "@abs_top_builddir@" "$out"
# We install msg2pdf to bin/msg2pdf, fix its location in elisp
substituteInPlace mu4e/mu4e-actions.el \
--replace "/toys/msg2pdf/" "/bin/"
'';

# Install mug and msg2pdf
# Install mug
postInstall = stdenv.lib.optionalString withMug ''
for f in msg2pdf mug ; do
for f in mug ; do
install -m755 toys/$f/$f $out/bin/$f
done
'';