[PATCH 0/3] gnu: Add notmuch

[PATCH 0/3] gnu: Add notmuch

[David Thompson]

This series of patches adds package recipes for notmuch and its
missing dependencies.

I've wrestled for a long time trying to get the test suite to pass, but
I just can't figure out why it's failing, so I've skipped them for now.
If anyone would like to take a stab at getting the suite to pass, please
feel free to do so.

I did some quick tests with the resulting build and it seems to work
okay.

Thoughts?

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

[PATCH 1/3] gnu: Add talloc

[David Thompson]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-Add-talloc.patch --]
[-- Type: text/x-diff, Size: 2108 bytes --]

From 0abe65240aa355cdc9a5983fa8c32a83e1dd1baa Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson@member.fsf.org>
Date: Sun, 6 Apr 2014 12:25:57 -0400
Subject: [PATCH 1/3] gnu: Add talloc.

* gnu/packages/samba.scm (talloc): New variable.
---
 gnu/packages/samba.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 5b52a38..c6fef61 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -162,3 +162,35 @@ DOS and Windows, OS/2, GNU/Linux and many others.
 Samba is an important component to seamlessly integrate Linux/Unix Servers and
 Desktops into Active Directory environments using the winbind daemon.")
     (license gpl3+)))
+
+(define-public talloc
+  (package
+    (name "talloc")
+    (version "2.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.samba.org/ftp/talloc/talloc-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "13zh628hzlp2v9vj70knnfac2xbxqrdhgap30csq4zv4h8w3j087"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases (alist-replace
+                 'configure
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   ;; talloc uses a custom configuration script that runs a
+                   ;; python script called 'waf'.
+                   (setenv "CONFIG_SHELL" (which "sh"))
+                   (let ((out (assoc-ref outputs "out")))
+                     (zero? (system* "./configure"
+                                     (string-append "--prefix=" out)))))
+                 %standard-phases)))
+    (inputs
+     `(("python" ,python-2)))
+    (home-page "http://talloc.samba.org")
+    (synopsis "Hierarchical, reference counted memory pool system")
+    (description
+     "Talloc is a hierarchical, reference counted memory pool system with
+destructors.  It is the core memory allocator used in Samba.")
+    (license gpl3+))) ;; The bundled "replace" library uses LGPL3.
-- 
2.0.0


[-- Attachment #2: Type: text/plain, Size: 137 bytes --]



-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 1/3] gnu: Add talloc

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> From 0abe65240aa355cdc9a5983fa8c32a83e1dd1baa Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson@member.fsf.org>
> Date: Sun, 6 Apr 2014 12:25:57 -0400
> Subject: [PATCH 1/3] gnu: Add talloc.
>
> * gnu/packages/samba.scm (talloc): New variable.

Looks good to me, please push!

Ludo’.

Re: [PATCH 1/3] gnu: Add talloc

[David Thompson]

Ludovic Courtès <ludo@gnu.org> writes:

> Looks good to me, please push!

Pushed!

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 2/3] gnu: Add dtach

[David Thompson]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0002-gnu-Add-dtach.patch --]
[-- Type: text/x-diff, Size: 1983 bytes --]

From 1315cc5939cc8abaf7a292e30226672e94230724 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson@member.fsf.org>
Date: Sun, 6 Apr 2014 14:36:31 -0400
Subject: [PATCH 2/3] gnu: Add dtach.

gnu/packages/screen.scm (dtach): New variable.
---
 gnu/packages/screen.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm
index ae03220..63fb7a4 100644
--- a/gnu/packages/screen.scm
+++ b/gnu/packages/screen.scm
@@ -57,3 +57,35 @@ then manages the different virtual terminals, allowing you to easily switch
 between them, to detach them from the current session, or even splitting the
 view to show two terminals at once.")
     (license gpl2+)))
+
+(define-public dtach
+  (package
+    (name "dtach")
+    (version "0.8")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/dtach/dtach-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1agjp08zxxxfni62sqx9qsd9526yqwlz7ry07lfq3clavyylwq8n"))))
+    (build-system gnu-build-system)
+    (arguments
+     ;; No install target.
+     '(#:phases (alist-replace
+                 'install
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let ((out (assoc-ref outputs "out")))
+                     (mkdir out)
+                     (mkdir (string-append out "/bin"))
+                     (copy-file "dtach" (string-append out "/bin/dtach"))))
+                 %standard-phases)
+       ;; No check target.
+       #:tests? #f))
+    (home-page "http://dtach.sourceforge.net/")
+    (synopsis "Emulates the detach feature of screen")
+    (description
+     "dtach is a tiny program that emulates the detach feature of screen,
+allowing you to run a program in an environment that is protected from the
+controlling terminal and attach to it later.")
+    (license gpl2+)))
-- 
2.0.0


[-- Attachment #2: Type: text/plain, Size: 136 bytes --]


-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 2/3] gnu: Add dtach

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> From 1315cc5939cc8abaf7a292e30226672e94230724 Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson@member.fsf.org>
> Date: Sun, 6 Apr 2014 14:36:31 -0400
> Subject: [PATCH 2/3] gnu: Add dtach.
>
> gnu/packages/screen.scm (dtach): New variable.

OK to push!

> +                 (lambda* (#:key outputs #:allow-other-keys)
> +                   (let ((out (assoc-ref outputs "out")))
> +                     (mkdir out)
> +                     (mkdir (string-append out "/bin"))

It could be 1 line shorter with (mkdir-p (string-append out "/bin")).

Ludo’.

Re: [PATCH 2/3] gnu: Add dtach

[David Thompson]

Ludovic Courtès <ludo@gnu.org> writes:

> OK to push!
>
>> +                 (lambda* (#:key outputs #:allow-other-keys)
>> +                   (let ((out (assoc-ref outputs "out")))
>> +                     (mkdir out)
>> +                     (mkdir (string-append out "/bin"))
>
> It could be 1 line shorter with (mkdir-p (string-append out "/bin")).

Made that change and pushed.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 3/3] gnu: Add notmuch

[David Thompson]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0003-gnu-Add-notmuch.patch --]
[-- Type: text/x-diff, Size: 2446 bytes --]

From b2f866ada34994d07279b2ebd6e6c73183ad9578 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Sat, 14 Jun 2014 20:52:09 -0400
Subject: [PATCH 3/3] gnu: Add notmuch.

* gnu/packages/mail.scm (notmuch): New variable.
---
 gnu/packages/mail.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 796dcd7..d9c847d 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -44,6 +44,8 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages bdb)
+  #:use-module (gnu packages gdb)
+  #:use-module (gnu packages samba)
   #:use-module ((guix licenses)
                 #:select (gpl2 gpl2+ gpl3+ lgpl2.1+ lgpl3+))
   #:use-module (guix packages)
@@ -326,4 +328,42 @@ messages you need; in addition, it allows you to view messages, extract
 attachments, create new maildirs, and so on.")
     (license gpl3+)))
 
+(define-public notmuch
+  (package
+    (name "notmuch")
+    (version "0.18")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://notmuchmail.org/releases/notmuch-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1ia65iazz2hlp3ja57yn0chs27rzsky9kayw74njwmgi9faw3vh9"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f ;; FIXME: Test suite hangs and times out.
+       #:phases (alist-replace
+                 'configure
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (setenv "CONFIG_SHELL" (which "sh"))
+                   (let ((out (assoc-ref outputs "out")))
+                     (zero? (system* "./configure"
+                                     (string-append "--prefix=" out)))))
+                 %standard-phases)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("emacs" ,emacs)
+       ("glib" ,glib)
+       ("gmime" ,gmime)
+       ("talloc" ,talloc)
+       ("xapian" ,xapian)
+       ("zlib" ,zlib)))
+    (home-page "http://notmuchmail.org/")
+    (synopsis "Thread-based email index, search, and tagging")
+    (description
+     "Notmuch is a command-line based program for indexing, searching, read-
+ing, and tagging large collections of email messages.")
+    (license gpl3+)))
+
 ;;; mail.scm ends here
-- 
2.0.0


[-- Attachment #2: Type: text/plain, Size: 136 bytes --]


-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 3/3] gnu: Add notmuch

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> From b2f866ada34994d07279b2ebd6e6c73183ad9578 Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson2@worcester.edu>
> Date: Sat, 14 Jun 2014 20:52:09 -0400
> Subject: [PATCH 3/3] gnu: Add notmuch.
>
> * gnu/packages/mail.scm (notmuch): New variable.

OK to push.

> +    (arguments
> +     '(#:tests? #f ;; FIXME: Test suite hangs and times out.

Does the test suite succeed outside of the chroot environment?  That is,
if you build with --keep-failed, and then cd to /tmp/nix-build*, source
environment-variables, and run ‘make check’, does it pass?

Thanks,
Ludo’.

Re: [PATCH 3/3] gnu: Add notmuch

[David Thompson]

Ludovic Courtès <ludo@gnu.org> writes:

>> +    (arguments
>> +     '(#:tests? #f ;; FIXME: Test suite hangs and times out.
>
> Does the test suite succeed outside of the chroot environment?  That is,
> if you build with --keep-failed, and then cd to /tmp/nix-build*, source
> environment-variables, and run ‘make check’, does it pass?

It doesn't pass, but it does not hang.  Interesting.

For the record, in order to run the test suite: perl, python, gnupg,
man-db, and dtach are needed as native-inputs.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 3/3] gnu: Add notmuch

[David Thompson]

Ludovic Courtès <ludo@gnu.org> writes:

> OK to push.
>

Pushed.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate