From 0e66f4a12f7a9f7a0840f1e072b21291c7b66596 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice <me@tobias.gr> Date: Mon, 25 Jun 2018 00:37:53 +0200 Subject: gnu: dovecot-trees: Fix build with dovecot 2.3. * gnu/packages/mail.scm (dovecot-trees)[source]: Add patch. * gnu/packages/patches/dovecot-trees-support-dovecot-2.3.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/packages/mail.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 57d589721a..aa9042edad 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1273,7 +1273,9 @@ (define-public dovecot-trees (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0rkk10b1bsjz979sc864vpgcdchy7yxwmyv4ik50lar1h6awdnrf")))) + "0rkk10b1bsjz979sc864vpgcdchy7yxwmyv4ik50lar1h6awdnrf")) + (patches + (search-patches "dovecot-trees-support-dovecot-2.3.patch")))) (build-system gnu-build-system) (native-inputs `(("automake" ,automake) -- cgit v1.2.3 From 1a1f778efd9b5b0521650d217f5df8231a04832a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice <me@tobias.gr> Date: Sun, 24 Jun 2018 12:11:57 +0200 Subject: gnu: dovecot-trees: Return #t from phases. * gnu/packages/mail.scm (dovecot-trees)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index aa9042edad..2393ea2ea8 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1294,7 +1294,7 @@ (define-public dovecot-trees (modify-phases %standard-phases (add-after 'unpack 'autogen (lambda _ - (zero? (system* "sh" "autogen.sh"))))))) + (invoke "sh" "autogen.sh")))))) (home-page "https://0xacab.org/riseuplabs/trees") (synopsis "NaCL-based Dovecot email storage encryption plugin") (description -- cgit v1.2.3 From 7232c3f52325510a37c6c01af5800f11b50999ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice <me@tobias.gr> Date: Sun, 24 Jun 2018 12:08:43 +0200 Subject: gnu: offlineimap: Return #t from all phases. * gnu/packages/mail.scm (offlineimap)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 2393ea2ea8..6488dd00f0 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -517,7 +517,7 @@ (define-public offlineimap (substitute* "docs/Makefile" ;; Prevent xmllint and xsltproc from downloading a DTD file. (("a2x -v") "a2x --no-xmllint --xsltproc-opts=--nonet -v")) - (zero? (system* "make" "-C" "docs" "man")))) + (invoke "make" "-C" "docs" "man"))) (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 82d2dfa06140cd9a79b1ee3628c15a2f3deb069f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice <me@tobias.gr> Date: Sun, 24 Jun 2018 12:09:37 +0200 Subject: gnu: notmuch: Return #t from all phases. * gnu/packages/mail.scm (notmuch)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/mail.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 6488dd00f0..58ccb1e397 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -795,12 +795,10 @@ (define-public notmuch (elisp (string-append out "/share/emacs/site-lisp/guix.d/" ,name "-" ,version))) - (zero? - (system* - "./configure" - (string-append "--prefix=" out) - (string-append "--emacslispdir=" elisp) - (string-append "--emacsetcdir=" elisp)))))) + (invoke "./configure" + (string-append "--prefix=" out) + (string-append "--emacslispdir=" elisp) + (string-append "--emacsetcdir=" elisp))))) (add-before 'check 'prepare-test-environment (lambda _ (setenv "TEST_CC" "gcc") -- cgit v1.2.3 From df22b95c0a8be671c4a2c2a7c767889e954a3fcb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice <me@tobias.gr> Date: Sun, 24 Jun 2018 12:10:33 +0200 Subject: gnu: libetpan: Return #t from phases. * gnu/packages/mail.scm (libetpan)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 58ccb1e397..621f0b5f51 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -975,7 +975,7 @@ (define-public libetpan (add-after 'unpack 'autogen (lambda _ (setenv "NOCONFIGURE" "true") - (zero? (system* "sh" "autogen.sh"))))) + (invoke "sh" "autogen.sh")))) #:configure-flags '("--disable-static" "--disable-db"))) (home-page "http://www.etpan.org/libetpan.html") -- cgit v1.2.3 From bc884ed8abc6075cfb2fa239154d43156cc5edea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice <me@tobias.gr> Date: Sun, 24 Jun 2018 12:13:27 +0200 Subject: gnu: dovecot-libsodium-plugin: Return #t from phases. * gnu/packages/mail.scm (dovecot-libsodium-plugin)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 621f0b5f51..fef7bc39c5 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1348,7 +1348,7 @@ (define-public dovecot-libsodium-plugin (modify-phases %standard-phases (add-after 'unpack 'autogen (lambda _ - (zero? (system* "sh" "autogen.sh"))))))) + (invoke "sh" "autogen.sh")))))) (home-page "https://github.com/LuckyFellow/dovecot-libsodium-plugin") (synopsis "Libsodium password hashing schemes plugin for Dovecot") (description -- cgit v1.2.3 From 55492129f55116acfe8ab42aefd00fa829c3ac58 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice <me@tobias.gr> Date: Sun, 24 Jun 2018 12:16:54 +0200 Subject: gnu: sendmail: Return #t from all phases. * gnu/packages/mail.scm (sendmail)[arguments]: Substitute INVOKE for SYSTEM*. Return #t rather than undefined from phases. --- gnu/packages/mail.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index fef7bc39c5..d7963db383 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1955,14 +1955,15 @@ (define-public sendmail define(`confINSTALL', `~a/devtools/bin/install.sh') define(`confDEPEND_TYPE', `CC-M') define(`confINST_DEP', `') -" (getcwd)))))) +" (getcwd)))) + #t)) (replace 'build (lambda _ - (and (zero? (system* "sh" "Build")) - (with-directory-excursion "cf/cf" - (begin - (copy-file "generic-linux.mc" "sendmail.mc") - (zero? (system* "sh" "Build" "sendmail.cf"))))))) + (invoke "sh" "Build") + (with-directory-excursion "cf/cf" + (copy-file "generic-linux.mc" "sendmail.mc") + (invoke "sh" "Build" "sendmail.cf")) + #t)) (add-before 'install 'pre-install (lambda _ (let ((out (assoc-ref %outputs "out"))) @@ -1971,7 +1972,8 @@ (define-public sendmail (mkdir-p (string-append out "/etc/mail")) (setenv "DESTDIR" out) (with-directory-excursion "cf/cf" - (zero? (system* "sh" "Build" "install-cf"))))))) + (invoke "sh" "Build" "install-cf")) + #t)))) ;; There is no make check. There are some post installation tests, but those ;; require root privileges #:tests? #f)) -- cgit v1.2.3 From dcfdaa15de98dbe063083034b7964a99b60a6d1f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice <me@tobias.gr> Date: Sun, 24 Jun 2018 22:48:48 +0200 Subject: gnu: python2-django-mailman3: Return #t from phases. * gnu/packages/mail.scm (python2-django-mailman3)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/mail.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index d7963db383..bf77b0a7fe 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2225,12 +2225,10 @@ (define-public python2-django-mailman3 (modify-phases %standard-phases (replace 'check (lambda _ - (zero? - (system* - "django-admin" - "test" - "--settings=django_mailman3.tests.settings_test" - "django_mailman3"))))) + (invoke "django-admin" + "test" + "--settings=django_mailman3.tests.settings_test" + "django_mailman3")))) #:python ,python-2)) (inputs `(("python2-django" ,python2-django))) -- cgit v1.2.3