[PATCH] bump mu/mu4e to version 0.9.11

[PATCH] bump mu/mu4e to version 0.9.11

[Paul van der Walt]

$ ./hi --all,

Here's my first modest patch. I use mu4e, and therefore it bothered me
that the version in Guix was about a year old. The upgraded version
seems to work fine for me, so that's nice.

I hope i haven't done anything blatantly brain-dead.

Bye!
p.


* gnu/packages/mail.scm: Bump mu version from 0.9.9.5 -> 0.9.11
---
 gnu/packages/mail.scm | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index dc33c8c..b450e91 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -304,18 +304,21 @@ repository and Maildir/IMAP as LOCAL repository.")
 (define-public mu
   (package
     (name "mu")
-    (version "0.9.9.5")
+    (version "0.9.11")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://mu0.googlecode.com/files/mu-"
+              (uri (string-append "https://github.com/djcb/mu/archive/v"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1hwkliyb8fjrz5sw9fcisssig0jkdxzhccw0ld0l9a10q1l9mqhp"))))
+                "01n1lzq4pfsm5pn932p948d1z55yqc7kkm1ifjxjchb3k8lr66fh"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("glib" ,glib "bin")             ; for gtester
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
        ("texinfo" ,texinfo)))
     ;; TODO: Add webkit and gtk to build the mug GUI.
     (inputs
@@ -326,14 +329,18 @@ repository and Maildir/IMAP as LOCAL repository.")
        ("gmime" ,gmime)
        ("tzdata" ,tzdata)))             ;for mu/test/test-mu-query.c
     (arguments
-     '(#:phases (alist-cons-before
-                 'check 'check-tz-setup
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   ;; For mu/test/test-mu-query.c
-                   (setenv "TZDIR"
-                           (string-append (assoc-ref inputs "tzdata")
-                                          "/share/zoneinfo")))
-                 %standard-phases)))
+     '(#:phases (alist-cons-after
+                 'unpack 'autoreconf
+                 (lambda _
+                   (zero? (system* "autoreconf" "-vi")))
+                 (alist-cons-before
+                   'check 'check-tz-setup
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     ;; For mu/test/test-mu-query.c
+                     (setenv "TZDIR"
+                             (string-append (assoc-ref inputs "tzdata")
+                                            "/share/zoneinfo")))
+                   %standard-phases))))
     (home-page "http://www.djcbsoftware.nl/code/mu/")
     (synopsis "Quickly find emails")
     (description
-- 
2.3.1

Re: [PATCH] bump mu/mu4e to version 0.9.11

[Mark H Weaver]

Paul van der Walt <paul@denknerd.org> writes:

> Here's my first modest patch. I use mu4e, and therefore it bothered me
> that the version in Guix was about a year old. The upgraded version
> seems to work fine for me, so that's nice.

Looks good to me, modulo a few minor nits.  Please see below.

> * gnu/packages/mail.scm: Bump mu version from 0.9.9.5 -> 0.9.11

By our usual conventions, the commit log should look like this:

--8<---------------cut here---------------start------------->8---
gnu: mu: Update to 0.9.11.

* gnu/packages/mail.scm (mu): Update to 0.9.11.
--8<---------------cut here---------------end--------------->8---

> diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
> index dc33c8c..b450e91 100644
> --- a/gnu/packages/mail.scm
> +++ b/gnu/packages/mail.scm

Please add your copyright line to the top of the file.

> @@ -304,18 +304,21 @@ repository and Maildir/IMAP as LOCAL repository.")
>  (define-public mu
>    (package
>      (name "mu")
> -    (version "0.9.9.5")
> +    (version "0.9.11")
>      (source (origin
>                (method url-fetch)
> -              (uri (string-append "https://mu0.googlecode.com/files/mu-"
> +              (uri (string-append "https://github.com/djcb/mu/archive/v"
>                                    version ".tar.gz"))

Please add (file-name (string-append "mu-" version ".tar.gz")) as
another field to the 'origin' form, so that the file name in /gnu/store
will include "mu-" in the name.  This is rarely needed, but is needed
here because the name of the file in the URI (after the last '/')
doesn't include the package name.

Otherwise it looks good to me.  Can you send an updated patch?

    Thanks!
      Mark

Re: [PATCH] bump mu/mu4e to version 0.9.11

[Paul van der Walt]

[-- Attachment #1: Type: text/plain, Size: 127 bytes --]

Hi Mark,

> Looks good to me, modulo a few minor nits.

Thanks for the feedback! I've tried again, see attachment.

Cheers,
p.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-mu-Update-to-0.9.11.patch --]
[-- Type: text/x-diff, Size: 2814 bytes --]

From 579637f64f075c25028479a259ae860fe276efa6 Mon Sep 17 00:00:00 2001
From: Paul van der Walt <paul@denknerd.org>
Date: Fri, 27 Feb 2015 01:23:48 +0100
Subject: [PATCH] gnu: mu: Update to 0.9.11.

* gnu/packages/mail.scm (mu): Update to 0.9.11.
---
 gnu/packages/mail.scm | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index dc33c8c..ca25c58 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -304,18 +304,22 @@ repository and Maildir/IMAP as LOCAL repository.")
 (define-public mu
   (package
     (name "mu")
-    (version "0.9.9.5")
+    (version "0.9.11")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://mu0.googlecode.com/files/mu-"
+              (uri (string-append "https://github.com/djcb/mu/archive/v"
                                   version ".tar.gz"))
+              (file-name (string-append "mu-" version ".tar.gz"))
               (sha256
                (base32
-                "1hwkliyb8fjrz5sw9fcisssig0jkdxzhccw0ld0l9a10q1l9mqhp"))))
+                "01n1lzq4pfsm5pn932p948d1z55yqc7kkm1ifjxjchb3k8lr66fh"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("glib" ,glib "bin")             ; for gtester
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
        ("texinfo" ,texinfo)))
     ;; TODO: Add webkit and gtk to build the mug GUI.
     (inputs
@@ -326,14 +330,18 @@ repository and Maildir/IMAP as LOCAL repository.")
        ("gmime" ,gmime)
        ("tzdata" ,tzdata)))             ;for mu/test/test-mu-query.c
     (arguments
-     '(#:phases (alist-cons-before
-                 'check 'check-tz-setup
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   ;; For mu/test/test-mu-query.c
-                   (setenv "TZDIR"
-                           (string-append (assoc-ref inputs "tzdata")
-                                          "/share/zoneinfo")))
-                 %standard-phases)))
+     '(#:phases (alist-cons-after
+                 'unpack 'autoreconf
+                 (lambda _
+                   (zero? (system* "autoreconf" "-vi")))
+                 (alist-cons-before
+                   'check 'check-tz-setup
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     ;; For mu/test/test-mu-query.c
+                     (setenv "TZDIR"
+                             (string-append (assoc-ref inputs "tzdata")
+                                            "/share/zoneinfo")))
+                   %standard-phases))))
     (home-page "http://www.djcbsoftware.nl/code/mu/")
     (synopsis "Quickly find emails")
     (description
-- 
2.3.1

Re: [PATCH] bump mu/mu4e to version 0.9.11

[Mark H Weaver]

Paul van der Walt <paul@denknerd.org> writes:

> From 579637f64f075c25028479a259ae860fe276efa6 Mon Sep 17 00:00:00 2001
> From: Paul van der Walt <paul@denknerd.org>
> Date: Fri, 27 Feb 2015 01:23:48 +0100
> Subject: [PATCH] gnu: mu: Update to 0.9.11.
>
> * gnu/packages/mail.scm (mu): Update to 0.9.11.

Looks good to me, although I forgot to mention that the other changes
should have been mentioned in the commit log as well: updating the
source URI, adding the new native-inputs, and adding the new phase.  I
took the liberty of adding those to the commit log before pushing it to
master.  Hope you don't mind.

    Thanks!
      Mark