From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 01 03:19:39 2017 Received: (at submit) by debbugs.gnu.org; 1 Aug 2017 07:19:39 +0000 Received: from localhost ([127.0.0.1]:36034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcRSt-0003Th-Kv for submit@debbugs.gnu.org; Tue, 01 Aug 2017 03:19:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33831) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcRSs-0003TV-69 for submit@debbugs.gnu.org; Tue, 01 Aug 2017 03:19:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dcRSm-000811-C6 for submit@debbugs.gnu.org; Tue, 01 Aug 2017 03:19:32 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:55067) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dcRSm-00080v-8n for submit@debbugs.gnu.org; Tue, 01 Aug 2017 03:19:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dcRSl-0002so-4E for guix-patches@gnu.org; Tue, 01 Aug 2017 03:19:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dcRSg-0007wm-DI for guix-patches@gnu.org; Tue, 01 Aug 2017 03:19:29 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:38634 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dcRSg-0007wJ-5A for guix-patches@gnu.org; Tue, 01 Aug 2017 03:19:26 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id A16044E30CB; Tue, 1 Aug 2017 09:18:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1501571908; bh=ZxAzTAPna9XfvLNuIzhsxPdciEoBZ+9pDMak3fT82ec=; h=From:To:Subject:Date:From; b=ZDOm3sCJ5KdUl1JUt5mHGagLEQiTk4zi9Ph9z80BTsYgfnf8JwcG8UJp3yk3ao/KJ tAYnyGlGsa0t8nDLqYq+uIgWs+AMGuSh4Mp2MDWx/Hi7yI4pSADz/8uzbxUnvaNmfF 3o/gH0Lntyr2AOlOH7U3lnBZP7kQESMQP/UiCJWw= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1501571907; bh=ZxAzTAPna9XfvLNuIzhsxPdciEoBZ+9pDMak3fT82ec=; h=From:To:Subject:Date:From; b=nEueqB1fkUy/jm2uftQ1a7tb9AcLome/4bJ0JQg9uySMNqma6cqv5AypTkEo74LDg brYuU43AjRZkNcbSlirGOYcdtzqD3UHZbOC9ZSeJ6w4H/zXW+/+XqqO4wzxGqWWp8T WSXwN1iEvxQWxTn8+eyGIeCeEvS0mMJYxbxVS7Ks= To: guix-patches@gnu.org Subject: Clean-up of package phases Date: Tue, 01 Aug 2017 03:18:01 -0400 Message-ID: <871sov69jq.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) --=-=-= Content-Type: text/plain These patches address some issues with our package definitions, as partially discussed with Mark on guix-devel. I believe I've corrected all the cases that are fit for Guix's master branch. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlmAKyoACgkQ5qXuPBlG eg1g9xAApb3wN/yVqEkyPkS1sT9msastiDanIRj5+XISyijHp+tyx3r4bRQ0lVcd i9mYWwLELfV+ZcFoq0jHx8pKEX7ljjPYxRhgoKDAaCOOiyf6Jjaqkap2mmjIHfs5 pgdCyKZ52s2FptwQTz5bi/VzZpxmuOo/RD91XVxs/hPG7GIRjojWVRhyeq9pQlYA WkmjZ3dlCULPWorwMzuAt4WsrQBXdRrPcEY2U2FeJqgCR14bDvuUnjOxvJvWXYHM mYxSlb8zcFCrzvfdwyslgrUQF9HPx5lGQliBmf3TaSkElJRVgutv47fhQXgDBuOG emReFEl1KaLZ+IndWpKPtIt+ybmX4DJfykMxzaJRm+x2XZOSNiHX0oF+Wp8u/Z9i PFQvllnCwFi4t4ywPb1GaPfuInHC1aOMkBQqqaW8kSp2MHFIJA98W7bBLX+kWrN2 /F7kCPwojlCeuB/rflouKZ9R5GPjdvojQtSBKrl7PW1RcHfRsFJrsiyjfH28LnZV veDlCAwgkZVUzGXBNRZysZMKQnA3dSmKbVzOjA/+D3vMEa1ATZNqlHQz6myby70z 8Pzt02e1eARySNAKzNwncJWf4CcP2GDv/VlLfRXaF9oPrPJKFd/oh4L7FAIEtCkP M458d2m12Yxq8eaH1k3+icuawD84AW7bw4ENxlmObxQWaR9KJDQ= =zDWA -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 01 03:22:16 2017 Received: (at 27898) by debbugs.gnu.org; 1 Aug 2017 07:22:16 +0000 Received: from localhost ([127.0.0.1]:36038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcRVQ-0003YF-2I for submit@debbugs.gnu.org; Tue, 01 Aug 2017 03:22:16 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:35444 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcRVO-0003Y6-F4 for 27898@debbugs.gnu.org; Tue, 01 Aug 2017 03:22:15 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 3EA644E3039; Tue, 1 Aug 2017 09:22:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1501572133; bh=mBy7HLXURttCADcIVfj5ZFkYdxKqLyRdGJHmzROwL6E=; h=From:To:Cc:Subject:Date:From; b=dwvUlECX9vUzhPJMbE40B7NRZTk6fZr8M97v0n9T/6VxmszKM/Zt7Mm8qzcIyzv4u 3psgx/8mm3KPvAr+tFkyn6yeM50em/jJe2Vw4Q0OhoSqPZdNahAkH3GGDVf/UOTdH/ TDwL70Srg2kae+7T3hcaDGkfDCY/imsLeiHDvUoA= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR002 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,T_FRT_COCK,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1501572127; bh=mBy7HLXURttCADcIVfj5ZFkYdxKqLyRdGJHmzROwL6E=; h=From:To:Cc:Subject:Date:From; b=y1B/ldM4yyridcBvvWYbB3lezp4zBgabLA4C1CZhlxlg5+evr4heREiqmsLAZQj0I o/zo+yVpSSG2aQIxKr6zbWFCXREtCwUyhzdSimwgs1zUkowOHzO1ZQa+tcEAhA3JOp S6gj2vF1J26lbiSbeFzvJqE+Ypd78gDBmbAhXMxA= To: 27898@debbugs.gnu.org Subject: [PATCH 1/2] gnu: Use 'modify-phases' syntax. Date: Tue, 1 Aug 2017 03:21:52 -0400 Message-Id: <20170801072153.19077-1-kei@openmailbox.org> X-Mailer: git-send-email 2.13.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Envelope-To: 27898 Cc: Kei Kebreau X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" * gnu/packages/admin.scm (mingetty, clusterssh, sudo, wpa-supplicant-minimal, wpa-supplicant, wakelan, acpica, tree, direvent, dstat)[arguments]: Use 'modify-phases' syntax. * gnu/packages/algebra.scm (arb)[arguments]: Likewise. * gnu/packages/apr.scm (apr-util)[arguments]: Likewise. * gnu/packages/audio.scm (clalsadrv, fluidsynth, faad2, lv2-mda-piano, lv2-mda-epiano, timidity++, vamp, soundtouch, portaudio, rsound, zita-convolver, zita-alsa-pcmi)[arguments]: Likewise. * gnu/packages/backup.scm (rdup, btar)[arguments]: Likewise. * gnu/packages/bioinformatics.scm (bedops, bwa, crossmap, express, flexbar, grit, hisat, ngs-sdk, subread)[arguments]: Likewise. * gnu/packages/bittorrent.scm (transmission)[arguments]: Likewise. * gnu/packages/cdrom.scm (cd-discid)[arguments]: Likewise. * gnu/packages/compression.scm (sharutils)[arguments]: Likewise. * gnu/packages/conky.scm (conky)[arguments]: Likewise. * gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Likewise. * gnu/packages/debug.scm (delta, c-reduce)[arguments]: Likewise. * gnu/packages/display-managers.scm (slim)[arguments]: Likewise. * gnu/packages/dns.scm (dnsmasq)[arguments]: Likewise. * gnu/packages/emacs.scm (geiser, emacs-wget, bbdb)[arguments]: Likewise. * gnu/packages/engineering.scm (pcb)[arguments]: Likewise. * gnu/packages/firmware.scm (ath9k-htc-firmware)[arguments]: Likewise. * gnu/packages/flashing-tools.scm (flashrom)[arguments]: Likewise. * gnu/packages/fltk.scm (fltk)[arguments]: Likewise. * gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Likewise. * gnu/packages/gd.scm (perl-gd)[arguments]: Likewise. * gnu/packages/gimp.scm (gegl)[arguments]: Likewise. * gnu/packages/gkrellm.scm (gkrellm)[arguments]: Likewise. * gnu/packages/glib.scm (glibmm)[arguments]: Likewise. * gnu/packages/gl.scm (glew)[arguments]: Likewise. * gnu/packages/gnome.scm (icon-naming-utils, orbit2, libbonobo, gnome-vfs, libgnome, libbonoboui, goffice-0.8, dconf)[arguments]: Likewise. * gnu/packages/gprolog.scm (gprolog)[arguments]: Likewise. * gnu/packages/gps.scm (gpscorrelate)[arguments]: Likewise. * gnu/packages/graphics.scm (agg)[arguments]: Likewise. * gnu/packages/gtk.scm (ganv, gtksourceview-2, guile-present, python2-pycairo) [arguments]: Likewise. * gnu/packages/guile.scm (guile-1.8)[arguments]: Likewise. * gnu/packages/guile-wm.scm (guile-wm)[arguments]: Likewise. * gnu/packages/hugs.scm (hugs)[arguments]: Likewise. * gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal) [arguments]: Likewise. * gnu/packages/image-viewers.scm (feh, sxiv)[arguments]: Likewise. * gnu/packages/libcanberra.scm (libcanberra)[arguments]: Likewise. * gnu/packages/libsigsegv.scm (libsigsegv)[arguments]: Likewise. * gnu/packages/linux.scm (zerofree, net-tools, bridge-utils, iw, fuse, unionfs-fuse/static, lm-sensors, i2c-tools, xsensors, perf, mdadm, libaio, module-init-tools)[arguments]: Likewise. * gnu/packages/lisp.scm (ccl)[arguments]: Likewise. * gnu/packages/lout.scm (lout)[arguments]: Likewise. * gnu/packages/lua.scm (luajit)[arguments]: Likewise. * gnu/packages/machine-learning.scm (shogun)[arguments]: Likewise. * gnu/packages/mail.scm (exim)[arguments]: Likewise. * gnu/packages/man.scm (man-pages, txt2man)[arguments]: Likewise. * gnu/packages/maths.scm (lapack, superlu-dist, openlibm, openspecfun, suitesparse)[arguments]: Likewise. * gnu/packages/messaging.scm (bitlbee)[arguments]: Likewise. * gnu/packages/mp3.scm (libmad, id3lib, mp3info)[arguments]: Likewise. * gnu/packages/music.scm (solfege)[arguments]: Likewise. * gnu/packages/noweb.scm (noweb)[arguments]: Likewise. * gnu/packages/patchutils.scm (patchutils, quilt, colordiff)[arguments]: Likewise. * gnu/packages/pdf.scm (xpdf, zathura-cb, zathura-ps, zathura-djvu, zathura-pdf-poppler, zathura, podofo, fbidag)[arguments]: Likewise. * gnu/packages/perl.scm (perl-file-list, perl-test-harness)[arguments]: Likewise. * gnu/packages/photo.scm (gphoto2)[arguments]: Likewise. * gnu/packages/popt.scm (popt)[arguments]: Likewise. * gnu/packages/pretty-print.scm (source-highlight, astyle)[arguments]: Likewise. * gnu/packages/pumpio.scm (pumpa)[arguments]: Likewise. * gnu/packages/python.scm (python-passlib, python-pycrypto, python2-empy, python-sqlalchemy, python-docopt)[arguments]: Likewise. * gnu/packages/rdf.scm (lrdf)[arguments]: Likewise. * gnu/packages/regex.scm (tre)[arguments]: Likewise. * gnu/packages/rrdtool.scm (rrdtool)[arguments]: Likewise. * gnu/packages/ruby.scm (ruby-2.1, ruby-1.8)[arguments]: Likewise. * gnu/packages/sawfish.scm (sawfish)[arguments]: Likewise. * gnu/packages/scheme.scm (racket)[arguments]: Likewise. * gnu/packages/sdl.scm (guile-sdl)[arguments]: Likewise. * gnu/packages/serveez.scm (serveez)[arguments]: Likewise. * gnu/packages/skribilo.scm (skribilo)[arguments]: Likewise. * gnu/packages/smalltalk.scm (smalltalk)[arguments]: Likewise. * gnu/packages/suckless.scm (dmenu, slock)[arguments]: Likewise. * gnu/packages/tcl.scm (expect)[arguments]: Likewise. * gnu/packages/telephony.scm (commoncpp)[arguments]: Likewise. * gnu/packages/textutils.scm (recode, libgtextutils)[arguments]: Likewise. * gnu/packages/time.scm (time)[arguments]: Likewise. * gnu/packages/tor.scm (privoxy)[arguments]: Likewise. * gnu/packages/uucp.scm (uucp)[arguments]: Likewise. * gnu/packages/video.scm (libdvdnav-4)[arguments]: Likewise. * gnu/packages/web-browsers.scm (lynx)[arguments]: Likewise. * gnu/packages/web.scm (tinyproxy)[arguments]: Likewise. * gnu/packages/wicd.scm (wicd)[arguments]: Likewise. * gnu/packages/wm.scm (bspwm)[arguments]: Likewise. * gnu/packages/xdisorg.scm (sxhkd, xcape)[arguments]: Likewise. * gnu/packages/xfce.scm (xfconf)[arguments]: Likewise. * gnu/packages/xfig.scm (transfig)[arguments]: Likewise. * gnu/packages/xorg.scm (imake)[arguments]: Likewise. --- gnu/packages/admin.scm | 294 ++++++++++++++--------------- gnu/packages/algebra.scm | 31 ++-- gnu/packages/apr.scm | 25 ++- gnu/packages/audio.scm | 193 +++++++++---------- gnu/packages/backup.scm | 33 ++-- gnu/packages/bioinformatics.scm | 250 +++++++++++++------------ gnu/packages/bittorrent.scm | 33 ++-- gnu/packages/cdrom.scm | 2 +- gnu/packages/compression.scm | 16 +- gnu/packages/conky.scm | 31 ++-- gnu/packages/databases.scm | 102 +++++----- gnu/packages/debug.scm | 70 +++---- gnu/packages/display-managers.scm | 22 +-- gnu/packages/dns.scm | 2 +- gnu/packages/docbook.scm | 26 +-- gnu/packages/emacs.scm | 74 ++++---- gnu/packages/engineering.scm | 43 +++-- gnu/packages/firmware.scm | 48 ++--- gnu/packages/flashing-tools.scm | 21 +-- gnu/packages/fltk.scm | 42 ++--- gnu/packages/freedesktop.scm | 33 ++-- gnu/packages/gd.scm | 19 +- gnu/packages/gimp.scm | 30 +-- gnu/packages/gkrellm.scm | 4 +- gnu/packages/gl.scm | 2 +- gnu/packages/glib.scm | 33 ++-- gnu/packages/gnome.scm | 145 +++++++-------- gnu/packages/gprolog.scm | 17 +- gnu/packages/gps.scm | 19 +- gnu/packages/graphics.scm | 13 +- gnu/packages/gtk.scm | 80 ++++---- gnu/packages/guile-wm.scm | 81 ++++---- gnu/packages/guile.scm | 36 ++-- gnu/packages/hugs.scm | 61 +++--- gnu/packages/hurd.scm | 60 +++--- gnu/packages/image-viewers.scm | 14 +- gnu/packages/libcanberra.scm | 18 +- gnu/packages/libsigsegv.scm | 13 +- gnu/packages/linux.scm | 379 +++++++++++++++++++------------------- gnu/packages/lisp.scm | 61 +++--- gnu/packages/lout.scm | 142 +++++++------- gnu/packages/lua.scm | 2 +- gnu/packages/machine-learning.scm | 88 +++++---- gnu/packages/mail.scm | 90 ++++----- gnu/packages/man.scm | 4 +- gnu/packages/maths.scm | 119 ++++++------ gnu/packages/messaging.scm | 27 ++- gnu/packages/mp3.scm | 87 ++++----- gnu/packages/music.scm | 102 +++++----- gnu/packages/noweb.scm | 79 ++++---- gnu/packages/patchutils.scm | 120 ++++++------ gnu/packages/pdf.scm | 69 +++---- gnu/packages/perl.scm | 31 ++-- gnu/packages/photo.scm | 15 +- gnu/packages/popt.scm | 17 +- gnu/packages/pretty-print.scm | 65 +++---- gnu/packages/pumpio.scm | 32 ++-- gnu/packages/python.scm | 47 +++-- gnu/packages/rdf.scm | 40 ++-- gnu/packages/regex.scm | 20 +- gnu/packages/rrdtool.scm | 19 +- gnu/packages/ruby.scm | 40 ++-- gnu/packages/sawfish.scm | 50 ++--- gnu/packages/scheme.scm | 134 +++++++------- gnu/packages/sdl.scm | 46 ++--- gnu/packages/serveez.scm | 15 +- gnu/packages/skribilo.scm | 29 +-- gnu/packages/smalltalk.scm | 17 +- gnu/packages/suckless.scm | 4 +- gnu/packages/tcl.scm | 15 +- gnu/packages/telephony.scm | 12 +- gnu/packages/textutils.scm | 25 ++- gnu/packages/time.scm | 19 +- gnu/packages/tor.scm | 14 +- gnu/packages/uucp.scm | 24 +-- gnu/packages/video.scm | 9 +- gnu/packages/web-browsers.scm | 10 +- gnu/packages/web.scm | 15 +- gnu/packages/wicd.scm | 214 +++++++++++---------- gnu/packages/wm.scm | 2 +- gnu/packages/xdisorg.scm | 5 +- gnu/packages/xfce.scm | 23 +-- gnu/packages/xfig.scm | 75 ++++---- gnu/packages/xorg.scm | 39 ++-- 84 files changed, 2253 insertions(+), 2274 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9729a30fc..afcf9dcae 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -361,32 +361,33 @@ login, passwd, su, groupadd, and useradd.") "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g")))) (build-system gnu-build-system) (arguments - `(#:phases (alist-replace 'configure - (lambda* (#:key inputs outputs - #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man8 (string-append - out "/share/man/man8")) - (sbin (string-append out "/sbin")) - (shadow (assoc-ref inputs "shadow")) - (login (string-append shadow - "/bin/login"))) - (substitute* "Makefile" - (("^SBINDIR.*") - (string-append "SBINDIR = " out - "/sbin\n")) - (("^MANDIR.*") - (string-append "MANDIR = " out - "/share/man/man8\n"))) - - ;; Pick the right 'login' by default. - (substitute* "mingetty.c" - (("\"/bin/login\"") - (string-append "\"" login "\""))) - - (mkdir-p sbin) - (mkdir-p man8))) - %standard-phases) + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man8 (string-append + out "/share/man/man8")) + (sbin (string-append out "/sbin")) + (shadow (assoc-ref inputs "shadow")) + (login (string-append shadow + "/bin/login"))) + (substitute* "Makefile" + (("^SBINDIR.*") + (string-append "SBINDIR = " out + "/sbin\n")) + (("^MANDIR.*") + (string-append "MANDIR = " out + "/share/man/man8\n"))) + + ;; Pick the right 'login' by default. + (substitute* "mingetty.c" + (("\"/bin/login\"") + (string-append "\"" login "\""))) + + (mkdir-p sbin) + (mkdir-p man8)) + #t))) #:tests? #f)) ; no tests (inputs `(("shadow" ,shadow))) @@ -725,25 +726,25 @@ by bandwidth they use.") ("perl-x11-protocol" ,perl-x11-protocol))) (arguments `(#:phases - (alist-cons-after - 'install 'set-load-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Put the perl-tk and perl-x11-protocol modules in the perl inc - ;; path for PROG - (let* ((out (assoc-ref outputs "out")) - (prog (string-append out "/bin/cssh")) - (perl-ver ,(package-version perl)) - (x11-inc (string-append - (assoc-ref inputs "perl-x11-protocol") - "/lib/perl5/site_perl/" perl-ver)) - (tk-inc (string-append - (assoc-ref inputs "perl-tk") - "/lib/perl5/site_perl/" perl-ver - "/x86_64-linux"))) - (wrap-program - prog - `("PERL5LIB" ":" prefix (,x11-inc ,tk-inc))))) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'install 'set-load-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Put the perl-tk and perl-x11-protocol modules in the perl inc + ;; path for PROG + (let* ((out (assoc-ref outputs "out")) + (prog (string-append out "/bin/cssh")) + (perl-ver ,(package-version perl)) + (x11-inc (string-append + (assoc-ref inputs "perl-x11-protocol") + "/lib/perl5/site_perl/" perl-ver)) + (tk-inc (string-append + (assoc-ref inputs "perl-tk") + "/lib/perl5/site_perl/" perl-ver + "/x86_64-linux"))) + (wrap-program + prog + `("PERL5LIB" ":" prefix (,x11-inc ,tk-inc)))) + #t))))) ;; The clusterssh.sourceforge.net address requires login to view (home-page "https://sourceforge.net/projects/clusterssh/") (synopsis "Secure concurrent multi-server terminal control") @@ -849,29 +850,30 @@ system administrator.") ;; Avoid non-determinism; see . #:parallel-build? #f - #:phases (alist-cons-before - 'configure 'pre-configure - (lambda _ - (substitute* "src/sudo_usage.h.in" - ;; Do not capture 'configure' arguments since we would - ;; unduly retain references, and also because the - ;; CPPFLAGS above would close the string literal - ;; prematurely. - (("@CONFIGURE_ARGS@") "\"\"")) - (substitute* (find-files "." "Makefile\\.in") - (("-o [[:graph:]]+ -g [[:graph:]]+") - ;; Allow installation as non-root. - "") - (("^install: (.*)install-sudoers(.*)" _ before after) - ;; Don't try to create /etc/sudoers. - (string-append "install: " before after "\n")) - (("\\$\\(DESTDIR\\)\\$\\(rundir\\)") - ;; Don't try to create /run/sudo. - "$(TMPDIR)/dummy") - (("\\$\\(DESTDIR\\)\\$\\(vardir\\)") - ;; Don't try to create /var/db/sudo. - "$(TMPDIR)/dummy"))) - %standard-phases) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda _ + (substitute* "src/sudo_usage.h.in" + ;; Do not capture 'configure' arguments since we would + ;; unduly retain references, and also because the + ;; CPPFLAGS above would close the string literal + ;; prematurely. + (("@CONFIGURE_ARGS@") "\"\"")) + (substitute* (find-files "." "Makefile\\.in") + (("-o [[:graph:]]+ -g [[:graph:]]+") + ;; Allow installation as non-root. + "") + (("^install: (.*)install-sudoers(.*)" _ before after) + ;; Don't try to create /etc/sudoers. + (string-append "install: " before after "\n")) + (("\\$\\(DESTDIR\\)\\$\\(rundir\\)") + ;; Don't try to create /run/sudo. + "$(TMPDIR)/dummy") + (("\\$\\(DESTDIR\\)\\$\\(vardir\\)") + ;; Don't try to create /var/db/sudo. + "$(TMPDIR)/dummy")) + #t))) ;; XXX: The 'testsudoers' test series expects user 'root' to exist, but ;; the chroot's /etc/passwd doesn't have it. Turn off the tests. @@ -907,13 +909,14 @@ commands and their arguments.") "0l0l5gz3d5j9bqjsbjlfcv4w4jwndllp9fmyai4x9kg6qhs6v4xl")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (chdir "wpa_supplicant") - (copy-file "defconfig" ".config") - (let ((port (open-file ".config" "al"))) - (display " + '(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (chdir "wpa_supplicant") + (copy-file "defconfig" ".config") + (let ((port (open-file ".config" "al"))) + (display " CONFIG_DEBUG_SYSLOG=y # Choose GnuTLS (the default is OpenSSL.) @@ -923,26 +926,24 @@ commands and their arguments.") CFLAGS += $(shell pkg-config libnl-3.0 --cflags) CONFIG_LIBNL32=y CONFIG_READLINE=y\n" port) - (close-port port))) - - (alist-cons-after - 'install 'install-man-pages - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man (string-append out "/share/man")) - (man5 (string-append man "/man5")) - (man8 (string-append man "/man8"))) - (define (copy-man-page target) - (lambda (file) - (install-file file target))) - - (mkdir-p man5) (mkdir man8) - (for-each (copy-man-page man5) - (find-files "doc/docbook" "\\.5")) - (for-each (copy-man-page man8) - (find-files "doc/docbook" "\\.8")) - #t)) - %standard-phases)) + (close-port port)) + #t)) + (add-after 'install 'install-man-pages + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man")) + (man5 (string-append man "/man5")) + (man8 (string-append man "/man8"))) + (define (copy-man-page target) + (lambda (file) + (install-file file target))) + + (mkdir-p man5) (mkdir man8) + (for-each (copy-man-page man5) + (find-files "doc/docbook" "\\.5")) + (for-each (copy-man-page man8) + (find-files "doc/docbook" "\\.8")) + #t)))) #:make-flags (list "CC=gcc" (string-append "BINDIR=" (assoc-ref %outputs "out") @@ -979,25 +980,24 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.") (arguments (substitute-keyword-arguments (package-arguments wpa-supplicant-minimal) ((#:phases phases) - `(alist-cons-after - 'configure 'configure-for-dbus - (lambda _ - (let ((port (open-file ".config" "al"))) - (display " + `(modify-phases ,phases + (add-after 'configure 'configure-for-dbus + (lambda _ + (let ((port (open-file ".config" "al"))) + (display " CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port) - (close-port port)) - #t) - (alist-cons-after - 'install-man-pages 'install-dbus-conf - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dir (string-append out "/etc/dbus-1/system.d"))) - (mkdir-p dir) - (copy-file "dbus/dbus-wpa_supplicant.conf" - (string-append dir "/wpa_supplicant.conf")))) - ,phases))))))) + (close-port port)) + #t)) + (add-after 'install-man-pages 'install-dbus-conf + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dir (string-append out "/etc/dbus-1/system.d"))) + (mkdir-p dir) + (copy-file "dbus/dbus-wpa_supplicant.conf" + (string-append dir "/wpa_supplicant.conf"))) + #t)))))))) (define-public wakelan (package @@ -1013,22 +1013,22 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.") "0vydqpf44146ir6k87gmqaq6xy66xhc1gkr3nsd7jj3nhy7ypx9x")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/bin")) - (mkdir-p (string-append out "/share/man/man1")) - - ;; It's an old configure script that doesn't understand - ;; the extra options we pass. - (setenv "CONFIG_SHELL" (which "bash")) - (zero? - (system* "./configure" - (string-append "--prefix=" out) - (string-append "--mandir=" out - "/share/man"))))) - %standard-phases) + '(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/bin")) + (mkdir-p (string-append out "/share/man/man1")) + + ;; It's an old configure script that doesn't understand + ;; the extra options we pass. + (setenv "CONFIG_SHELL" (which "bash")) + (zero? + (system* "./configure" + (string-append "--prefix=" out) + (string-append "--mandir=" out + "/share/man"))))))) #:tests? #f)) (home-page "http://kernel.org") ; really, no home page (synopsis "Send a wake-on-LAN packet") @@ -1087,7 +1087,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") "HOST=_LINUX" "OPT_CFLAGS=-Wall -fno-strict-aliasing") #:tests? #f ; no 'check' target. - #:phases (alist-delete 'configure %standard-phases))) + #:phases (modify-phases %standard-phases (delete 'configure)))) (home-page "http://acpica.org/") (synopsis "Tools for the development and debug of ACPI tables") (description @@ -1197,7 +1197,7 @@ recover lost partitions and/or make non-booting disks bootable again.") (base32 "04kviw799qxly08zb8n5mgxfd96gyis6x69q2qiw86jnh87c4mv9")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-delete 'configure %standard-phases) + '(#:phases (modify-phases %standard-phases (delete 'configure)) #:tests? #f ; no check target #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "prefix=" out))))) @@ -1226,23 +1226,23 @@ environment variable is set and output is to tty.") "#!$SHELL"))))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-before - 'build 'patch-/bin/sh - (lambda* (#:key inputs #:allow-other-keys) - ;; Use the right shell when executing the watcher and - ;; user-provided shell commands. - (let ((bash (assoc-ref inputs "bash"))) - (substitute* '("src/direvent.c" "src/progman.c") - (("\"/bin/sh\"") - (string-append "\"" bash "/bin/sh\""))) - - ;; Adjust the 'shell.at' test accordingly. - (substitute* "tests/testsuite" - (("SHELL=/bin/sh") - (string-append "SHELL=" bash "/bin/sh"))) - - #t)) - %standard-phases))) + '(#:phases + (modify-phases %standard-phases + (add-before 'build 'patch-/bin/sh + (lambda* (#:key inputs #:allow-other-keys) + ;; Use the right shell when executing the watcher and + ;; user-provided shell commands. + (let ((bash (assoc-ref inputs "bash"))) + (substitute* '("src/direvent.c" "src/progman.c") + (("\"/bin/sh\"") + (string-append "\"" bash "/bin/sh\""))) + + ;; Adjust the 'shell.at' test accordingly. + (substitute* "tests/testsuite" + (("SHELL=/bin/sh") + (string-append "SHELL=" bash "/bin/sh"))) + + #t)))))) (home-page "https://www.gnu.org/software/direvent/") (synopsis "Daemon to monitor directories for events such as file removal") (description @@ -1699,7 +1699,7 @@ results (ndiff), and a packet generation and response analysis tool (nping).") (list (string-append "DESTDIR=" out) "prefix=/")) ;; no configure script - #:phases (alist-delete 'configure %standard-phases))) + #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs `(("python-2" ,python-2))) (synopsis "Versatile resource statistics tool") (description "Dstat is a versatile replacement for @command{vmstat}, diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index d4405a5bf..f48f1c154 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -333,22 +333,21 @@ fast arithmetic.") ("mpfr" ,mpfr))) (arguments `(#:phases - (alist-replace - 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (flint (assoc-ref inputs "flint")) - (gmp (assoc-ref inputs "gmp")) - (mpfr (assoc-ref inputs "mpfr"))) - ;; do not pass "--enable-fast-install", which makes the - ;; homebrew configure process fail - (zero? (system* - "./configure" - (string-append "--prefix=" out) - (string-append "--with-flint=" flint) - (string-append "--with-gmp=" gmp) - (string-append "--with-mpfr=" mpfr))))) - %standard-phases))) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (flint (assoc-ref inputs "flint")) + (gmp (assoc-ref inputs "gmp")) + (mpfr (assoc-ref inputs "mpfr"))) + ;; do not pass "--enable-fast-install", which makes the + ;; homebrew configure process fail + (zero? (system* + "./configure" + (string-append "--prefix=" out) + (string-append "--with-flint=" flint) + (string-append "--with-gmp=" gmp) + (string-append "--with-mpfr=" mpfr))))))))) (synopsis "Arbitrary precision floating-point ball arithmetic") (description "Arb is a C library for arbitrary-precision floating-point ball diff --git a/gnu/packages/apr.scm b/gnu/packages/apr.scm index 17945c039..baadb41b6 100644 --- a/gnu/packages/apr.scm +++ b/gnu/packages/apr.scm @@ -80,19 +80,18 @@ around or take advantage of platform-specific deficiencies or features.") `(("expat" ,expat))) (arguments '(#:phases - (alist-replace - 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (apr (assoc-ref inputs "apr")) - (expat (assoc-ref inputs "expat"))) - (setenv "CONFIG_SHELL" (which "bash")) - (zero? - (system* "./configure" - (string-append "--prefix=" out) - (string-append "--with-apr=" apr) - (string-append "--with-expat=" expat))))) - %standard-phases) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (apr (assoc-ref inputs "apr")) + (expat (assoc-ref inputs "expat"))) + (setenv "CONFIG_SHELL" (which "bash")) + (zero? + (system* "./configure" + (string-append "--prefix=" out) + (string-append "--with-apr=" apr) + (string-append "--with-expat=" expat))))))) ;; There are race conditions during 'make check'. Typically, the ;; 'testall' executable is not built yet by the time 'make check' tries diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 40700cae3..e756fbf7c 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -623,23 +623,22 @@ language and software synthesizer.") `(#:tests? #f ; no "check" target #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases - (alist-cons-after - 'unpack 'patch-makefile-and-enter-directory - (lambda _ - (substitute* "libs/Makefile" - (("/sbin/ldconfig") "true") - (("^LIBDIR =.*") "LIBDIR = lib\n")) - (chdir "libs") - #t) - (alist-cons-after - 'install - 'install-symlink - (lambda _ - (symlink "libclalsadrv.so" - (string-append (assoc-ref %outputs "out") - "/lib/libclalsadrv.so.2"))) + (modify-phases %standard-phases + (add-after 'unpack 'patch-makefile-and-enter-directory + (lambda _ + (substitute* "libs/Makefile" + (("/sbin/ldconfig") "true") + (("^LIBDIR =.*") "LIBDIR = lib\n")) + (chdir "libs") + #t)) + (add-after 'install 'install-symlink + (lambda _ + (symlink "libclalsadrv.so" + (string-append (assoc-ref %outputs "out") + "/lib/libclalsadrv.so.2")) + #t)) ;; no configure script - (alist-delete 'configure %standard-phases))))) + (delete 'configure)))) (inputs `(("alsa-lib" ,alsa-lib) ("fftw" ,fftw))) @@ -978,11 +977,9 @@ follower.") (build-system gnu-build-system) (arguments `(#:phases - (alist-cons-after - 'unpack - 'remove-broken-symlinks - (lambda _ (delete-file-recursively "m4") #t) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'unpack 'remove-broken-symlinks + (lambda _ (delete-file-recursively "m4") #t))))) (inputs `(("libsndfile" ,libsndfile) ("alsa-lib" ,alsa-lib) @@ -1021,12 +1018,11 @@ also play midifiles using a Soundfont.") ("unzip" ,unzip))) (arguments '(#:phases - (alist-cons-after - 'unpack 'bootstrap - (lambda _ - (substitute* "bootstrap" (("\r\n") "\n")) - (zero? (system* "sh" "bootstrap"))) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ + (substitute* "bootstrap" (("\r\n") "\n")) + (zero? (system* "sh" "bootstrap"))))))) (home-page "http://www.audiocoding.com/faad2.html") (synopsis "MPEG-4 and MPEG-2 AAC decoder") (description @@ -1680,7 +1676,7 @@ software.") "TYPE=mdaPiano" (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:tests? #f ; no check target - #:phases (alist-delete 'configure %standard-phases))) + #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs `(("lv2" ,lv2) ("lvtk" ,lvtk))) @@ -1703,7 +1699,7 @@ software.") "TYPE=mdaEPiano" (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:tests? #f ; no check target - #:phases (alist-delete 'configure %standard-phases))) + #:phases (modify-phases %standard-phases (delete 'configure)))) (home-page "http://elephly.net/lv2/mdaepiano.html") (synopsis "LV2 port of the mda EPiano plugin") (description "An LV2 port of the mda EPiano VSTi."))) @@ -2096,19 +2092,19 @@ Suil currently supports every combination of Gtk 2, Qt 4, and X11.") (string-append "--with-default-path=" (assoc-ref %outputs "out") "/etc/timidity")) #:phases - (alist-cons-after - 'install 'install-config - (lambda _ - (let ((out (string-append (assoc-ref %outputs "out") - "/etc/timidity"))) - (mkdir-p out) - (call-with-output-file - (string-append out "/timidity.cfg") - (lambda (port) - (format port (string-append "source " - (assoc-ref %build-inputs "freepats") - "/share/freepats/freepats.cfg")))))) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'install 'install-config + (lambda _ + (let ((out (string-append (assoc-ref %outputs "out") + "/etc/timidity"))) + (mkdir-p out) + (call-with-output-file + (string-append out "/timidity.cfg") + (lambda (port) + (format port (string-append "source " + (assoc-ref %build-inputs "freepats") + "/share/freepats/freepats.cfg"))))) + #t))))) (inputs `(("alsa-lib" ,alsa-lib) ("ao" ,ao) @@ -2147,16 +2143,15 @@ disks as various audio file formats.") (arguments `(#:tests? #f ; no check target #:phases - (alist-cons-after - 'install 'remove-libvamp-hostsdk.la - (lambda* (#:key outputs #:allow-other-keys) - ;; https://bugs.launchpad.net/ubuntu/+source/vamp-plugin-sdk/+bug/1253656 - (for-each delete-file - (let ((out (assoc-ref outputs "out"))) - (list (string-append out "/lib/libvamp-sdk.la") - (string-append out "/lib/libvamp-hostsdk.la")))) - #t) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'install 'remove-libvamp-hostsdk.la + (lambda* (#:key outputs #:allow-other-keys) + ;; https://bugs.launchpad.net/ubuntu/+source/vamp-plugin-sdk/+bug/1253656 + (for-each delete-file + (let ((out (assoc-ref outputs "out"))) + (list (string-append out "/lib/libvamp-sdk.la") + (string-append out "/lib/libvamp-hostsdk.la")))) + #t))))) (inputs `(("libsndfile" ,libsndfile))) (native-inputs @@ -2318,11 +2313,10 @@ Tracker 3 S3M and Impulse Tracker IT files.") ("file" ,file))) (arguments '(#:phases - (alist-cons-after - 'unpack 'bootstrap - (lambda _ - (zero? (system* "sh" "bootstrap"))) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ + (zero? (system* "sh" "bootstrap"))))))) (home-page "http://www.surina.net/soundtouch/") (synopsis "Audio processing library for changing tempo, pitch and playback rate") @@ -2456,11 +2450,10 @@ portions of LAME.") '(#:phases ;; Autoreconf is necessary because the audacity-compat patch modifies ;; .in files. - (alist-cons-after - 'unpack 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vif"))) - %standard-phases) + (modify-phases %standard-phases + (add-after 'unpack 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-vif"))))) #:tests? #f)) ;no 'check' target (home-page "http://www.portaudio.com/") (synopsis "Audio I/O library") @@ -2524,14 +2517,13 @@ synthesizer written in C++.") ("pulseaudio" ,pulseaudio))) (arguments '(#:phases - (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (setenv "CC" "gcc") - (zero? - (system* "./configure" - (string-append "--prefix=" (assoc-ref outputs "out"))))) - %standard-phases) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (setenv "CC" "gcc") + (zero? + (system* "./configure" + (string-append "--prefix=" (assoc-ref outputs "out"))))))) ;; No 'check' target. #:tests? #f)) (home-page "http://themaister.net/rsound.html") @@ -2598,22 +2590,22 @@ result.") `(#:tests? #f ; no "check" target #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases - (alist-cons-after - 'unpack 'patch-makefile-and-enter-directory - (lambda _ - (substitute* "libs/Makefile" - (("ldconfig") "true") - (("^LIBDIR =.*") "LIBDIR = lib\n")) - (chdir "libs") #t) - (alist-cons-after - 'install - 'install-symlink - (lambda _ - (symlink "libzita-convolver.so" - (string-append (assoc-ref %outputs "out") - "/lib/libzita-convolver.so.3"))) + (modify-phases %standard-phases + (add-after 'unpack 'patch-makefile-and-enter-directory + (lambda _ + (substitute* "libs/Makefile" + (("ldconfig") "true") + (("^LIBDIR =.*") "LIBDIR = lib\n")) + (chdir "libs") + #t)) + (add-after 'install 'install-symlink + (lambda _ + (symlink "libzita-convolver.so" + (string-append (assoc-ref %outputs "out") + "/lib/libzita-convolver.so.3")) + #t)) ;; no configure script - (alist-delete 'configure %standard-phases))))) + (delete 'configure)))) (inputs `(("fftwf" ,fftwf))) (home-page "http://kokkinizita.linuxaudio.org") (synopsis "Fast, partitioned convolution engine library") @@ -2688,23 +2680,22 @@ provide high-quality sample rate conversion.") `(#:tests? #f ; no "check" target #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases - (alist-cons-after - 'unpack 'patch-makefile-and-enter-directory - (lambda _ - (substitute* "libs/Makefile" - (("ldconfig") "true") - (("^LIBDIR =.*") "LIBDIR = lib\n")) - (chdir "libs") - #t) - (alist-cons-after - 'install - 'install-symlink - (lambda _ - (symlink "libzita-alsa-pcmi.so" - (string-append (assoc-ref %outputs "out") - "/lib/libzita-alsa-pcmi.so.0"))) + (modify-phases %standard-phases + (add-after 'unpack 'patch-makefile-and-enter-directory + (lambda _ + (substitute* "libs/Makefile" + (("ldconfig") "true") + (("^LIBDIR =.*") "LIBDIR = lib\n")) + (chdir "libs") + #t)) + (add-after 'install 'install-symlink + (lambda _ + (symlink "libzita-alsa-pcmi.so" + (string-append (assoc-ref %outputs "out") + "/lib/libzita-alsa-pcmi.so.0")) + #t)) ;; no configure script - (alist-delete 'configure %standard-phases))))) + (delete 'configure)))) (inputs `(("alsa-lib" ,alsa-lib) ("fftw" ,fftw))) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index f9a537d71..df3e683d6 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -293,20 +293,20 @@ random access nor for in-place modification.") ("nettle" ,nettle))) (arguments `(#:parallel-build? #f ;race conditions - #:phases (alist-cons-before - 'build 'remove-Werror - ;; rdup uses a deprecated function from libarchive - (lambda _ - (substitute* "GNUmakefile" - (("^(CFLAGS=.*)-Werror" _ front) front))) - (alist-cons-before - 'check 'pre-check - (lambda _ - (setenv "HOME" (getcwd)) - (substitute* "testsuite/rdup/rdup.rdup-up-t-with-file.exp" - (("/bin/cat") (which "cat")))) - - %standard-phases)))) + #:phases + (modify-phases %standard-phases + (add-before 'build 'remove-Werror + ;; rdup uses a deprecated function from libarchive + (lambda _ + (substitute* "GNUmakefile" + (("^(CFLAGS=.*)-Werror" _ front) front)) + #t)) + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" (getcwd)) + (substitute* "testsuite/rdup/rdup.rdup-up-t-with-file.exp" + (("/bin/cat") (which "cat"))) + #t))))) (home-page "http://archive.miek.nl/projects/rdup/index.html") (synopsis "Provide a list of files to backup") (description @@ -336,9 +336,8 @@ list and implement the backup strategy.") "CC=gcc") #:tests? #f ;test input not distributed #:phases - (alist-delete - 'configure ;no configure phase - %standard-phases))) + ;; no configure phase + (modify-phases %standard-phases (delete 'configure)))) (home-page "http://viric.name/cgi-bin/btar/doc/trunk/doc/home.wiki") (synopsis "Tar-compatible archiver") (description diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 614a7d407..02250dfaf 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -366,32 +366,33 @@ transparently with both VCFs and BCFs, both uncompressed and BGZF-compressed.") '(#:tests? #f #:make-flags (list (string-append "BINDIR=" %output "/bin")) #:phases - (alist-cons-after - 'unpack 'unpack-tarballs - (lambda _ - ;; FIXME: Bedops includes tarballs of minimally patched upstream - ;; libraries jansson, zlib, and bzip2. We cannot just use stock - ;; libraries because at least one of the libraries (zlib) is - ;; patched to add a C++ function definition (deflateInit2cpp). - ;; Until the Bedops developers offer a way to link against system - ;; libraries we have to build the in-tree copies of these three - ;; libraries. - - ;; See upstream discussion: - ;; https://github.com/bedops/bedops/issues/124 - - ;; Unpack the tarballs to benefit from shebang patching. - (with-directory-excursion "third-party" - (and (zero? (system* "tar" "xvf" "jansson-2.6.tar.bz2")) - (zero? (system* "tar" "xvf" "zlib-1.2.7.tar.bz2")) - (zero? (system* "tar" "xvf" "bzip2-1.0.6.tar.bz2")))) - ;; Disable unpacking of tarballs in Makefile. - (substitute* "system.mk/Makefile.linux" - (("^\tbzcat .*") "\t@echo \"not unpacking\"\n") - (("\\./configure") "CONFIG_SHELL=bash ./configure")) - (substitute* "third-party/zlib-1.2.7/Makefile.in" - (("^SHELL=.*$") "SHELL=bash\n"))) - (alist-delete 'configure %standard-phases)))) + (modify-phases %standard-phases + (add-after 'unpack 'unpack-tarballs + (lambda _ + ;; FIXME: Bedops includes tarballs of minimally patched upstream + ;; libraries jansson, zlib, and bzip2. We cannot just use stock + ;; libraries because at least one of the libraries (zlib) is + ;; patched to add a C++ function definition (deflateInit2cpp). + ;; Until the Bedops developers offer a way to link against system + ;; libraries we have to build the in-tree copies of these three + ;; libraries. + + ;; See upstream discussion: + ;; https://github.com/bedops/bedops/issues/124 + + ;; Unpack the tarballs to benefit from shebang patching. + (with-directory-excursion "third-party" + (and (zero? (system* "tar" "xvf" "jansson-2.6.tar.bz2")) + (zero? (system* "tar" "xvf" "zlib-1.2.7.tar.bz2")) + (zero? (system* "tar" "xvf" "bzip2-1.0.6.tar.bz2")))) + ;; Disable unpacking of tarballs in Makefile. + (substitute* "system.mk/Makefile.linux" + (("^\tbzcat .*") "\t@echo \"not unpacking\"\n") + (("\\./configure") "CONFIG_SHELL=bash ./configure")) + (substitute* "third-party/zlib-1.2.7/Makefile.in" + (("^SHELL=.*$") "SHELL=bash\n")) + #t)) + (delete 'configure)))) (home-page "https://github.com/bedops/bedops") (synopsis "Tools for high-performance genomic feature operations") (description @@ -1322,20 +1323,21 @@ splice junctions between exons.") (arguments '(#:tests? #f ;no "check" target #:phases - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append - (assoc-ref outputs "out") "/bin")) - (doc (string-append - (assoc-ref outputs "out") "/share/doc/bwa")) - (man (string-append - (assoc-ref outputs "out") "/share/man/man1"))) - (install-file "bwa" bin) - (install-file "README.md" doc) - (install-file "bwa.1" man))) - ;; no "configure" script - (alist-delete 'configure %standard-phases)))) + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append + (assoc-ref outputs "out") "/bin")) + (doc (string-append + (assoc-ref outputs "out") "/share/doc/bwa")) + (man (string-append + (assoc-ref outputs "out") "/share/man/man1"))) + (install-file "bwa" bin) + (install-file "README.md" doc) + (install-file "bwa.1" man)) + #t)) + ;; no "configure" script + (delete 'configure)))) (inputs `(("zlib" ,zlib))) ;; Non-portable SSE instructions are used so building fails on platforms ;; other than x86_64. @@ -1812,10 +1814,9 @@ time.") (arguments `(#:python ,python-2 #:phases - (alist-cons-after - 'unpack 'set-env - (lambda _ (setenv "CROSSMAP_USE_SYSTEM_PYSAM" "1")) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'unpack 'set-env + (lambda _ (setenv "CROSSMAP_USE_SYSTEM_PYSAM" "1") #t))))) (inputs `(("python-numpy" ,python2-numpy) ("python-pysam" ,python2-pysam) @@ -2362,19 +2363,18 @@ dynamic programming or a variety of heuristics.") (arguments `(#:tests? #f ;no "check" target #:phases - (alist-cons-after - 'unpack 'use-shared-boost-libs-and-set-bamtools-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("set\\(Boost_USE_STATIC_LIBS ON\\)") - "set(Boost_USE_STATIC_LIBS OFF)") - (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/bamtools/include") - (string-append (assoc-ref inputs "bamtools") "/include/bamtools"))) - (substitute* "src/CMakeLists.txt" - (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/\\.\\./bamtools/lib") - (string-append (assoc-ref inputs "bamtools") "/lib/bamtools"))) - #t) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'unpack 'use-shared-boost-libs-and-set-bamtools-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("set\\(Boost_USE_STATIC_LIBS ON\\)") + "set(Boost_USE_STATIC_LIBS OFF)") + (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/bamtools/include") + (string-append (assoc-ref inputs "bamtools") "/include/bamtools"))) + (substitute* "src/CMakeLists.txt" + (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/\\.\\./bamtools/lib") + (string-append (assoc-ref inputs "bamtools") "/lib/bamtools"))) + #t))))) (inputs `(("boost" ,boost) ("bamtools" ,bamtools) @@ -2541,15 +2541,15 @@ results. The FASTX-Toolkit tools perform some of these preprocessing tasks.") (assoc-ref %outputs "out") "/bin/")) #:phases - (alist-replace - 'check - (lambda* (#:key outputs #:allow-other-keys) - (setenv "PATH" (string-append - (assoc-ref outputs "out") "/bin:" - (getenv "PATH"))) - (chdir "../flexbar_v2.5_src/test") - (zero? (system* "bash" "flexbar_validate.sh"))) - (alist-delete 'install %standard-phases)))) + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key outputs #:allow-other-keys) + (setenv "PATH" (string-append + (assoc-ref outputs "out") "/bin:" + (getenv "PATH"))) + (chdir "../flexbar_v2.5_src/test") + (zero? (system* "bash" "flexbar_validate.sh")))) + (delete 'install)))) (inputs `(("tbb" ,tbb) ("zlib" ,zlib))) @@ -2785,21 +2785,20 @@ association studies (GWAS).") (arguments `(#:python ,python-2 #:phases - (alist-cons-after - 'unpack 'generate-from-cython-sources - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Delete these C files to force fresh generation from pyx sources. - (delete-file "grit/sparsify_support_fns.c") - (delete-file "grit/call_peaks_support_fns.c") - (substitute* "setup.py" - (("Cython.Setup") "Cython.Build") - ;; Add numpy include path to fix compilation - (("pyx\", \\]") - (string-append "pyx\", ], include_dirs = ['" - (assoc-ref inputs "python-numpy") - "/lib/python2.7/site-packages/numpy/core/include/" - "']"))) #t) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'unpack 'generate-from-cython-sources + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Delete these C files to force fresh generation from pyx sources. + (delete-file "grit/sparsify_support_fns.c") + (delete-file "grit/call_peaks_support_fns.c") + (substitute* "setup.py" + (("Cython.Setup") "Cython.Build") + ;; Add numpy include path to fix compilation + (("pyx\", \\]") + (string-append "pyx\", ], include_dirs = ['" + (assoc-ref inputs "python-numpy") + "/lib/python2.7/site-packages/numpy/core/include/" + "']"))) #t))))) (inputs `(("python-scipy" ,python2-scipy) ("python-numpy" ,python2-numpy) @@ -2842,28 +2841,29 @@ estimates transcript expression.") '() '("POPCNT_CAPABILITY=0"))) #:phases - (alist-cons-after - 'unpack 'patch-sources - (lambda _ - ;; XXX Cannot use snippet because zip files are not supported - (substitute* "Makefile" - (("^CC = .*$") "CC = gcc") - (("^CPP = .*$") "CPP = g++") - ;; replace BUILD_HOST and BUILD_TIME for deterministic build - (("-DBUILD_HOST=.*") "-DBUILD_HOST=\"\\\"guix\\\"\"") - (("-DBUILD_TIME=.*") "-DBUILD_TIME=\"\\\"0\\\"\"")) - (substitute* '("hisat-build" "hisat-inspect") - (("/usr/bin/env") (which "env")))) - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) - (for-each (lambda (file) - (install-file file bin)) - (find-files - "." - "hisat(-(build|align|inspect)(-(s|l)(-debug)*)*)*$")))) - (alist-delete 'configure %standard-phases))))) + (modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda _ + ;; XXX Cannot use snippet because zip files are not supported + (substitute* "Makefile" + (("^CC = .*$") "CC = gcc") + (("^CPP = .*$") "CPP = g++") + ;; replace BUILD_HOST and BUILD_TIME for deterministic build + (("-DBUILD_HOST=.*") "-DBUILD_HOST=\"\\\"guix\\\"\"") + (("-DBUILD_TIME=.*") "-DBUILD_TIME=\"\\\"0\\\"\"")) + (substitute* '("hisat-build" "hisat-inspect") + (("/usr/bin/env") (which "env"))) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) + (for-each (lambda (file) + (install-file file bin)) + (find-files + "." + "hisat(-(build|align|inspect)(-(s|l)(-debug)*)*)*$"))) + #t)) + (delete 'configure)))) (native-inputs `(("unzip" ,unzip))) (inputs @@ -4673,19 +4673,17 @@ Roche 454, Ion Torrent and Pacific BioSciences SMRT.") `(#:parallel-build? #f ; not supported #:tests? #f ; no "check" target #:phases - (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; The 'configure' script doesn't recognize things like - ;; '--enable-fast-install'. - (zero? (system* "./configure" - (string-append "--build-prefix=" (getcwd) "/build") - (string-append "--prefix=" out))))) - (alist-cons-after - 'unpack 'enter-dir - (lambda _ (chdir "ngs-sdk") #t) - %standard-phases)))) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; The 'configure' script doesn't recognize things like + ;; '--enable-fast-install'. + (zero? (system* "./configure" + (string-append "--build-prefix=" (getcwd) "/build") + (string-append "--prefix=" out)))))) + (add-after 'unpack 'enter-dir + (lambda _ (chdir "ngs-sdk") #t))))) (native-inputs `(("perl" ,perl))) ;; According to the test ;; unless ($MARCH =~ /x86_64/i || $MARCH =~ /i?86/i) @@ -5435,17 +5433,17 @@ sequences.") "-f" "Makefile.Linux" "CC=gcc ${CCFLAGS}") #:phases - (alist-cons-after - 'unpack 'enter-dir - (lambda _ (chdir "src") #t) - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) - (mkdir-p bin) - (copy-recursively "../bin" bin))) + (modify-phases %standard-phases + (add-after 'unpack 'enter-dir + (lambda _ (chdir "src") #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) + (mkdir-p bin) + (copy-recursively "../bin" bin)) + #t)) ;; no "configure" script - (alist-delete 'configure %standard-phases))))) + (delete 'configure)))) (inputs `(("zlib" ,zlib))) (home-page "http://bioinf.wehi.edu.au/subread-package/") (synopsis "Tool kit for processing next-gen sequencing data") diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 79a87dc8b..9bd89d908 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -74,23 +74,24 @@ "gui")) ; graphical user interface (arguments '(#:glib-or-gtk-wrap-excluded-outputs '("out") - #:phases (alist-cons-after - 'install 'move-gui - (lambda* (#:key outputs #:allow-other-keys) - ;; Move the GUI to its own output, so that "out" doesn't - ;; depend on GTK+. - (let ((out (assoc-ref outputs "out")) - (gui (assoc-ref outputs "gui"))) - (mkdir-p (string-append gui "/bin")) - (rename-file (string-append out "/bin/transmission-gtk") - (string-append gui - "/bin/transmission-gtk")) + #:phases + (modify-phases %standard-phases + (add-after 'install 'move-gui + (lambda* (#:key outputs #:allow-other-keys) + ;; Move the GUI to its own output, so that "out" doesn't + ;; depend on GTK+. + (let ((out (assoc-ref outputs "out")) + (gui (assoc-ref outputs "gui"))) + (mkdir-p (string-append gui "/bin")) + (rename-file (string-append out "/bin/transmission-gtk") + (string-append gui + "/bin/transmission-gtk")) - ;; Move the '.desktop' file as well. - (mkdir (string-append gui "/share")) - (rename-file (string-append out "/share/applications") - (string-append gui "/share/applications")))) - %standard-phases))) + ;; Move the '.desktop' file as well. + (mkdir (string-append gui "/share")) + (rename-file (string-append out "/share/applications") + (string-append gui "/share/applications"))) + #t))))) (inputs `(("inotify-tools" ,inotify-tools) ("libevent" ,libevent) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 704e8ad36..ad72ad0f7 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -454,7 +454,7 @@ the data.") (build-system gnu-build-system) (arguments '(#:tests? #f - #:phases (alist-delete 'configure %standard-phases) + #:phases (modify-phases %standard-phases (delete 'configure)) #:make-flags (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))))) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 92636de7f..2a9ccd167 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -527,14 +527,14 @@ decompressors when faced with corrupted input.") `(("which" ,which))) (arguments `(#:phases - (alist-cons-after - 'patch-source-shebangs 'unpatch-source-shebang - ;; revert the patch-shebang phase on a script which is - ;; in fact test data - (lambda _ - (substitute* "tests/shar-1.ok" - (((which "sh")) "/bin/sh"))) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'patch-source-shebangs 'unpatch-source-shebang + ;; revert the patch-shebang phase on a script which is + ;; in fact test data + (lambda _ + (substitute* "tests/shar-1.ok" + (((which "sh")) "/bin/sh")) + #t))))) (home-page "https://www.gnu.org/software/sharutils/") (synopsis "Archives in shell scripts, uuencode/uudecode") (description diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm index 1f5b38eef..f0f19c5a0 100644 --- a/gnu/packages/conky.scm +++ b/gnu/packages/conky.scm @@ -50,22 +50,21 @@ ;; TODO: add 'ncurses.pc' to the ncurses package. "-DBUILD_NCURSES=false") #:phases - (alist-cons-after - 'unpack 'add-freetype-to-search-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "cmake/ConkyPlatformChecks.cmake" - (("set\\(INCLUDE_SEARCH_PATH") - (string-append - "set(INCLUDE_SEARCH_PATH " - (assoc-ref inputs "freetype") "/include/freetype2 "))) - #t) - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) - (mkdir-p bin) - (install-file "src/conky" bin))) - %standard-phases)))) + (modify-phases %standard-phases + (add-after 'unpack 'add-freetype-to-search-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "cmake/ConkyPlatformChecks.cmake" + (("set\\(INCLUDE_SEARCH_PATH") + (string-append + "set(INCLUDE_SEARCH_PATH " + (assoc-ref inputs "freetype") "/include/freetype2 "))) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (mkdir-p bin) + (install-file "src/conky" bin)) + #t))))) (inputs `(("freetype" ,freetype) ("ncurses" ,ncurses) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 13efc5edc..655c6db18 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -164,34 +164,33 @@ and provides interfaces to the traditional file format.") '(#:tests? #f ; no check target available #:disallowed-references ("doc") #:phases - (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - ;; '--docdir' is not honored, so we need to patch. - (substitute* "dist/Makefile.in" - (("docdir[[:blank:]]*=.*") - (string-append "docdir = " doc "/share/doc/bdb"))) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + ;; '--docdir' is not honored, so we need to patch. + (substitute* "dist/Makefile.in" + (("docdir[[:blank:]]*=.*") + (string-append "docdir = " doc "/share/doc/bdb"))) - (zero? - (system* "./dist/configure" - (string-append "--prefix=" out) - (string-append "CONFIG_SHELL=" (which "bash")) - (string-append "SHELL=" (which "bash")) + (zero? + (system* "./dist/configure" + (string-append "--prefix=" out) + (string-append "CONFIG_SHELL=" (which "bash")) + (string-append "SHELL=" (which "bash")) - ;; Remove 7 MiB of .a files. - "--disable-static" + ;; Remove 7 MiB of .a files. + "--disable-static" - ;; The compatibility mode is needed by some packages, - ;; notably iproute2. - "--enable-compat185" + ;; The compatibility mode is needed by some packages, + ;; notably iproute2. + "--enable-compat185" - ;; The following flag is needed so that the inclusion - ;; of db_cxx.h into C++ files works; it leads to - ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. - "--enable-cxx")))) - %standard-phases))) + ;; The following flag is needed so that the inclusion + ;; of db_cxx.h into C++ files works; it leads to + ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. + "--enable-cxx")))))))) (synopsis "Berkeley database") (description "Berkeley DB is an embeddable database allowing developers the choice of @@ -219,39 +218,38 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.") `(#:tests? #f ; no check target available #:disallowed-references ("doc") #:phases - (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - ;; '--docdir' is not honored, so we need to patch. - (substitute* "dist/Makefile.in" - (("docdir[[:blank:]]*=.*") - (string-append "docdir = " doc "/share/doc/bdb"))) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + ;; '--docdir' is not honored, so we need to patch. + (substitute* "dist/Makefile.in" + (("docdir[[:blank:]]*=.*") + (string-append "docdir = " doc "/share/doc/bdb"))) - (zero? - (system* "./dist/configure" - (string-append "--prefix=" out) - (string-append "CONFIG_SHELL=" (which "bash")) - (string-append "SHELL=" (which "bash")) + (zero? + (system* "./dist/configure" + (string-append "--prefix=" out) + (string-append "CONFIG_SHELL=" (which "bash")) + (string-append "SHELL=" (which "bash")) - ;; Bdb doesn't recognize aarch64 as an architecture. - ,@(if (string=? "aarch64-linux" (%current-system)) - '("--build=aarch64-unknown-linux-gnu") - '()) + ;; Bdb doesn't recognize aarch64 as an architecture. + ,@(if (string=? "aarch64-linux" (%current-system)) + '("--build=aarch64-unknown-linux-gnu") + '()) - ;; Remove 7 MiB of .a files. - "--disable-static" + ;; Remove 7 MiB of .a files. + "--disable-static" - ;; The compatibility mode is needed by some packages, - ;; notably iproute2. - "--enable-compat185" + ;; The compatibility mode is needed by some packages, + ;; notably iproute2. + "--enable-compat185" - ;; The following flag is needed so that the inclusion - ;; of db_cxx.h into C++ files works; it leads to - ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. - "--enable-cxx")))) - %standard-phases))))) + ;; The following flag is needed so that the inclusion + ;; of db_cxx.h into C++ files works; it leads to + ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. + "--enable-cxx")))))))))) (define-public leveldb (package diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 34c106141..1dab0085c 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -57,23 +57,24 @@ `(("perl" ,perl))) (arguments `(#:phases - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - ;; Makefile contains no install target - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (doc (string-append out "/share/doc/delta-" ,version))) - (begin - (mkdir-p bin) - (mkdir-p doc) - (for-each (lambda (h) - (install-file h doc)) - `("License.txt" ,@(find-files "www" ".*\\.html"))) - (for-each (lambda (b) - (install-file b bin)) - `("delta" "multidelta" "topformflat"))))) - (alist-delete 'configure %standard-phases)))) + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + ;; Makefile contains no install target + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append out "/share/doc/delta-" ,version))) + (begin + (mkdir-p bin) + (mkdir-p doc) + (for-each (lambda (h) + (install-file h doc)) + `("License.txt" ,@(find-files "www" ".*\\.html"))) + (for-each (lambda (b) + (install-file b bin)) + `("delta" "multidelta" "topformflat")))) + #t)) + (delete 'configure)))) (home-page "http://delta.tigris.org/") (synopsis "Heuristical file minimizer") (description @@ -113,23 +114,24 @@ program to exhibit a bug.") ("sys-cpu" ,perl-sys-cpu) ("term-readkey" ,perl-term-readkey))) (arguments - `(#:phases (alist-cons-after - 'install 'set-load-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Tell creduce where to find the perl modules it needs. - (let* ((out (assoc-ref outputs "out")) - (prog (string-append out "/bin/creduce"))) - (wrap-program - prog - `("PERL5LIB" ":" prefix - ,(map (lambda (p) - (string-append (assoc-ref inputs p) - "/lib/perl5/site_perl/" - ,(package-version perl))) - '("term-readkey" "exporter-lite" - "file-which" "getopt-tabular" - "regex-common" "sys-cpu")))))) - %standard-phases))) + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'set-load-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Tell creduce where to find the perl modules it needs. + (let* ((out (assoc-ref outputs "out")) + (prog (string-append out "/bin/creduce"))) + (wrap-program + prog + `("PERL5LIB" ":" prefix + ,(map (lambda (p) + (string-append (assoc-ref inputs p) + "/lib/perl5/site_perl/" + ,(package-version perl))) + '("term-readkey" "exporter-lite" + "file-which" "getopt-tabular" + "regex-common" "sys-cpu"))))) + #t))))) (home-page "http://embed.cs.utah.edu/creduce") (synopsis "Reducer for interesting code") (description diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 869d6239e..a0ed8367e 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -329,17 +329,17 @@ GTK+, lets you select a desktop session and log in to it.") (native-inputs `(("pkg-config" ,pkg-config))) (arguments - '(#:phases (alist-cons-before - 'configure 'set-new-etc-location - (lambda _ - (substitute* "CMakeLists.txt" - (("/etc") - (string-append (assoc-ref %outputs "out") "/etc")) - (("install.*systemd.*") - ;; The build system's logic here is: if "Linux", then - ;; "systemd". Strip that. - ""))) - %standard-phases) + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'set-new-etc-location + (lambda _ + (substitute* "CMakeLists.txt" + (("/etc") + (string-append (assoc-ref %outputs "out") "/etc")) + (("install.*systemd.*") + ;; The build system's logic here is: if "Linux", then + ;; "systemd". Strip that. + ""))))) #:configure-flags '("-DUSE_PAM=yes" "-DUSE_CONSOLEKIT=no") #:tests? #f)) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index afae4596b..64fdc9c3e 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -75,7 +75,7 @@ `(("dbus" ,dbus))) (arguments `(#:phases - (alist-delete 'configure %standard-phases) + (modify-phases %standard-phases (delete 'configure)) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) "CC=gcc" "COPTS=\"-DHAVE_DBUS\"") diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 189ece01a..4475cc70d 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -232,19 +232,19 @@ by no means limited to these applications.) This package provides XML DTDs.") #:use-setuptools? #f #:tests? #f ;no 'test' command #:phases - (alist-cons-after - 'wrap 'set-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; dblatex executes helper programs at runtime. - (wrap-program (string-append out "/bin/dblatex") - `("PATH" ":" prefix - ,(map (lambda (input) - (string-append (assoc-ref inputs input) - "/bin")) - '("libxslt" "texlive" - "imagemagick" "inkscape")))))) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'wrap 'set-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; dblatex executes helper programs at runtime. + (wrap-program (string-append out "/bin/dblatex") + `("PATH" ":" prefix + ,(map (lambda (input) + (string-append (assoc-ref inputs input) + "/bin")) + '("libxslt" "texlive" + "imagemagick" "inkscape"))))) + #t))))) (home-page "http://dblatex.sourceforge.net") (synopsis "DocBook to LaTeX Publishing") (description diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 02e7a9e90..b77abc778 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -302,14 +302,15 @@ editor (without an X toolkit)" ) "0phz9d8wjk4p13vqannv0003fwh8qqrp0gfzcs2hgq1mrmv1srss")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-after - 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - (symlink "geiser-install.el" - (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp/" - "geiser-autoloads.el"))) - %standard-phases))) + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys) + (symlink "geiser-install.el" + (string-append (assoc-ref outputs "out") + "/share/emacs/site-lisp/" + "geiser-autoloads.el")) + #t))))) (inputs `(("guile" ,guile-2.0))) (native-inputs `(("emacs" ,emacs-minimal))) (home-page "http://nongnu.org/geiser/") @@ -768,25 +769,25 @@ provides an optional IDE-like error list.") (guix build emacs-utils)) #:tests? #f ; no check target #:phases - (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("/usr/local") (assoc-ref outputs "out")) - (("/site-lisp/emacs-wget") "/site-lisp"))) - (alist-cons-before - 'build 'patch-exec-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((wget (assoc-ref inputs "wget"))) - (emacs-substitute-variables "wget.el" - ("wget-command" (string-append wget "/bin/wget"))))) - (alist-cons-after - 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - (emacs-generate-autoloads - "wget" (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp/"))) - %standard-phases))))) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("/usr/local") (assoc-ref outputs "out")) + (("/site-lisp/emacs-wget") "/site-lisp")) + #t)) + (add-before 'build 'patch-exec-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((wget (assoc-ref inputs "wget"))) + (emacs-substitute-variables "wget.el" + ("wget-command" (string-append wget "/bin/wget")))) + #t)) + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys) + (emacs-generate-autoloads + "wget" (string-append (assoc-ref outputs "out") + "/share/emacs/site-lisp/")) + #t))))) (home-page "http://www.emacswiki.org/emacs/EmacsWget") (synopsis "Simple file downloader for Emacs based on wget") (description @@ -980,15 +981,16 @@ within a specified width. It is useful for displaying long track titles.") "doc_DATA =\n"))))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-after - 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - ;; Add an autoloads file with the right name for guix.el. - (let* ((out (assoc-ref outputs "out")) - (site (string-append out "/share/emacs/site-lisp"))) - (with-directory-excursion site - (symlink "bbdb-loaddefs.el" "bbdb-autoloads.el")))) - %standard-phases))) + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys) + ;; Add an autoloads file with the right name for guix.el. + (let* ((out (assoc-ref outputs "out")) + (site (string-append out "/share/emacs/site-lisp"))) + (with-directory-excursion site + (symlink "bbdb-loaddefs.el" "bbdb-autoloads.el"))) + #t))))) (native-inputs `(("emacs" ,emacs-minimal))) (home-page "http://savannah.nongnu.org/projects/bbdb/") (synopsis "Contact management utility for Emacs") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 650ac2b89..28d9a718e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -190,28 +190,27 @@ utilities.") (build-system gnu-build-system) (arguments `(#:phases - (alist-cons-after - 'unpack 'use-wish8.6 - (lambda _ - (substitute* "configure" - (("wish85") "wish8.6"))) - (alist-cons-after - 'install 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; FIXME: Mesa tries to dlopen libudev.so.0 and fails. Pending a - ;; fix of the mesa package we wrap the pcb executable such that - ;; Mesa can find libudev.so.0 through LD_LIBRARY_PATH. - (let* ((out (assoc-ref outputs "out")) - (path (string-append (assoc-ref inputs "udev") "/lib"))) - (wrap-program (string-append out "/bin/pcb") - `("LD_LIBRARY_PATH" ":" prefix (,path))))) - (alist-cons-before - 'check 'pre-check - (lambda _ - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - #t) - %standard-phases))))) + (modify-phases %standard-phases + (add-after 'unpack 'use-wish8.6 + (lambda _ + (substitute* "configure" + (("wish85") "wish8.6")) + #t)) + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; FIXME: Mesa tries to dlopen libudev.so.0 and fails. Pending a + ;; fix of the mesa package we wrap the pcb executable such that + ;; Mesa can find libudev.so.0 through LD_LIBRARY_PATH. + (let* ((out (assoc-ref outputs "out")) + (path (string-append (assoc-ref inputs "udev") "/lib"))) + (wrap-program (string-append out "/bin/pcb") + `("LD_LIBRARY_PATH" ":" prefix (,path)))) + #t)) + (add-before 'check 'pre-check + (lambda _ + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + #t))))) (inputs `(("dbus" ,dbus) ("mesa" ,mesa) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 8d0b82478..21bd8ae7a 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -52,31 +52,31 @@ (patches (search-patches "ath9k-htc-firmware-objcopy.patch")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-before - 'configure 'pre-configure - (lambda* (#:key inputs #:allow-other-keys) - (chdir "target_firmware") + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda* (#:key inputs #:allow-other-keys) + (chdir "target_firmware") - ;; 'configure' is a simple script that runs 'cmake' with - ;; the right flags. - (substitute* "configure" - (("^TOOLCHAIN=.*$") - (string-append "TOOLCHAIN=" - (assoc-ref inputs "cross-gcc") - "\n")))) - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (fw-dir (string-append out "/lib/firmware"))) - (mkdir-p fw-dir) - (for-each (lambda (file) - (copy-file file - (string-append fw-dir "/" - (basename file)))) - (find-files "." "\\.fw$")) - #t)) - %standard-phases)) + ;; 'configure' is a simple script that runs 'cmake' with + ;; the right flags. + (substitute* "configure" + (("^TOOLCHAIN=.*$") + (string-append "TOOLCHAIN=" + (assoc-ref inputs "cross-gcc") + "\n"))) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (fw-dir (string-append out "/lib/firmware"))) + (mkdir-p fw-dir) + (for-each (lambda (file) + (copy-file file + (string-append fw-dir "/" + (basename file)))) + (find-files "." "\\.fw$")) + #t)))) #:tests? #f)) ;; The firmware is cross-compiled using a "bare bones" compiler (no libc.) diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 127fc795a..e76865798 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -62,17 +62,16 @@ "CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no") #:tests? #f ; no 'check' target #:phases - (alist-delete - 'configure - (alist-cons-before - 'build 'patch-exec-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "dmi.c" - (("\"dmidecode\"") - (format #f "~S" - (string-append (assoc-ref inputs "dmidecode") - "/sbin/dmidecode"))))) - %standard-phases)))) + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'patch-exec-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "dmi.c" + (("\"dmidecode\"") + (format #f "~S" + (string-append (assoc-ref inputs "dmidecode") + "/sbin/dmidecode")))) + #t))))) (home-page "http://flashrom.org/") (synopsis "Identify, read, write, erase, and verify ROM/flash chips") (description diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm index 27d2f62ca..65336fc62 100644 --- a/gnu/packages/fltk.scm +++ b/gnu/packages/fltk.scm @@ -63,27 +63,27 @@ (list "--enable-shared" (string-append "DSOFLAGS=-Wl,-rpath=" %output "/lib")) #:phases - (alist-cons-before - 'configure 'patch-makeinclude - (lambda _ - (substitute* "makeinclude.in" - (("/bin/sh") (which "sh")))) - (alist-cons-after - 'install 'patch-config - ;; Provide -L flags for image libraries when querying fltk-config to - ;; avoid propagating inputs. - (lambda* (#:key inputs outputs #:allow-other-keys) - (use-modules (srfi srfi-26)) - (let* ((conf (string-append (assoc-ref outputs "out") - "/bin/fltk-config")) - (jpeg (assoc-ref inputs "libjpeg")) - (png (assoc-ref inputs "libpng")) - (zlib (assoc-ref inputs "zlib"))) - (substitute* conf - (("-ljpeg") (string-append "-L" jpeg "/lib -ljpeg")) - (("-lpng") (string-append "-L" png "/lib -lpng")) - (("-lz") (string-append "-L" zlib "/lib -lz"))))) - %standard-phases)))) + (modify-phases %standard-phases + (add-before 'configure 'patch-makeinclude + (lambda _ + (substitute* "makeinclude.in" + (("/bin/sh") (which "sh"))) + #t)) + (add-after 'install 'patch-config + ;; Provide -L flags for image libraries when querying fltk-config to + ;; avoid propagating inputs. + (lambda* (#:key inputs outputs #:allow-other-keys) + (use-modules (srfi srfi-26)) + (let* ((conf (string-append (assoc-ref outputs "out") + "/bin/fltk-config")) + (jpeg (assoc-ref inputs "libjpeg")) + (png (assoc-ref inputs "libpng")) + (zlib (assoc-ref inputs "zlib"))) + (substitute* conf + (("-ljpeg") (string-append "-L" jpeg "/lib -ljpeg")) + (("-lpng") (string-append "-L" png "/lib -lpng")) + (("-lz") (string-append "-L" zlib "/lib -lz")))) + #t))))) (home-page "http://www.fltk.org") (synopsis "3D C++ GUI library") (description "FLTK is a C++ GUI toolkit providing modern GUI functionality diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a9a7e08da..9d8d4152c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -324,23 +324,22 @@ manager for the current system.") (build-system python-build-system) (arguments '(#:phases - (alist-replace - 'check - (lambda* (#:key inputs #:allow-other-keys) - (setenv "XDG_DATA_DIRS" - (string-append (assoc-ref inputs "shared-mime-info") - "/share/")) - (substitute* "test/test-icon.py" - (("/usr/share/icons/hicolor/index.theme") - (string-append (assoc-ref inputs "hicolor-icon-theme") - "/share/icons/hicolor/index.theme"))) - - ;; One test fails with: - ;; AssertionError: 'x-apple-ios-png' != 'png' - (substitute* "test/test-mime.py" - (("self.check_mimetype\\(imgpng, 'image', 'png'\\)") "#")) - (zero? (system* "nosetests" "-v"))) - %standard-phases))) + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys) + (setenv "XDG_DATA_DIRS" + (string-append (assoc-ref inputs "shared-mime-info") + "/share/")) + (substitute* "test/test-icon.py" + (("/usr/share/icons/hicolor/index.theme") + (string-append (assoc-ref inputs "hicolor-icon-theme") + "/share/icons/hicolor/index.theme"))) + + ;; One test fails with: + ;; AssertionError: 'x-apple-ios-png' != 'png' + (substitute* "test/test-mime.py" + (("self.check_mimetype\\(imgpng, 'image', 'png'\\)") "#")) + (zero? (system* "nosetests" "-v"))))))) (native-inputs `(("shared-mime-info" ,shared-mime-info) ;for tests ("hicolor-icon-theme" ,hicolor-icon-theme) ;for tests diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index aac0f9664..5aa83e073 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -125,15 +125,16 @@ most common applications of GD involve website development.") (assoc-ref %build-inputs i))) '("zlib" "png" "ft" "jpeg" "fontconfig")) #:tests? #f ;; Failed 1/2 test programs. 1/12 subtests failed. - #:phases (alist-cons-after - 'configure 'clear-autogenerated-files - (lambda _ - ;; This file is autogenerated by its .PLS script at build - ;; time, but file creation fails because that file already - ;; exists in the distribution with non-writable - ;; permissions, so delete it first. - (delete-file "bdf_scripts/bdf2gdfont.pl")) - %standard-phases))) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'clear-autogenerated-files + (lambda _ + ;; This file is autogenerated by its .PLS script at build + ;; time, but file creation fails because that file already + ;; exists in the distribution with non-writable + ;; permissions, so delete it first. + (delete-file "bdf_scripts/bdf2gdfont.pl") + #t))))) (home-page "http://search.cpan.org/dist/GD") (synopsis "Perl interface to the GD graphics library") (description "GD.pm is an autoloadable interface module for libgd, a diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 362e2047f..74588309c 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -87,22 +87,22 @@ provided as well as the framework to add new color models and data types.") ;; all according to the rationale given below. #:tests? #f #:phases - (alist-cons-before - 'build 'pre-build - (lambda _ - ;; This test program seems to crash on exit. Specifically, whilst - ;; g_object_unreffing bufferA and bufferB - This seems to be a bug - ;; in the destructor. This is just a test program so will not have - ;; any wider effect, although might be hiding another problem. - ;; According to advice received on irc.gimp.org#gegl although 0.2.0 - ;; is the latest released version, any bug reports against it will - ;; be ignored. So we are on our own. - (substitute* "tools/img_cmp.c" - (("g_object_unref \\(buffer.\\);") "")) + (modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda _ + ;; This test program seems to crash on exit. Specifically, whilst + ;; g_object_unreffing bufferA and bufferB - This seems to be a bug + ;; in the destructor. This is just a test program so will not have + ;; any wider effect, although might be hiding another problem. + ;; According to advice received on irc.gimp.org#gegl although 0.2.0 + ;; is the latest released version, any bug reports against it will + ;; be ignored. So we are on our own. + (substitute* "tools/img_cmp.c" + (("g_object_unref \\(buffer.\\);") "")) - (substitute* "tests/compositions/Makefile" - (("/bin/sh") (which "sh")))) - %standard-phases))) + (substitute* "tests/compositions/Makefile" + (("/bin/sh") (which "sh"))) + #t))))) (inputs `(("babl" ,babl) ("glib" ,glib) diff --git a/gnu/packages/gkrellm.scm b/gnu/packages/gkrellm.scm index 68853eb8f..4cc84b3fc 100644 --- a/gnu/packages/gkrellm.scm +++ b/gnu/packages/gkrellm.scm @@ -50,9 +50,7 @@ (arguments `(#:tests? #f ; there is no check target #:phases - (alist-delete - 'configure - %standard-phases) + (modify-phases %standard-phases (delete 'configure)) #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "INSTALLROOT=" out) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 08f6187f8..1adb28a45 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -420,7 +420,7 @@ glxgears, glxheads, and glxinfo.") (("/lib64") "/lib"))))) (build-system gnu-build-system) (arguments - '(#:phases (alist-delete 'configure %standard-phases) + '(#:phases (modify-phases %standard-phases (delete 'configure)) #:make-flags (list (string-append "GLEW_PREFIX=" (assoc-ref %outputs "out")) (string-append "GLEW_DEST=" diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index fcd1daf5e..0ecceb525 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -503,22 +503,23 @@ has an ease of use unmatched by other C++ callback libraries.") "1926b3adx903hzvdp8glblsgjyadzqnwgkj8hg605d4wv98m1n0z")))) (build-system gnu-build-system) (arguments - `(#:phases (alist-cons-before - 'build 'pre-build - (lambda _ - ;; This test uses /etc/fstab as an example file to read - ;; from; choose a better example. - (substitute* "tests/giomm_simple/main.cc" - (("/etc/fstab") - (string-append (getcwd) - "/tests/giomm_simple/main.cc"))) - - ;; This test does a DNS lookup, and then expects to be able - ;; to open a TLS session; just skip it. - (substitute* "tests/giomm_tls_client/main.cc" - (("Gio::init.*$") - "return 77;\n"))) - %standard-phases))) + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda _ + ;; This test uses /etc/fstab as an example file to read + ;; from; choose a better example. + (substitute* "tests/giomm_simple/main.cc" + (("/etc/fstab") + (string-append (getcwd) + "/tests/giomm_simple/main.cc"))) + + ;; This test does a DNS lookup, and then expects to be able + ;; to open a TLS session; just skip it. + (substitute* "tests/giomm_tls_client/main.cc" + (("Gio::init.*$") + "return 77;\n")) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin"))) (propagated-inputs diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d9d3fe793..f40381498 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -800,16 +800,16 @@ for settings shared by various components of the GNOME desktop.") ("perl-xml-simple" ,perl-xml-simple))) (arguments '(#:phases - (alist-cons-after - 'install 'set-load-paths - ;; Tell 'icon-name-mapping' where XML::Simple is. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (prog (string-append out "/libexec/icon-name-mapping"))) - (wrap-program - prog - `("PERL5LIB" = ,(list (getenv "PERL5LIB")))))) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'install 'set-load-paths + ;; Tell 'icon-name-mapping' where XML::Simple is. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (prog (string-append out "/libexec/icon-name-mapping"))) + (wrap-program + prog + `("PERL5LIB" = ,(list (getenv "PERL5LIB"))))) + #t))))) (home-page "http://tango.freedesktop.org/Standard_Icon_Naming_Specification") (synopsis "Utility to implement the Freedesktop Icon Naming Specification") @@ -1252,12 +1252,12 @@ functionality was designed to be as reusable and portable as possible.") '("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS") ;; ... which they then completly ignore !! #:phases - (alist-cons-before - 'configure 'ignore-deprecations - (lambda _ - (substitute* "linc2/src/Makefile.in" - (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'configure 'ignore-deprecations + (lambda _ + (substitute* "linc2/src/Makefile.in" + (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS")) + #t))))) (inputs `(("glib" ,glib) ("libidl" ,libidl))) (native-inputs @@ -1292,12 +1292,12 @@ featuring mature C, C++ and Python bindings.") '("DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS") ;; ... which they then completly ignore !! #:phases - (alist-cons-before - 'configure 'ignore-deprecations - (lambda _ - (substitute* "activation-server/Makefile.in" - (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'configure 'ignore-deprecations + (lambda _ + (substitute* "activation-server/Makefile.in" + (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS")) + #t))))) (inputs `(("popt" ,popt) ("libxml2" ,libxml2))) ;; The following are Required by the .pc file @@ -1389,19 +1389,18 @@ designed to be accessed through the MIME functions in GnomeVFS.") (build-system gnu-build-system) (arguments `(#:phases - (alist-cons-before - 'configure 'ignore-deprecations - (lambda _ - (substitute* '("libgnomevfs/Makefile.in" - "daemon/Makefile.in") - (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS")) - #t) - (alist-cons-before - 'configure 'patch-test-async-cancel-to-never-fail - (lambda _ - (substitute* "test/test-async-cancel.c" - (("EXIT_FAILURE") "77"))) - %standard-phases)))) + (modify-phases %standard-phases + (add-before 'configure 'ignore-deprecations + (lambda _ + (substitute* '("libgnomevfs/Makefile.in" + "daemon/Makefile.in") + (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS")) + #t)) + (add-before 'configure 'patch-test-async-cancel-to-never-fail + (lambda _ + (substitute* "test/test-async-cancel.c" + (("EXIT_FAILURE") "77")) + #t))))) (inputs `(("libxml2" ,libxml2) ("dbus-glib" ,dbus-glib) ("gconf" ,gconf) @@ -1436,12 +1435,12 @@ to access local and remote files with a single consistent API.") (build-system gnu-build-system) (arguments `(#:phases - (alist-cons-before - 'configure 'enable-deprecated - (lambda _ - (substitute* "libgnome/Makefile.in" - (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'configure 'enable-deprecated + (lambda _ + (substitute* "libgnome/Makefile.in" + (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS")) + #t))))) (inputs `(("libxml2" ,libxml2))) (native-inputs `(("glib" ,glib "bin") ; for glib-mkenums, etc. @@ -1676,18 +1675,17 @@ since ca. 2006, when GTK+ itself incorporated printing support.") (build-system gnu-build-system) (arguments `(#:phases - (alist-cons-before - 'check 'start-xserver - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server")) - (disp ":1")) - - (setenv "HOME" (getcwd)) - (setenv "DISPLAY" disp) - ;; There must be a running X server and make check doesn't start one. - ;; Therefore we must do it. - (zero? (system (format #f "~a/bin/Xvfb ~a &" xorg-server disp))))) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'check 'start-xserver + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server")) + (disp ":1")) + + (setenv "HOME" (getcwd)) + (setenv "DISPLAY" disp) + ;; There must be a running X server and make check doesn't start one. + ;; Therefore we must do it. + (zero? (system (format #f "~a/bin/Xvfb ~a &" xorg-server disp))))))))) ;; Mentioned as Required by the .pc file (propagated-inputs `(("libxml2" ,libxml2))) (inputs @@ -1801,14 +1799,13 @@ Hints specification (EWMH).") (base32 "05fvzbs5bin05bbsr4dp79aiva3lnq0a3a40zq55i13vnsz70l0n")))) (arguments `(#:phases - (alist-cons-after - 'unpack 'fix-pcre-check - (lambda _ - ;; Only glib.h can be included directly. See - ;; https://bugzilla.gnome.org/show_bug.cgi?id=670316 - (substitute* "configure" - (("glib/gregex\\.h") "glib.h")) #t) - %standard-phases) + (modify-phases %standard-phases + (add-after 'unpack 'fix-pcre-check + (lambda _ + ;; Only glib.h can be included directly. See + ;; https://bugzilla.gnome.org/show_bug.cgi?id=670316 + (substitute* "configure" + (("glib/gregex\\.h") "glib.h")) #t))) ,@(package-arguments goffice))) (propagated-inputs @@ -2178,19 +2175,19 @@ and RDP protocols.") (assoc-ref %outputs "out") "/lib") "--disable-gtk-doc-html") ; FIXME: requires gtk-doc #:phases - (alist-cons-before - 'configure 'fix-docbook - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "docs/Makefile.in" - (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/manpages/docbook.xsl"))) - (setenv "XML_CATALOG_FILES" - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml"))) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'configure 'fix-docbook + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "docs/Makefile.in" + (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/manpages/docbook.xsl"))) + (setenv "XML_CATALOG_FILES" + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/catalog.xml")) + #t))))) (home-page "https://developer.gnome.org/dconf") (synopsis "Low-level GNOME configuration system") (description "Dconf is a low-level configuration system. Its main purpose diff --git a/gnu/packages/gprolog.scm b/gnu/packages/gprolog.scm index 87c833e94..b27b080ca 100644 --- a/gnu/packages/gprolog.scm +++ b/gnu/packages/gprolog.scm @@ -41,14 +41,15 @@ `(#:configure-flags (list (string-append "--with-install-dir=" %output "/share/gprolog")) - #:phases (alist-cons-before - 'configure 'change-dir-n-fix-shells - (lambda _ - (chdir "src") - (substitute* "configure" - (("-/bin/sh") (string-append "-" (which "sh"))) - (("= /bin/sh") (string-append "= " (which "sh"))))) - %standard-phases))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'change-dir-n-fix-shells + (lambda _ + (chdir "src") + (substitute* "configure" + (("-/bin/sh") (string-append "-" (which "sh"))) + (("= /bin/sh") (string-append "= " (which "sh")))) + #t))))) (home-page "https://www.gnu.org/software/gprolog/") (synopsis "Prolog compiler") (description diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 0a9038b7a..10592c23e 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -102,15 +102,16 @@ manipulate maps.") "006a6l8p38a4h7y2959sqrmjjn29d8pd50zj9nypcp5ph18nybjb")))) (build-system gnu-build-system) (arguments - `(#:phases (alist-replace - 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; This is a rudimentary build system. - (substitute* "Makefile" - (("prefix[[:blank:]]*=.*$") - (string-append "prefix = " (assoc-ref outputs "out") - "\n")))) - %standard-phases) + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; This is a rudimentary build system. + (substitute* "Makefile" + (("prefix[[:blank:]]*=.*$") + (string-append "prefix = " (assoc-ref outputs "out") + "\n"))) + #t))) #:tests? #f)) (inputs `(("gtk+" ,gtk+-2) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 6c813e8a3..512dd5e16 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -553,13 +553,12 @@ and understanding different BRDFs (and other component functions).") (string-append "--x-libraries=" (assoc-ref %build-inputs "libx11") "/lib")) #:phases - (alist-cons-after - 'unpack 'autoreconf - (lambda _ - ;; let's call configure from configure phase and not now - (substitute* "autogen.sh" (("./configure") "# ./configure")) - (zero? (system* "sh" "autogen.sh"))) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'unpack 'autoreconf + (lambda _ + ;; let's call configure from configure phase and not now + (substitute* "autogen.sh" (("./configure") "# ./configure")) + (zero? (system* "sh" "autogen.sh"))))))) (native-inputs `(("pkg-config" ,pkg-config) ("libtool" ,libtool) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b2aa6ecff..11e2ace98 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -279,16 +279,17 @@ functions which were removed.") "0g7s5mp14qgbfjdql0k1s8464r21g47ssn5dws6jazsnw6njhl0l")))) (build-system waf-build-system) (arguments - `(#:phases (alist-cons-before - 'configure 'set-flags - (lambda* (#:key outputs #:allow-other-keys) - ;; Compile with C++11, required by gtkmm. - (setenv "CXXFLAGS" "-std=c++11") - ;; Allow 'bin/ganv_bench' to find libganv-1.so. - (setenv "LDFLAGS" - (string-append "-Wl,-rpath=" - (assoc-ref outputs "out") "/lib"))) - %standard-phases) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'set-flags + (lambda* (#:key outputs #:allow-other-keys) + ;; Compile with C++11, required by gtkmm. + (setenv "CXXFLAGS" "-std=c++11") + ;; Allow 'bin/ganv_bench' to find libganv-1.so. + (setenv "LDFLAGS" + (string-append "-Wl,-rpath=" + (assoc-ref outputs "out") "/lib")) + #t))) #:tests? #f)) ; no check target (inputs `(("gtk" ,gtk+-2) @@ -349,24 +350,24 @@ diagrams.") `(#:phases ;; Unfortunately, some of the tests in "make check" are highly dependent ;; on the environment therefore, some black magic is required. - (alist-cons-before - 'check 'start-xserver - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server")) - (mime (assoc-ref inputs "shared-mime-info"))) + (modify-phases %standard-phases + (add-before 'check 'start-xserver + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server")) + (mime (assoc-ref inputs "shared-mime-info"))) - ;; There must be a running X server and make check doesn't start one. - ;; Therefore we must do it. - (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) - (setenv "DISPLAY" ":1") + ;; There must be a running X server and make check doesn't start one. + ;; Therefore we must do it. + (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) + (setenv "DISPLAY" ":1") - ;; The .lang files must be found in $XDG_DATA_HOME/gtksourceview-2.0 - (system "ln -s gtksourceview gtksourceview-2.0") - (setenv "XDG_DATA_HOME" (getcwd)) + ;; The .lang files must be found in $XDG_DATA_HOME/gtksourceview-2.0 + (system "ln -s gtksourceview gtksourceview-2.0") + (setenv "XDG_DATA_HOME" (getcwd)) - ;; Finally, the mimetypes must be available. - (setenv "XDG_DATA_DIRS" (string-append mime "/share/")) )) - %standard-phases))) + ;; Finally, the mimetypes must be available. + (setenv "XDG_DATA_DIRS" (string-append mime "/share/"))) + #t))))) (synopsis "Widget that extends the standard GTK+ 2.x 'GtkTextView' widget") (description "GtkSourceView is a portable C library that extends the standard GTK+ @@ -876,18 +877,19 @@ images onto Cairo surfaces.") "godir = $(moddir)\n"))))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-after - 'install 'post-install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (guile (assoc-ref inputs "guile"))) - (substitute* (find-files bin ".*") - (("guile") - (string-append guile "/bin/guile -L " - out "/share/guile/site/2.0 -C " - out "/share/guile/site/2.0 "))))) - %standard-phases))) + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'post-install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (guile (assoc-ref inputs "guile"))) + (substitute* (find-files bin ".*") + (("guile") + (string-append guile "/bin/guile -L " + out "/share/guile/site/2.0 -C " + out "/share/guile/site/2.0 ")))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.2))) (propagated-inputs @@ -1161,7 +1163,7 @@ extensive documentation, including API reference and a tutorial.") `(#:python ,python-2 ,@(substitute-keyword-arguments (package-arguments python-pycairo) ((#:phases phases) - `(alist-delete 'patch-waf ,phases)) + `(modify-phases ,phases (delete 'patch-waf))) ((#:native-inputs native-inputs) `(alist-delete "python-waf" ,native-inputs))))) ;; Dual-licensed under LGPL 2.1 or Mozilla Public License 1.1 @@ -1255,7 +1257,7 @@ write GNOME applications.") #:test-target "test" #:tests? #f ; Tests fail with "Gtk cannot open display:" #:phases - (alist-delete 'configure %standard-phases))) + (modify-phases %standard-phases (delete 'configure)))) (build-system gnu-build-system) (home-page "https://pwmt.org/projects/girara/") (synopsis "Library for minimalistic gtk+3 user interfaces") diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index a114fd441..87fb57194 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -80,50 +80,51 @@ dependencies.") #:configure-flags (list (string-append "--datadir=" (assoc-ref %outputs "out") "/share/guile/site/2.0")) - #:phases (alist-cons-before - 'configure 'set-go-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; Install .go files to $out/share/guile/site/2.0. - (let ((out (assoc-ref outputs "out"))) - (substitute* "module/Makefile.in" - (("^wmdir = .*$") - (string-append "wmdir = " out - "/share/guile/site/2.0\n"))))) - (alist-cons-after - 'install 'set-load-path - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Put Guile-XCB's and Guile-WM's modules in the - ;; search path of PROG. - (let* ((out (assoc-ref outputs "out")) - (prog (string-append out "/bin/guile-wm")) - (mods (string-append - out "/share/guile/site/2.0")) - (xcb (string-append - (assoc-ref inputs "guile-xcb") - "/share/guile/site/2.0"))) - (wrap-program - prog - `("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,mods ,xcb))))) - (alist-cons-after - 'install 'install-xsession - (lambda* (#:key outputs #:allow-other-keys) - ;; add a .desktop file to xsessions - (let ((xsessions (string-append - %output "/share/xsessions"))) - (mkdir-p xsessions) - (call-with-output-file (string-append - xsessions "/guile-wm.desktop") - (lambda (port) - (format port - "[Desktop Entry]~@ + #:phases + (modify-phases %standard-phases + (add-before 'configure 'set-go-directory + (lambda* (#:key outputs #:allow-other-keys) + ;; Install .go files to $out/share/guile/site/2.0. + (let ((out (assoc-ref outputs "out"))) + (substitute* "module/Makefile.in" + (("^wmdir = .*$") + (string-append "wmdir = " out + "/share/guile/site/2.0\n")))) + #t)) + (add-after 'install 'set-load-path + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Put Guile-XCB's and Guile-WM's modules in the + ;; search path of PROG. + (let* ((out (assoc-ref outputs "out")) + (prog (string-append out "/bin/guile-wm")) + (mods (string-append + out "/share/guile/site/2.0")) + (xcb (string-append + (assoc-ref inputs "guile-xcb") + "/share/guile/site/2.0"))) + (wrap-program + prog + `("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb)) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix + (,mods ,xcb)))) + #t)) + (add-after 'install 'install-xsession + (lambda* (#:key outputs #:allow-other-keys) + ;; add a .desktop file to xsessions + (let ((xsessions (string-append + %output "/share/xsessions"))) + (mkdir-p xsessions) + (call-with-output-file (string-append + xsessions "/guile-wm.desktop") + (lambda (port) + (format port + "[Desktop Entry]~@ Name=~a~@ Comment=~a~@ Exec=~a/bin/guile-wm~@ Type=Application~%" - ,name ,synopsis %output))))) - %standard-phases))))) + ,name ,synopsis %output)))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.0) ("guile-xcb" ,guile-xcb))) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 3fd3f89dc..f377d83b1 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -94,24 +94,24 @@ (arguments '(#:configure-flags '("--disable-error-on-warning") ;; Insert a phase before `configure' to patch things up. - #:phases (alist-cons-before - 'configure - 'patch-stuff - (lambda* (#:key outputs #:allow-other-keys) - ;; Add a call to `lt_dladdsearchdir' so that - ;; `libguile-readline.so' & co. are in the - ;; loader's search path. - (substitute* "libguile/dynl.c" - (("lt_dlinit.*$" match) - (format #f - " ~a~% lt_dladdsearchdir(\"~a/lib\");~%" - match - (assoc-ref outputs "out")))) - - ;; The usual /bin/sh... - (substitute* "ice-9/popen.scm" - (("/bin/sh") (which "sh")))) - %standard-phases))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-stuff + (lambda* (#:key outputs #:allow-other-keys) + ;; Add a call to `lt_dladdsearchdir' so that + ;; `libguile-readline.so' & co. are in the + ;; loader's search path. + (substitute* "libguile/dynl.c" + (("lt_dlinit.*$" match) + (format #f + " ~a~% lt_dladdsearchdir(\"~a/lib\");~%" + match + (assoc-ref outputs "out")))) + + ;; The usual /bin/sh... + (substitute* "ice-9/popen.scm" + (("/bin/sh") (which "sh"))) + #t))))) (inputs `(("gawk" ,gawk) ("readline" ,readline))) diff --git a/gnu/packages/hugs.scm b/gnu/packages/hugs.scm index 2367d5bc6..a14b8a858 100644 --- a/gnu/packages/hugs.scm +++ b/gnu/packages/hugs.scm @@ -39,36 +39,37 @@ "1mdy4aq4campgmnpc2qwq7bsbfhaxfsqdghbyyz2wms4lnfcmyma")))) (build-system gnu-build-system) (arguments - `(#:phases (alist-cons-before - 'configure 'fix-sh-n-cp - (lambda _ - (substitute* - '("configure" - "libraries/configure" - "packages/time/configure" - "packages/base/configure" - "packages/X11/configure" - "packages/HGL/configure" - "packages/OpenAL/configure" - "packages/OpenGL/configure" - "packages/network/configure" - "packages/unix/configure" - "packages/Cabal/tests/HSQL/configure" - "packages/ALUT/configure" - "packages/GLUT/configure" - "packages/base/cbits/execvpe.c" - "packages/base/System/Process/Internals.hs" - "packages/Cabal/Distribution/attic" - "packages/Cabal/Distribution/Simple/Register.hs" - "packages/Cabal/Distribution/Simple/Hugs.hs" - "tools/hugs-hc" - "src/machdep.c" - "libraries/Makefile.in") - (("/bin/sh") (which "sh"))) - (substitute* '("demos/Makefile.in" - "libraries/Makefile.in") - (("/bin/cp") (which "cp")))) - %standard-phases) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-sh-n-cp + (lambda _ + (substitute* + '("configure" + "libraries/configure" + "packages/time/configure" + "packages/base/configure" + "packages/X11/configure" + "packages/HGL/configure" + "packages/OpenAL/configure" + "packages/OpenGL/configure" + "packages/network/configure" + "packages/unix/configure" + "packages/Cabal/tests/HSQL/configure" + "packages/ALUT/configure" + "packages/GLUT/configure" + "packages/base/cbits/execvpe.c" + "packages/base/System/Process/Internals.hs" + "packages/Cabal/Distribution/attic" + "packages/Cabal/Distribution/Simple/Register.hs" + "packages/Cabal/Distribution/Simple/Hugs.hs" + "tools/hugs-hc" + "src/machdep.c" + "libraries/Makefile.in") + (("/bin/sh") (which "sh"))) + (substitute* '("demos/Makefile.in" + "libraries/Makefile.in") + (("/bin/cp") (which "cp"))) + #t))) #:tests? #f)) ; no test target ;; FIXME: Fails to build with GCC 5. (native-inputs `(("gcc" ,gcc-4.9))) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index bd1eb4b08..a29e5bafd 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -56,14 +56,13 @@ "02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f")))) (build-system gnu-build-system) (arguments - `(#:phases (alist-replace - 'install - (lambda _ - (zero? - (system* "make" "install-data"))) - (alist-delete - 'build - %standard-phases)) + `(#:phases + (modify-phases %standard-phases + (replace 'install + (lambda _ + (zero? + (system* "make" "install-data")))) + (delete 'build)) ;; GNU Mach supports only IA32 currently, so cheat so that we can at ;; least install its headers. @@ -125,11 +124,12 @@ communication.") (native-inputs `(("mig" ,mig))) (arguments - `(#:phases (alist-replace - 'install - (lambda _ - (zero? (system* "make" "install-headers" "no_deps=t"))) - (alist-delete 'build %standard-phases)) + `(#:phases + (modify-phases %standard-phases + (replace 'install + (lambda _ + (zero? (system* "make" "install-headers" "no_deps=t")))) + (delete 'build)) #:configure-flags '(;; Pretend we're on GNU/Hurd; 'configure' wants ;; that. @@ -164,24 +164,22 @@ Library and other user programs.") (arguments (substitute-keyword-arguments (package-arguments hurd-headers) ((#:phases _) - '(alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; We need to copy libihash.a to the output directory manually, - ;; since there is no target for that in the makefile. - (mkdir-p (string-append out "/include")) - (copy-file "libihash/ihash.h" - (string-append out "/include/ihash.h")) - (mkdir-p (string-append out "/lib")) - (copy-file "libihash/libihash.a" - (string-append out "/lib/libihash.a")) - #t)) - (alist-replace - 'build - (lambda _ - (zero? (system* "make" "-Clibihash" "libihash.a"))) - %standard-phases))))) + '(modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; We need to copy libihash.a to the output directory manually, + ;; since there is no target for that in the makefile. + (mkdir-p (string-append out "/include")) + (copy-file "libihash/ihash.h" + (string-append out "/include/ihash.h")) + (mkdir-p (string-append out "/lib")) + (copy-file "libihash/libihash.a" + (string-append out "/lib/libihash.a")) + #t))) + (replace 'build + (lambda _ + (zero? (system* "make" "-Clibihash" "libihash.a")))))))) (home-page "https://www.gnu.org/software/hurd/hurd.html") (synopsis "GNU Hurd libraries") (description diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 644780b5e..4d501476a 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -65,10 +65,10 @@ "1d4ycmai3dpajl0bdr9i56646g4h5j1lb95jjn0nckwcddcj927c")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-delete 'configure %standard-phases) - #:tests? #f ;FIXME: Requires 'perl-test-command'. - #:make-flags - (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))))) + '(#:phases (modify-phases %standard-phases (delete 'configure)) + #:tests? #f ;FIXME: Requires 'perl-test-command'. + #:make-flags + (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))))) (inputs `(("imlib2" ,imlib2) ("curl" ,curl) ("libpng" ,libpng) @@ -178,9 +178,9 @@ It is the default image viewer on LXDE desktop environment.") '(#:tests? #f ; no check target #:make-flags (list (string-append "PREFIX=" %output) "CC=gcc") - #:phases (alist-delete - 'configure ; no configure phase - %standard-phases))) + #:phases + ;; no configure phase + (modify-phases %standard-phases (delete 'configure)))) (inputs `(("libx11" ,libx11) ("imlib2" ,imlib2) diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm index 6bac0bcd5..941d3dcc4 100644 --- a/gnu/packages/libcanberra.scm +++ b/gnu/packages/libcanberra.scm @@ -79,15 +79,15 @@ `(("pkg-config" ,pkg-config))) (arguments `(#:phases - (alist-cons-before - 'build 'patch-default-sounds-directory - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/sound-theme-spec.c" - (("@SOUND_THEME_DIRECTORY@") - (string-append - (assoc-ref inputs "sound-theme-freedesktop") - "/share")))) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'build 'patch-default-sounds-directory + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/sound-theme-spec.c" + (("@SOUND_THEME_DIRECTORY@") + (string-append + (assoc-ref inputs "sound-theme-freedesktop") + "/share"))) + #t))))) (home-page "http://0pointer.de/lennart/projects/libcanberra/") (synopsis "Implementation of the XDG Sound Theme and Name Specifications") diff --git a/gnu/packages/libsigsegv.scm b/gnu/packages/libsigsegv.scm index 41e734535..d7a510d9c 100644 --- a/gnu/packages/libsigsegv.scm +++ b/gnu/packages/libsigsegv.scm @@ -44,12 +44,13 @@ ;; linux-libre-headers-cross-mips64el-linux-gnu-3.3.8/include/asm/sigcontext.h:57:8: error: redefinition of 'struct sigcontext' (if (string-contains (or (%current-target-system) (%current-system)) "mips64el") - `(#:phases (alist-cons-before - 'configure 'patch-mips-old-h - (lambda _ - (substitute* "src/fault-linux-mips-old.h" - (("#include ") ""))) - %standard-phases)) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-mips-old-h + (lambda _ + (substitute* "src/fault-linux-mips-old.h" + (("#include ") "")) + #t)))) '())) (description "GNU libsigsegv is a library to handle page faults, which occur when a diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a189458ad..7f44ea789 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -833,18 +833,19 @@ ext3 or ext4 partition.") "1xncw3dn2cp922ly42m96p6fh7jv8ysg6bwqbk5xvw701f3dmkrs")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - (copy-file "zerofree" - (string-append bin "/zerofree")) - (chmod (string-append bin "/zerofree") - #o555) - #t)) - (alist-delete 'configure %standard-phases)) + '(#:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (copy-file "zerofree" + (string-append bin "/zerofree")) + (chmod (string-append bin "/zerofree") + #o555) + #t))) + (delete 'configure)) #:tests? #f)) ;no tests (inputs `(("libext2fs" ,e2fsprogs))) (synopsis "Zero non-allocated regions in ext2/ext3/ext4 file systems") @@ -1296,49 +1297,48 @@ configuration (iptunnel, ipmaddr).") (guix build utils) (srfi srfi-1) (srfi srfi-26)) - #:phases (alist-cons-after - 'unpack 'patch - (lambda* (#:key inputs #:allow-other-keys) - (define (apply-patch file) - (zero? (system* "patch" "-p1" "--force" - "--input" file))) - - (let ((patch.gz (assoc-ref inputs "patch"))) - (format #t "applying Debian patch set '~a'...~%" - patch.gz) - (system (string-append "gunzip < " patch.gz " > the-patch")) - (and (apply-patch "the-patch") - (for-each apply-patch - (find-files "debian/patches" - "\\.patch"))))) - (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/bin")) - (mkdir-p (string-append out "/sbin")) - - ;; Pretend we have everything... - (system "yes | make config") - - ;; ... except for the things we don't have. - ;; HAVE_AFDECnet requires libdnet, which we don't have. - ;; HAVE_HWSTRIP and HAVE_HWTR require kernel headers - ;; that have been removed. - (substitute* '("config.make" "config.h") - (("^.*HAVE_(AFDECnet|HWSTRIP|HWTR)[ =]1.*$") "")))) - (alist-cons-after - 'install 'remove-redundant-commands - (lambda* (#:key outputs #:allow-other-keys) - ;; Remove commands and man pages redundant with - ;; Inetutils. - (let* ((out (assoc-ref outputs "out")) - (dup (append-map (cut find-files out <>) - '("^hostname" - "^(yp|nis|dns)?domainname")))) - (for-each delete-file dup) - #t)) - %standard-phases))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs #:allow-other-keys) + (define (apply-patch file) + (zero? (system* "patch" "-p1" "--force" + "--input" file))) + + (let ((patch.gz (assoc-ref inputs "patch"))) + (format #t "applying Debian patch set '~a'...~%" + patch.gz) + (system (string-append "gunzip < " patch.gz " > the-patch")) + (and (apply-patch "the-patch") + (for-each apply-patch + (find-files "debian/patches" + "\\.patch")))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/bin")) + (mkdir-p (string-append out "/sbin")) + + ;; Pretend we have everything... + (system "yes | make config") + + ;; ... except for the things we don't have. + ;; HAVE_AFDECnet requires libdnet, which we don't have. + ;; HAVE_HWSTRIP and HAVE_HWTR require kernel headers + ;; that have been removed. + (substitute* '("config.make" "config.h") + (("^.*HAVE_(AFDECnet|HWSTRIP|HWTR)[ =]1.*$") ""))) + #t)) + (add-after 'install 'remove-redundant-commands + (lambda* (#:key outputs #:allow-other-keys) + ;; Remove commands and man pages redundant with + ;; Inetutils. + (let* ((out (assoc-ref outputs "out")) + (dup (append-map (cut find-files out <>) + '("^hostname" + "^(yp|nis|dns)?domainname")))) + (for-each delete-file dup) + #t)))) ;; Binaries that depend on libnet-tools.a don't declare that ;; dependency, making it parallel-unsafe. @@ -1420,22 +1420,22 @@ Linux-based operating systems.") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake))) (arguments - '(#:phases (alist-cons-after - 'unpack 'bootstrap - (lambda _ - ;; Fix "field ‘ip6’ has incomplete type" errors. - (substitute* "libbridge/libbridge.h" - (("#include ") - "#include \n#include ")) - - ;; Ensure that the entire build fails if one of the - ;; sub-Makefiles fails. - (substitute* "Makefile.in" - (("\\$\\(MAKE\\) \\$\\(MFLAGS\\) -C \\$\\$x ;") - "$(MAKE) $(MFLAGS) -C $$x || exit 1;")) - - (zero? (system* "autoreconf" "-vf"))) - %standard-phases) + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ + ;; Fix "field ‘ip6’ has incomplete type" errors. + (substitute* "libbridge/libbridge.h" + (("#include ") + "#include \n#include ")) + + ;; Ensure that the entire build fails if one of the + ;; sub-Makefiles fails. + (substitute* "Makefile.in" + (("\\$\\(MAKE\\) \\$\\(MFLAGS\\) -C \\$\\$x ;") + "$(MAKE) $(MFLAGS) -C $$x || exit 1;")) + + (zero? (system* "autoreconf" "-vf"))))) #:tests? #f)) ; no 'check' target (home-page @@ -1495,7 +1495,7 @@ configuration and monitoring interfaces.") (arguments `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) "CC=gcc") - #:phases (alist-delete 'configure %standard-phases))) + #:phases (modify-phases %standard-phases (delete 'configure)))) (home-page "https://wireless.wiki.kernel.org/") (synopsis "Tool for configuring wireless devices") (description @@ -1628,27 +1628,28 @@ processes currently causing I/O.") (string-append "UDEV_RULES_PATH=" (assoc-ref %outputs "out") "/lib/udev/rules.d")) - #:phases (alist-cons-before - 'build 'set-file-names - (lambda* (#:key inputs #:allow-other-keys) - ;; libfuse calls out to mount(8) and umount(8). Make sure - ;; it refers to the right ones. - (substitute* '("lib/mount_util.c" "util/mount_util.c") - (("/bin/(u?)mount" _ maybe-u) - (string-append (assoc-ref inputs "util-linux") - "/bin/" maybe-u "mount"))) - (substitute* '("util/mount.fuse.c") - (("/bin/sh") - (which "sh"))) - - ;; This hack leads libfuse to search for 'fusermount' in - ;; $PATH, where it may find a setuid-root binary, instead of - ;; trying solely $out/sbin/fusermount and failing because - ;; it's not setuid. - (substitute* "lib/Makefile" - (("-DFUSERMOUNT_DIR=[[:graph:]]+") - "-DFUSERMOUNT_DIR=\\\"/var/empty\\\""))) - %standard-phases))) + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-file-names + (lambda* (#:key inputs #:allow-other-keys) + ;; libfuse calls out to mount(8) and umount(8). Make sure + ;; it refers to the right ones. + (substitute* '("lib/mount_util.c" "util/mount_util.c") + (("/bin/(u?)mount" _ maybe-u) + (string-append (assoc-ref inputs "util-linux") + "/bin/" maybe-u "mount"))) + (substitute* '("util/mount.fuse.c") + (("/bin/sh") + (which "sh"))) + + ;; This hack leads libfuse to search for 'fusermount' in + ;; $PATH, where it may find a setuid-root binary, instead of + ;; trying solely $out/sbin/fusermount and failing because + ;; it's not setuid. + (substitute* "lib/Makefile" + (("-DFUSERMOUNT_DIR=[[:graph:]]+") + "-DFUSERMOUNT_DIR=\\\"/var/empty\\\"")) + #t))))) (home-page "https://github.com/libfuse/libfuse") (synopsis "Support file systems implemented in user space") (description @@ -1726,20 +1727,20 @@ UnionFS-FUSE additionally supports copy-on-write.") (arguments '(#:tests? #f #:configure-flags '("-DCMAKE_EXE_LINKER_FLAGS=-static") - #:phases (alist-cons-after - 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (exe (string-append out "/bin/unionfs"))) - ;; By default, 'unionfs' keeps references to - ;; $glibc/share/locale and similar stuff. Remove them. - (remove-store-references exe) - - ;; 'unionfsctl' has references to glibc as well. Since - ;; we don't need it, remove it. - (delete-file (string-append out "/bin/unionfsctl")) - #t)) - %standard-phases))) + #:phases + (modify-phases %standard-phases + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (exe (string-append out "/bin/unionfs"))) + ;; By default, 'unionfs' keeps references to + ;; $glibc/share/locale and similar stuff. Remove them. + (remove-store-references exe) + + ;; 'unionfsctl' has references to glibc as well. Since + ;; we don't need it, remove it. + (delete-file (string-append out "/bin/unionfsctl")) + #t)))))) (inputs `(("fuse" ,fuse-static))))) (define-public sshfs-fuse @@ -2318,43 +2319,42 @@ country-specific regulations for the wireless spectrum.") (string-append "ETCDIR=" %output "/etc") (string-append "MANDIR=" %output "/share/man")) #:phases - (alist-delete - 'configure - (alist-cons-before - 'build 'patch-exec-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "prog/detect/sensors-detect" - (("`uname") - (string-append "`" (assoc-ref inputs "coreutils") - "/bin/uname")) - (("(`|\")modprobe" all open-quote) - (string-append open-quote - (assoc-ref inputs "kmod") - "/bin/modprobe"))) - (substitute* '("prog/pwm/pwmconfig" - "prog/pwm/fancontrol") - (("gnuplot") - (string-append (assoc-ref inputs "gnuplot") - "/bin/gnuplot")) - (("cat ") - (string-append (assoc-ref inputs "coreutils") - "/bin/cat ")) - (("egrep ") - (string-append (assoc-ref inputs "grep") - "/bin/egrep ")) - (("sed -e") - (string-append (assoc-ref inputs "sed") - "/bin/sed -e")) - (("cut -d") - (string-append (assoc-ref inputs "coreutils") - "/bin/cut -d")) - (("sleep ") - (string-append (assoc-ref inputs "coreutils") - "/bin/sleep ")) - (("readlink -f") - (string-append (assoc-ref inputs "coreutils") - "/bin/readlink -f")))) - %standard-phases)))) + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'patch-exec-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "prog/detect/sensors-detect" + (("`uname") + (string-append "`" (assoc-ref inputs "coreutils") + "/bin/uname")) + (("(`|\")modprobe" all open-quote) + (string-append open-quote + (assoc-ref inputs "kmod") + "/bin/modprobe"))) + (substitute* '("prog/pwm/pwmconfig" + "prog/pwm/fancontrol") + (("gnuplot") + (string-append (assoc-ref inputs "gnuplot") + "/bin/gnuplot")) + (("cat ") + (string-append (assoc-ref inputs "coreutils") + "/bin/cat ")) + (("egrep ") + (string-append (assoc-ref inputs "grep") + "/bin/egrep ")) + (("sed -e") + (string-append (assoc-ref inputs "sed") + "/bin/sed -e")) + (("cut -d") + (string-append (assoc-ref inputs "coreutils") + "/bin/cut -d")) + (("sleep ") + (string-append (assoc-ref inputs "coreutils") + "/bin/sleep ")) + (("readlink -f") + (string-append (assoc-ref inputs "coreutils") + "/bin/readlink -f"))) + #t))))) (home-page "http://jdelvare.nerim.net/devel.html#lmsensors") (synopsis "Utilities to read temperature/voltage/fan sensors") (description @@ -2381,7 +2381,7 @@ It works with most newer systems.") #:make-flags (list (string-append "prefix=" %output) "CC=gcc") ;; no configure script - #:phases (alist-delete 'configure %standard-phases))) + #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs `(("perl" ,perl))) (home-page "http://jdelvare.nerim.net/devel.html#i2ctools") @@ -2410,18 +2410,19 @@ SMBus access.") ("gtk" ,gtk+-2))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments - `(#:phases (alist-cons-before - 'configure 'enable-deprecated - (lambda _ - (substitute* "src/Makefile.in" - (("-DGDK_DISABLE_DEPRECATED") "") - (("-DGTK_DISABLE_DEPRECATED") ""))) - (alist-cons-before - 'configure 'remove-Werror - (lambda _ - (substitute* '("configure" "src/Makefile.in") - (("-Werror") ""))) - %standard-phases)))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'enable-deprecated + (lambda _ + (substitute* "src/Makefile.in" + (("-DGDK_DISABLE_DEPRECATED") "") + (("-DGTK_DISABLE_DEPRECATED") "")) + #t)) + (add-before 'configure 'remove-Werror + (lambda _ + (substitute* '("configure" "src/Makefile.in") + (("-Werror") "")) + #t))))) (home-page "http://www.linuxhardware.org/xsensors/") (synopsis "Hardware health information viewer") (description @@ -2437,12 +2438,13 @@ in a digital read-out.") (source (package-source linux-libre)) (build-system gnu-build-system) (arguments - '(#:phases (alist-replace - 'configure - (lambda* (#:key inputs #:allow-other-keys) - (setenv "SHELL_PATH" (which "bash")) - (chdir "tools/perf")) - %standard-phases) + '(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys) + (setenv "SHELL_PATH" (which "bash")) + (chdir "tools/perf") + #t))) #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")) "WERROR=0" @@ -2781,22 +2783,23 @@ MPEG-2 and audio over Linux IEEE 1394.") (string-append "BINDIR=" out "/sbin") (string-append "MANDIR=" out "/share/man") (string-append "UDEVDIR=" out "/lib/udev"))) - #:phases (alist-cons-before - 'build 'patch-program-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((coreutils (assoc-ref inputs "coreutils"))) - (substitute* "udev-md-raid-arrays.rules" - (("/usr/bin/(readlink|basename)" all program) - (string-append coreutils "/bin/" program))))) - (alist-cons-before - 'build 'remove-W-error - (lambda _ - ;; We cannot build with -Werror on i686 due to a - ;; 'sign-compare' warning in util.c. - (substitute* "Makefile" - (("-Werror") "")) - #t) - (alist-delete 'configure %standard-phases))) + #:phases + (modify-phases %standard-phases + (add-before 'build 'patch-program-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((coreutils (assoc-ref inputs "coreutils"))) + (substitute* "udev-md-raid-arrays.rules" + (("/usr/bin/(readlink|basename)" all program) + (string-append coreutils "/bin/" program)))) + #t)) + (add-before 'build 'remove-W-error + (lambda _ + ;; We cannot build with -Werror on i686 due to a + ;; 'sign-compare' warning in util.c. + (substitute* "Makefile" + (("-Werror") "")) + #t)) + (delete 'configure)) ;;tests must be done as root #:tests? #f)) (home-page "http://neil.brown.name/blog/mdadm") @@ -2931,7 +2934,8 @@ Linux Device Mapper multipathing driver: (list "CC=gcc" (string-append "prefix=" %output)) #:test-target "partcheck" ; need root for a full 'check' #:phases - (alist-delete 'configure %standard-phases))) ; no configure script + ;; no configure script + (modify-phases %standard-phases (delete 'configure)))) (home-page "http://lse.sourceforge.net/io/aio.html") (synopsis "Linux-native asynchronous I/O access library") (description @@ -3537,13 +3541,14 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.") ;; FIXME: The upstream tarball lacks man pages, and building them would ;; require DocBook & co. We used to use Gentoo's pre-built man pages, ;; but they vanished. In the meantime, fake it. - '(#:phases (alist-cons-before - 'configure 'fake-docbook - (lambda _ - (substitute* "Makefile.in" - (("^DOCBOOKTOMAN.*$") - "DOCBOOKTOMAN = true\n"))) - %standard-phases))) + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'fake-docbook + (lambda _ + (substitute* "Makefile.in" + (("^DOCBOOKTOMAN.*$") + "DOCBOOKTOMAN = true\n")) + #t))))) (home-page "http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/") (synopsis "Tools for loading and managing Linux kernel modules") (description diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 224cea56f..c3b213047 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -445,36 +445,33 @@ statistical profiler, a code coverage tool, and many other extensions.") (guix build utils) (guix build gnu-build-system)) #:phases - (alist-replace - 'unpack - (lambda* (#:key inputs #:allow-other-keys) - (and (zero? (system* "tar" "xzvf" (assoc-ref inputs "ccl"))) - (begin (chdir "ccl") #t))) - (alist-delete - 'configure - (alist-cons-before - 'build 'pre-build - ;; Enter the source directory for the current platform's lisp - ;; kernel, and run 'make clean' to remove the precompiled one. - (lambda _ - (chdir (string-append - "lisp-kernel/" - ,(match (or (%current-target-system) (%current-system)) - ("i686-linux" "linuxx8632") - ("x86_64-linux" "linuxx8664") - ("armhf-linux" "linuxarm") - ;; Prevent errors when querying this package - ;; on unsupported platforms, e.g. when running - ;; "guix package --search=" - (_ "UNSUPPORTED")))) - (substitute* '("Makefile") - (("/bin/rm") "rm")) - (setenv "CC" "gcc") - (zero? (system* "make" "clean"))) - ;; XXX Do we need to recompile the heap image as well for Guix? - ;; For now just use the one we already got in the tarball. - (alist-replace - 'install + (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key inputs #:allow-other-keys) + (and (zero? (system* "tar" "xzvf" (assoc-ref inputs "ccl"))) + (begin (chdir "ccl") #t)))) + (delete 'configure) + (add-before 'build 'pre-build + ;; Enter the source directory for the current platform's lisp + ;; kernel, and run 'make clean' to remove the precompiled one. + (lambda _ + (chdir (string-append + "lisp-kernel/" + ,(match (or (%current-target-system) (%current-system)) + ("i686-linux" "linuxx8632") + ("x86_64-linux" "linuxx8664") + ("armhf-linux" "linuxarm") + ;; Prevent errors when querying this package + ;; on unsupported platforms, e.g. when running + ;; "guix package --search=" + (_ "UNSUPPORTED")))) + (substitute* '("Makefile") + (("/bin/rm") "rm")) + (setenv "CC" "gcc") + (zero? (system* "make" "clean")))) + ;; XXX Do we need to recompile the heap image as well for Guix? + ;; For now just use the one we already got in the tarball. + (replace 'install (lambda* (#:key outputs inputs #:allow-other-keys) ;; The lisp kernel built by running 'make' in lisp-kernel/$system ;; is put back into the original directory, so go back. The heap @@ -513,8 +510,8 @@ statistical profiler, a code coverage tool, and many other extensions.") "CCL_DEFAULT_DIRECTORY=" libdir "\n" "export CCL_DEFAULT_DIRECTORY\n" "exec " libdir kernel "\n")))) - (chmod wrapper #o755))) - %standard-phases)))))) + (chmod wrapper #o755) + #t)))))) (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")) (home-page "http://ccl.clozure.com/") (synopsis "Common Lisp implementation") diff --git a/gnu/packages/lout.scm b/gnu/packages/lout.scm index f2c724ae0..d99f944b4 100644 --- a/gnu/packages/lout.scm +++ b/gnu/packages/lout.scm @@ -24,91 +24,81 @@ #:use-module (gnu packages ghostscript)) (define-public lout - ;; This one is a bit tricky, because it doesn't follow the GNU Build System - ;; rules. Instead, it has a makefile that has to be patched to set the - ;; prefix, etc., and it has no makefile rules to build its doc. - (let ((configure-phase - '(lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (substitute* "makefile" - (("^PREFIX[[:blank:]]*=.*$") - (string-append "PREFIX = " out "\n")) - (("^LOUTLIBDIR[[:blank:]]*=.*$") - (string-append "LOUTLIBDIR = " out "/lib/lout\n")) - (("^LOUTDOCDIR[[:blank:]]*=.*$") - (string-append "LOUTDOCDIR = " doc "/share/doc/lout\n")) - (("^MANDIR[[:blank:]]*=.*$") - (string-append "MANDIR = " out "/man\n"))) - (mkdir out) - (mkdir (string-append out "/bin")) - (mkdir (string-append out "/lib")) - (mkdir (string-append out "/man")) - (mkdir-p (string-append doc "/share/doc/lout"))))) - (install-man-phase - '(lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "make" "installman")))) - (doc-phase - '(lambda* (#:key outputs #:allow-other-keys) - (define out - (assoc-ref outputs "doc")) - - (setenv "PATH" - (string-append (assoc-ref outputs "out") - "/bin:" (getenv "PATH"))) - (chdir "doc") - (every (lambda (doc) - (format #t "doc: building `~a'...~%" doc) - (with-directory-excursion doc - (let ((file (string-append out "/share/doc/lout/" - doc ".ps"))) - (and (or (file-exists? "outfile.ps") - (zero? (system* "lout" "-r4" "-o" - "outfile.ps" "all"))) - (begin - (copy-file "outfile.ps" file) - #t) - (zero? (system* "ps2pdf" - "-dPDFSETTINGS=/prepress" - "-sPAPERSIZE=a4" - file - (string-append out "/share/doc/lout/" - doc ".pdf"))))))) - '("design" "expert" "slides" "user"))))) - (package + (package (name "lout") (version "3.40") (source (origin - (method url-fetch) - (uri (string-append "mirror://savannah/lout/lout-" - version ".tar.gz")) - (sha256 - (base32 - "1gb8vb1wl7ikn269dd1c7ihqhkyrwk19jwx5kd0rdvbk6g7g25ix")))) + (method url-fetch) + (uri (string-append "mirror://savannah/lout/lout-" + version ".tar.gz")) + (sha256 + (base32 + "1gb8vb1wl7ikn269dd1c7ihqhkyrwk19jwx5kd0rdvbk6g7g25ix")))) (build-system gnu-build-system) ; actually, just a makefile (outputs '("out" "doc")) (native-inputs `(("ghostscript" ,ghostscript))) - (arguments `(#:modules ((guix build utils) - (guix build gnu-build-system) - (srfi srfi-1)) ; we need SRFI-1 - #:tests? #f ; no "check" target - - ;; Customize the build phases. - #:phases (alist-replace - 'configure ,configure-phase - - (alist-cons-after - 'install 'install-man-pages - ,install-man-phase + (arguments + `(#:modules ((guix build utils) + (guix build gnu-build-system) + (srfi srfi-1)) ; we need SRFI-1 + #:tests? #f ; no "check" target - (alist-cons-after - 'install 'install-doc - ,doc-phase - %standard-phases))))) + ;; This one is a bit tricky, because it doesn't follow the GNU Build + ;; System rules. Instead, it has a makefile that has to be patched to + ;; set the prefix, etc., and it has no makefile rules to build its doc. + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (substitute* "makefile" + (("^PREFIX[[:blank:]]*=.*$") + (string-append "PREFIX = " out "\n")) + (("^LOUTLIBDIR[[:blank:]]*=.*$") + (string-append "LOUTLIBDIR = " out "/lib/lout\n")) + (("^LOUTDOCDIR[[:blank:]]*=.*$") + (string-append "LOUTDOCDIR = " doc "/share/doc/lout\n")) + (("^MANDIR[[:blank:]]*=.*$") + (string-append "MANDIR = " out "/man\n"))) + (mkdir out) + (mkdir (string-append out "/bin")) + (mkdir (string-append out "/lib")) + (mkdir (string-append out "/man")) + (mkdir-p (string-append doc "/share/doc/lout"))) + #t)) + (add-after 'install-man-pages 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "doc"))) + (setenv "PATH" + (string-append (assoc-ref outputs "out") + "/bin:" (getenv "PATH"))) + (chdir "doc") + (every (lambda (doc) + (format #t "doc: building `~a'...~%" doc) + (with-directory-excursion doc + (let ((file (string-append out "/share/doc/lout/" + doc ".ps"))) + (and (or (file-exists? "outfile.ps") + (zero? (system* "lout" "-r4" "-o" + "outfile.ps" "all"))) + (begin + (copy-file "outfile.ps" file) + #t) + (zero? (system* "ps2pdf" + "-dPDFSETTINGS=/prepress" + "-sPAPERSIZE=a4" + file + (string-append out "/share/doc/lout/" + doc ".pdf"))))))) + '("design" "expert" "slides" "user"))))) + (add-after 'install 'install-man-pages + (lambda _ + (zero? (system* "make" "installman"))))))) (synopsis "Document layout system") (description -"The Lout document formatting system reads a high-level description of + "The Lout document formatting system reads a high-level description of a document similar in style to LaTeX and produces a PostScript or plain text output file. @@ -124,4 +114,4 @@ TeX macros because Lout is a high-level, purely functional language, the outcome of an eight-year research project that went back to the beginning.") (license gpl3+) - (home-page "http://savannah.nongnu.org/projects/lout/")))) + (home-page "http://savannah.nongnu.org/projects/lout/"))) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index c3cb700be..c8bc4ef85 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -124,7 +124,7 @@ for configuration, scripting, and rapid prototyping.") (build-system gnu-build-system) (arguments '(#:tests? #f ;luajit is distributed without tests - #:phases (alist-delete 'configure %standard-phases) + #:phases (modify-phases %standard-phases (delete 'configure)) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) (home-page "http://www.luajit.org/") (synopsis "Just in time compiler for Lua programming language version 5.1") diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index d39e77d97..91fab8ccf 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -375,54 +375,50 @@ sample proximities between pairs of cases.") (arguments '(#:tests? #f ;no check target #:phases - (alist-cons-after - 'unpack 'delete-broken-symlinks - (lambda _ - (for-each delete-file '("applications/arts/data" - "applications/asp/data" - "applications/easysvm/data" - "applications/msplicer/data" - "applications/ocr/data" - "examples/documented/data" - "examples/documented/matlab_static" - "examples/documented/octave_static" - "examples/undocumented/data" - "examples/undocumented/matlab_static" - "examples/undocumented/octave_static" - "tests/integration/data" - "tests/integration/matlab_static" - "tests/integration/octave_static" - "tests/integration/python_modular/tests")) - #t) - (alist-cons-after - 'unpack 'change-R-target-path - (lambda* (#:key outputs #:allow-other-keys) - (substitute* '("src/interfaces/r_modular/CMakeLists.txt" - "src/interfaces/r_static/CMakeLists.txt" - "examples/undocumented/r_modular/CMakeLists.txt") - (("\\$\\{R_COMPONENT_LIB_PATH\\}") - (string-append (assoc-ref outputs "out") - "/lib/R/library/"))) - #t) - (alist-cons-after - 'unpack 'fix-octave-modules - (lambda* (#:key outputs #:allow-other-keys) - (substitute* '("src/interfaces/octave_modular/CMakeLists.txt" - "src/interfaces/octave_static/CMakeLists.txt") - (("^include_directories\\(\\$\\{OCTAVE_INCLUDE_DIRS\\}") - "include_directories(${OCTAVE_INCLUDE_DIRS} ${OCTAVE_INCLUDE_DIRS}/octave")) + (modify-phases %standard-phases + (add-after 'unpack 'delete-broken-symlinks + (lambda _ + (for-each delete-file '("applications/arts/data" + "applications/asp/data" + "applications/easysvm/data" + "applications/msplicer/data" + "applications/ocr/data" + "examples/documented/data" + "examples/documented/matlab_static" + "examples/documented/octave_static" + "examples/undocumented/data" + "examples/undocumented/matlab_static" + "examples/undocumented/octave_static" + "tests/integration/data" + "tests/integration/matlab_static" + "tests/integration/octave_static" + "tests/integration/python_modular/tests")) + #t)) + (add-after 'unpack 'change-R-target-path + (lambda* (#:key outputs #:allow-other-keys) + (substitute* '("src/interfaces/r_modular/CMakeLists.txt" + "src/interfaces/r_static/CMakeLists.txt" + "examples/undocumented/r_modular/CMakeLists.txt") + (("\\$\\{R_COMPONENT_LIB_PATH\\}") + (string-append (assoc-ref outputs "out") + "/lib/R/library/"))) + #t)) + (add-after 'unpack 'fix-octave-modules + (lambda* (#:key outputs #:allow-other-keys) + (substitute* '("src/interfaces/octave_modular/CMakeLists.txt" + "src/interfaces/octave_static/CMakeLists.txt") + (("^include_directories\\(\\$\\{OCTAVE_INCLUDE_DIRS\\}") + "include_directories(${OCTAVE_INCLUDE_DIRS} ${OCTAVE_INCLUDE_DIRS}/octave")) - ;; change target directory - (substitute* "src/interfaces/octave_modular/CMakeLists.txt" - (("\\$\\{OCTAVE_OCT_LOCAL_API_FILE_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/octave/packages"))) - #t) - (alist-cons-before - 'build 'set-HOME + ;; change target directory + (substitute* "src/interfaces/octave_modular/CMakeLists.txt" + (("\\$\\{OCTAVE_OCT_LOCAL_API_FILE_DIR\\}") + (string-append (assoc-ref outputs "out") + "/share/octave/packages"))) + #t)) + (add-before 'build 'set-HOME ;; $HOME needs to be set at some point during the build phase - (lambda _ (setenv "HOME" "/tmp") #t) - %standard-phases)))) + (lambda _ (setenv "HOME" "/tmp") #t))) #:configure-flags (list "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE" "-DUSE_SVMLIGHT=OFF" ;disable proprietary SVMLIGHT diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index cc76a93ed..af8690dda 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1028,51 +1028,51 @@ delivery.") ("perl" ,perl))) (arguments '(#:phases - (alist-replace - 'configure - ;; We'd use #:make-flags but the top-level Makefile calls others - ;; recursively, so just set all variables this way. - (lambda* (#:key outputs inputs #:allow-other-keys) - (substitute* '("Makefile" "OS/Makefile-Default") - (("(RM_COMMAND=).*" all var) - (string-append var "rm\n"))) - (copy-file "src/EDITME" "Local/Makefile") - (copy-file "exim_monitor/EDITME" "Local/eximon.conf") - (let ((out (assoc-ref outputs "out")) - (gzip (assoc-ref inputs "gzip")) - (bzip2 (assoc-ref inputs "bzip2")) - (xz (assoc-ref inputs "xz"))) - (substitute* '("Local/Makefile") - (("(BIN_DIRECTORY=).*" all var) - (string-append var out "/bin\n")) - (("(CONFIGURE_FILE=).*" all var) - (string-append var out "/etc/exim.conf\n")) - (("(EXIM_USER=).*" all var) - (string-append var "nobody\n")) - (("(FIXED_NEVER_USERS=).*" all var) - (string-append var "\n")) ;XXX no root in build environment - (("(COMPRESS_COMMAND=).*" all var) - (string-append var gzip "/bin/gzip\n")) - (("(ZCAT_COMMAND=).*" all var) - (string-append var gzip "/bin/zcat\n"))) - ;; This file has hardcoded names for tools despite the zcat - ;; configuration above. - (substitute* '("src/exigrep.src") - (("'zcat'") (string-append "'" gzip "/bin/zcat'")) - (("'bzcat'") (string-append "'" bzip2 "/bin/bzcat'")) - (("'xzcat'") (string-append "'" xz "/bin/xzcat'")) - (("'lzma'") (string-append "'" xz "/bin/lzma'"))))) - (alist-cons-before - 'build 'fix-sh-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("scripts/lookups-Makefile" "scripts/reversion") - (("SHELL=/bin/sh") "SHELL=sh")) - (substitute* '("scripts/Configure-config.h") - (("\\| /bin/sh") "| sh")) - (let ((bash (assoc-ref inputs "bash"))) - (substitute* '("scripts/Configure-eximon") - (("#!/bin/sh") (string-append "#!" bash "/bin/sh"))))) - %standard-phases)) + (modify-phases %standard-phases + (replace 'configure + ;; We'd use #:make-flags but the top-level Makefile calls others + ;; recursively, so just set all variables this way. + (lambda* (#:key outputs inputs #:allow-other-keys) + (substitute* '("Makefile" "OS/Makefile-Default") + (("(RM_COMMAND=).*" all var) + (string-append var "rm\n"))) + (copy-file "src/EDITME" "Local/Makefile") + (copy-file "exim_monitor/EDITME" "Local/eximon.conf") + (let ((out (assoc-ref outputs "out")) + (gzip (assoc-ref inputs "gzip")) + (bzip2 (assoc-ref inputs "bzip2")) + (xz (assoc-ref inputs "xz"))) + (substitute* '("Local/Makefile") + (("(BIN_DIRECTORY=).*" all var) + (string-append var out "/bin\n")) + (("(CONFIGURE_FILE=).*" all var) + (string-append var out "/etc/exim.conf\n")) + (("(EXIM_USER=).*" all var) + (string-append var "nobody\n")) + (("(FIXED_NEVER_USERS=).*" all var) + (string-append var "\n")) ;XXX no root in build environment + (("(COMPRESS_COMMAND=).*" all var) + (string-append var gzip "/bin/gzip\n")) + (("(ZCAT_COMMAND=).*" all var) + (string-append var gzip "/bin/zcat\n"))) + ;; This file has hardcoded names for tools despite the zcat + ;; configuration above. + (substitute* '("src/exigrep.src") + (("'zcat'") (string-append "'" gzip "/bin/zcat'")) + (("'bzcat'") (string-append "'" bzip2 "/bin/bzcat'")) + (("'xzcat'") (string-append "'" xz "/bin/xzcat'")) + (("'lzma'") (string-append "'" xz "/bin/lzma'")))) + #t)) + (add-before 'build 'fix-sh-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("scripts/lookups-Makefile" "scripts/reversion") + (("SHELL=/bin/sh") "SHELL=sh")) + (substitute* '("scripts/Configure-config.h") + (("\\| /bin/sh") "| sh")) + (let ((bash (assoc-ref inputs "bash"))) + (substitute* '("scripts/Configure-eximon") + (("#!/bin/sh") (string-append "#!" bash "/bin/sh")))) + #t))) #:make-flags '("INSTALL_ARG=-no_chown") ;; No 'check' target. #:tests? #f)) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 4eefafbe1..86a79bc0c 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -154,7 +154,7 @@ the traditional flat-text whatis databases.") "14z0zcwm0m98fk2m2b3pvr8rs2sb602mg8f7wwb4xl7yj7cpjvbg")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-delete 'configure %standard-phases) + '(#:phases (modify-phases %standard-phases (delete 'configure)) ;; The 'all' target depends on three targets that directly populate ;; $(MANDIR) based on its current contents. Doing that in parallel @@ -220,7 +220,7 @@ automatically.") (arguments `(#:tests? #f ; no "check" target #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))) - #:phases (alist-delete 'configure %standard-phases))) + #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs `(("gawk" ,gawk))) (home-page "https://github.com/mvertes/txt2man") diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6566d750b..31ed4a49d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -456,13 +456,14 @@ large scale eigenvalue problems.") ;; Build the 'LAPACKE_clatms' functions. "-DLAPACKE_WITH_TMG=ON") - #:phases (alist-cons-before - 'check 'patch-python - (lambda* (#:key inputs #:allow-other-keys) - (let ((python (assoc-ref inputs "python"))) - (substitute* "lapack_testing.py" - (("/usr/bin/env python") python)))) - %standard-phases))) + #:phases + (modify-phases %standard-phases + (add-before 'check 'patch-python + (lambda* (#:key inputs #:allow-other-keys) + (let ((python (assoc-ref inputs "python"))) + (substitute* "lapack_testing.py" + (("/usr/bin/env python") python))) + #t))))) (synopsis "Library for numerical linear algebra") (description "LAPACK is a Fortran 90 library for solving the most commonly occurring @@ -1758,12 +1759,12 @@ void mc64ad_ (int *a, int *b, int *c, int *d, int *e, double *f, int *g, (arguments `(#:parallel-build? #f ;race conditions using ar #:phases - (alist-replace - 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (call-with-output-file "make.inc" - (lambda (port) - (format port " + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (call-with-output-file "make.inc" + (lambda (port) + (format port " PLAT = DSuperLUroot = ~a DSUPERLULIB = ~a/lib/libsuperlu_dist.a @@ -1786,47 +1787,46 @@ FORTRAN = mpifort FFLAGS = -O2 -g $(PIC) LOADER = $(CC) CDEFS = -DAdd_" - (getcwd) - (assoc-ref outputs "out") - (assoc-ref inputs "lapack") - (assoc-ref inputs "pt-scotch"))))) - (alist-cons-after - 'unpack 'remove-broken-symlinks - (lambda _ - (for-each delete-file - (find-files "MAKE_INC" "\\.#make\\..*"))) - (alist-cons-before - 'build 'create-install-directories - (lambda* (#:key outputs #:allow-other-keys) - (for-each - (lambda (dir) - (mkdir-p (string-append (assoc-ref outputs "out") - "/" dir))) - '("lib" "include"))) - (alist-replace - 'check + (getcwd) + (assoc-ref outputs "out") + (assoc-ref inputs "lapack") + (assoc-ref inputs "pt-scotch")))) + #t)) + (add-after 'unpack 'remove-broken-symlinks + (lambda _ + (for-each delete-file + (find-files "MAKE_INC" "\\.#make\\..*")) + #t)) + (add-before 'build 'create-install-directories + (lambda* (#:key outputs #:allow-other-keys) + (for-each + (lambda (dir) + (mkdir-p (string-append (assoc-ref outputs "out") + "/" dir))) + '("lib" "include")) + #t)) + (replace 'check (lambda _ (with-directory-excursion "EXAMPLE" (and (zero? (system* "mpirun" "-n" "2" "./pddrive" "-r" "1" "-c" "2" "g20.rua")) (zero? (system* "mpirun" "-n" "2" - "./pzdrive" "-r" "1" "-c" "2" "cg20.cua"))))) - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - ;; Library is placed in lib during the build phase. Copy over - ;; headers to include. - (let* ((out (assoc-ref outputs "out")) - (incdir (string-append out "/include"))) - (for-each (lambda (file) - (let ((base (basename file))) - (format #t "installing `~a' to `~a'~%" - base incdir) - (copy-file file - (string-append incdir "/" base)))) - (find-files "SRC" ".*\\.h$")))) - %standard-phases))))))) + "./pzdrive" "-r" "1" "-c" "2" "cg20.cua")))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + ;; Library is placed in lib during the build phase. Copy over + ;; headers to include. + (let* ((out (assoc-ref outputs "out")) + (incdir (string-append out "/include"))) + (for-each (lambda (file) + (let ((base (basename file))) + (format #t "installing `~a' to `~a'~%" + base incdir) + (copy-file file + (string-append incdir "/" base)))) + (find-files "SRC" ".*\\.h$"))) + #t))))) (home-page (package-home-page superlu)) (synopsis "Parallel supernodal direct solver") (description @@ -2356,7 +2356,7 @@ parts of it.") (list (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases ;; no configure script - (alist-delete 'configure %standard-phases) + (modify-phases %standard-phases (delete 'configure)) #:tests? #f)) ;the tests are part of the default target (home-page "http://openlibm.org/") (synopsis "Portable C mathematical library (libm)") @@ -2395,7 +2395,7 @@ environments.") #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))) ;; no configure script - #:phases (alist-delete 'configure %standard-phases))) + #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs `(("fortran" ,gfortran))) (home-page "https://github.com/JuliaLang/openspecfun") @@ -2440,15 +2440,16 @@ Fresnel integrals, and similar related functions as well.") (string-append "INSTALL_INCLUDE=" (assoc-ref %outputs "out") "/include")) #:phases - (alist-cons-before - 'install 'prepare-out - ;; README.txt states that the target directories must exist prior to - ;; running "make install". - (lambda _ - (mkdir-p (string-append (assoc-ref %outputs "out") "/lib")) - (mkdir-p (string-append (assoc-ref %outputs "out") "/include"))) - ;; no configure script - (alist-delete 'configure %standard-phases)))) + (modify-phases %standard-phases + (add-before 'install 'prepare-out + ;; README.txt states that the target directories must exist prior to + ;; running "make install". + (lambda _ + (mkdir-p (string-append (assoc-ref %outputs "out") "/lib")) + (mkdir-p (string-append (assoc-ref %outputs "out") "/include")) + #t)) + ;; no configure script + (delete 'configure)))) (inputs `(("tbb" ,tbb) ("lapack" ,lapack))) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index eb9e86915..adb7b938f 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -142,20 +142,19 @@ keys, no previous conversation is compromised.") ("python" ,python-2) ("perl" ,perl))) (arguments - `(#:phases (alist-cons-after - 'install 'install-etc - (lambda* (#:key (make-flags '()) #:allow-other-keys) - (zero? (apply system* "make" "install-etc" make-flags))) - (alist-replace - 'configure - ;; bitlbee's configure script does not tolerate many of the - ;; variable settings that Guix would pass to it. - (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "./configure" - (string-append "--prefix=" - (assoc-ref outputs "out")) - "--otr=1"))) - %standard-phases)))) + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-etc + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (zero? (apply system* "make" "install-etc" make-flags)))) + (replace 'configure + ;; bitlbee's configure script does not tolerate many of the + ;; variable settings that Guix would pass to it. + (lambda* (#:key outputs #:allow-other-keys) + (zero? (system* "./configure" + (string-append "--prefix=" + (assoc-ref outputs "out")) + "--otr=1"))))))) (synopsis "IRC to instant messaging gateway") (description "BitlBee brings IM (instant messaging) to IRC clients, for people who have an IRC client running all the time and don't want to run an diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 789e596f8..23063616f 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -65,12 +65,12 @@ (build-system gnu-build-system) (arguments `(#:phases - (alist-cons-before - 'configure 'remove-unsupported-gcc-flags - (lambda _ - ;; remove option that is not supported by gcc any more - (substitute* "configure" ((" -fforce-mem") ""))) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'configure 'remove-unsupported-gcc-flags + (lambda _ + ;; remove option that is not supported by gcc any more + (substitute* "configure" ((" -fforce-mem") "")) + #t))))) (synopsis "MPEG audio decoder") (description "MAD (MPEG Audio Decoder) supports MPEG-1 and the MPEG-2 extension to @@ -118,20 +118,20 @@ versions of ID3v2.") (build-system gnu-build-system) (arguments `(#:phases - (alist-cons-before - 'configure 'apply-patches - ;; TODO: create a patch for origin instead? - (lambda _ - (substitute* "configure" - (("iomanip.h") "")) ; drop check for unused header - ;; see http://www.linuxfromscratch.org/patches/downloads/id3lib/ - (substitute* "include/id3/id3lib_strings.h" - (("include ") "include \n#include ")) - (substitute* "include/id3/writers.h" - (("//\\#include ") "#include ")) - (substitute* "examples/test_io.cpp" - (("dami;") "dami;\nusing namespace std;"))) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'configure 'apply-patches + ;; TODO: create a patch for origin instead? + (lambda _ + (substitute* "configure" + (("iomanip.h") "")) ; drop check for unused header + ;; see http://www.linuxfromscratch.org/patches/downloads/id3lib/ + (substitute* "include/id3/id3lib_strings.h" + (("include ") "include \n#include ")) + (substitute* "include/id3/writers.h" + (("//\\#include ") "#include ")) + (substitute* "examples/test_io.cpp" + (("dami;") "dami;\nusing namespace std;")) + #t))))) (synopsis "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags") (description "Id3lib is a cross-platform software development library for reading, @@ -189,29 +189,30 @@ Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files.") (build-system gnu-build-system) (outputs '("out" "gui")) ;GTK+ interface in "gui" (arguments - '(#:phases (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("prefix=.*") - (string-append "prefix := " out "\n"))))) - (alist-cons-before - 'install 'pre-install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/bin")) - (mkdir-p (string-append out "/share/man/man1")))) - (alist-cons-after - 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - ;; Move the GTK+ interface to "gui". - (let ((out (assoc-ref outputs "out")) - (gui (assoc-ref outputs "gui"))) - (mkdir-p (string-append gui "/bin")) - (rename-file (string-append out "/bin/gmp3info") - (string-append gui "/bin/gmp3info")))) - %standard-phases))) + '(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("prefix=.*") + (string-append "prefix := " out "\n")))) + #t)) + (add-before 'install 'pre-install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/bin")) + (mkdir-p (string-append out "/share/man/man1"))) + #t)) + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys) + ;; Move the GTK+ interface to "gui". + (let ((out (assoc-ref outputs "out")) + (gui (assoc-ref outputs "gui"))) + (mkdir-p (string-append gui "/bin")) + (rename-file (string-append out "/bin/gmp3info") + (string-append gui "/bin/gmp3info"))) + #t))) #:tests? #f)) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 40996b11b..8875c85e2 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -867,60 +867,60 @@ complete studio.") `(#:tests? #f ; xmllint attempts to download DTD #:test-target "test" #:phases - (alist-cons-after - 'unpack 'fix-configuration - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "default.config" - (("csound=csound") - (string-append "csound=" - (assoc-ref inputs "csound") - "/bin/csound")) - (("/usr/bin/aplay") - (string-append (assoc-ref inputs "aplay") - "/bin/aplay")) - (("/usr/bin/timidity") - (string-append (assoc-ref inputs "timidity") - "/bin/timidity")) - (("/usr/bin/mpg123") - (string-append (assoc-ref inputs "mpg123") - "/bin/mpg123")) - (("/usr/bin/ogg123") - (string-append (assoc-ref inputs "ogg123") - "/bin/ogg123")))) - (alist-cons-before - 'build 'patch-python-shebangs - (lambda _ - ;; Two python scripts begin with a Unicode BOM, so patch-shebang - ;; has no effect. - (substitute* '("solfege/parsetree.py" - "solfege/presetup.py") - (("#!/usr/bin/python") (string-append "#!" (which "python"))))) - (alist-cons-before - 'build 'add-sitedirs - ;; .pth files are not automatically interpreted unless the - ;; directories containing them are added as "sites". The directories - ;; are then added to those in the PYTHONPATH. This is required for - ;; the operation of pygtk and pygobject. - (lambda _ - (substitute* "run-solfege.py" - (("import os") - "import os, site -for path in [path for path in sys.path if 'site-packages' in path]: site.addsitedir(path)"))) - (alist-cons-before - 'build 'adjust-config-file-prefix + (modify-phases %standard-phases + (add-after 'unpack 'fix-configuration + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "default.config" + (("csound=csound") + (string-append "csound=" + (assoc-ref inputs "csound") + "/bin/csound")) + (("/usr/bin/aplay") + (string-append (assoc-ref inputs "aplay") + "/bin/aplay")) + (("/usr/bin/timidity") + (string-append (assoc-ref inputs "timidity") + "/bin/timidity")) + (("/usr/bin/mpg123") + (string-append (assoc-ref inputs "mpg123") + "/bin/mpg123")) + (("/usr/bin/ogg123") + (string-append (assoc-ref inputs "ogg123") + "/bin/ogg123"))) + #t)) + (add-before 'build 'patch-python-shebangs + (lambda _ + ;; Two python scripts begin with a Unicode BOM, so patch-shebang + ;; has no effect. + (substitute* '("solfege/parsetree.py" + "solfege/presetup.py") + (("#!/usr/bin/python") (string-append "#!" (which "python")))) + #t)) + (add-before 'build 'add-sitedirs + ;; .pth files are not automatically interpreted unless the + ;; directories containing them are added as "sites". The directories + ;; are then added to those in the PYTHONPATH. This is required for + ;; the operation of pygtk and pygobject. + (lambda _ + (substitute* "run-solfege.py" + (("import os") + "import os, site +for path in [path for path in sys.path if 'site-packages' in path]: site.addsitedir(path)")) + #t)) + (add-before 'build 'adjust-config-file-prefix (lambda* (#:key outputs #:allow-other-keys) (substitute* "run-solfege.py" (("prefix = os.path.*$") - (string-append "prefix = " (assoc-ref outputs "out"))))) - (alist-cons-after - 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Make sure 'solfege' runs with the correct PYTHONPATH. - (let* ((out (assoc-ref outputs "out")) - (path (getenv "PYTHONPATH"))) - (wrap-program (string-append out "/bin/solfege") - `("PYTHONPATH" ":" prefix (,path))))) - %standard-phases))))))) + (string-append "prefix = " (assoc-ref outputs "out")))) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Make sure 'solfege' runs with the correct PYTHONPATH. + (let* ((out (assoc-ref outputs "out")) + (path (getenv "PYTHONPATH"))) + (wrap-program (string-append out "/bin/solfege") + `("PYTHONPATH" ":" prefix (,path)))) + #t))))) (inputs `(("python" ,python-2) ("pygtk" ,python2-pygtk) diff --git a/gnu/packages/noweb.scm b/gnu/packages/noweb.scm index be90e2dc6..0954e7995 100644 --- a/gnu/packages/noweb.scm +++ b/gnu/packages/noweb.scm @@ -35,47 +35,46 @@ "10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-before - 'install 'pre-install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/share/texmf/tex/latex")) - #t)) - (alist-cons-after - 'install 'post-install - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (cu (assoc-ref inputs "coreutils")) - (du (assoc-ref inputs "diffutils"))) - (with-directory-excursion out - (for-each (lambda (prog) - (substitute* prog - (("nawk") (which "awk")))) - (append (map (lambda (x) - (string-append "bin/" x)) - '("noweb" "nountangle" - "noroots" "noroff" - "noindex")) - (map (lambda (x) - (string-append "lib/" x)) - '("btdefn" "emptydefn" "noidx" - "pipedocs" "toascii" "tohtml" - "toroff" "totex" "unmarkup")))) - (substitute* "bin/cpif" - (("^PATH=.*$") - (string-append "PATH=" cu "/bin:" du "/bin\n")))) - #t)) - (alist-replace - 'configure - (lambda _ - ;; Jump in the source. - (chdir "src") + '(#:phases + (modify-phases %standard-phases + (add-before 'install 'pre-install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/share/texmf/tex/latex")) + #t))) + (add-after 'install 'post-install + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (cu (assoc-ref inputs "coreutils")) + (du (assoc-ref inputs "diffutils"))) + (with-directory-excursion out + (for-each (lambda (prog) + (substitute* prog + (("nawk") (which "awk")))) + (append (map (lambda (x) + (string-append "bin/" x)) + '("noweb" "nountangle" + "noroots" "noroff" + "noindex")) + (map (lambda (x) + (string-append "lib/" x)) + '("btdefn" "emptydefn" "noidx" + "pipedocs" "toascii" "tohtml" + "toroff" "totex" "unmarkup")))) + (substitute* "bin/cpif" + (("^PATH=.*$") + (string-append "PATH=" cu "/bin:" du "/bin\n")))) + #t))) + (replace 'configure + (lambda _ + ;; Jump in the source. + (chdir "src") - ;; The makefile reads "source: FAQ", but FAQ isn't - ;; available. - (substitute* "Makefile" - (("FAQ") ""))) - %standard-phases))) + ;; The makefile reads "source: FAQ", but FAQ isn't + ;; available. + (substitute* "Makefile" + (("FAQ") "")) + #t))) #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "BIN=" out "/bin") (string-append "LIB=" out "/lib") diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 42da56194..c8491dc05 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -53,30 +53,31 @@ (inputs `(("perl" ,perl))) (arguments '(#:parallel-tests? #f - #:phases (alist-cons-before - 'check 'patch-test-scripts - (lambda _ - (let ((echo (which "echo"))) - (substitute* - (find-files "tests" "^run-test$") - (("/bin/echo") echo)))) - (alist-cons-after - 'install 'wrap-program - ;; Point installed scripts to the utilities they need. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (diffutils (assoc-ref inputs "diffutils")) - (sed (assoc-ref inputs "sed")) - (gawk (assoc-ref inputs "gawk"))) - (for-each - (lambda (prog) - (wrap-program (string-append out "/bin/" prog) - `("PATH" ":" prefix - ,(map (lambda (dir) - (string-append dir "/bin")) - (list diffutils sed gawk))))) - '("dehtmldiff" "editdiff" "espdiff")))) - %standard-phases)))) + #:phases + (modify-phases %standard-phases + (add-before 'check 'patch-test-scripts + (lambda _ + (let ((echo (which "echo"))) + (substitute* + (find-files "tests" "^run-test$") + (("/bin/echo") echo))) + #t)) + (add-after 'install 'wrap-program + ;; Point installed scripts to the utilities they need. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (diffutils (assoc-ref inputs "diffutils")) + (sed (assoc-ref inputs "sed")) + (gawk (assoc-ref inputs "gawk"))) + (for-each + (lambda (prog) + (wrap-program (string-append out "/bin/" prog) + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin")) + (list diffutils sed gawk))))) + '("dehtmldiff" "editdiff" "espdiff"))) + #t))))) (home-page "http://cyberelk.net/tim/software/patchutils") (synopsis "Collection of tools for manipulating patch files") (description @@ -105,39 +106,39 @@ listing the files modified by a patch.") ("ed" ,ed))) (arguments '(#:parallel-tests? #f - #:phases - (alist-cons-before - 'check 'patch-tests - (lambda _ - (substitute* - '("test/run" - "test/edit.test") - (("/bin/sh") (which "sh"))) - ;; TODO: Run the mail tests once the mail feature can be supported. - (delete-file "test/mail.test")) - (alist-cons-after - 'install 'wrap-program - ;; quilt's configure checks for the absolute path to the utilities it - ;; needs, but uses only the name when invoking them, so we need to - ;; make sure the quilt script can find those utilities when run. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (coreutils (assoc-ref inputs "coreutils")) - (diffutils (assoc-ref inputs "diffutils")) - (findutils (assoc-ref inputs "findutils")) - (less (assoc-ref inputs "less")) - (file (assoc-ref inputs "file")) - (ed (assoc-ref inputs "ed")) - (sed (assoc-ref inputs "sed")) - (bash (assoc-ref inputs "bash")) - (grep (assoc-ref inputs "grep"))) - (wrap-program (string-append out "/bin/quilt") - `("PATH" ":" prefix - ,(map (lambda (dir) - (string-append dir "/bin")) - (list coreutils diffutils findutils - less file ed sed bash grep)))))) - %standard-phases)))) + #:phases + (modify-phases %standard-phases + (add-before 'check 'patch-tests + (lambda _ + (substitute* + '("test/run" + "test/edit.test") + (("/bin/sh") (which "sh"))) + ;; TODO: Run the mail tests once the mail feature can be supported. + (delete-file "test/mail.test") + #t)) + (add-after 'install 'wrap-program + ;; quilt's configure checks for the absolute path to the utilities it + ;; needs, but uses only the name when invoking them, so we need to + ;; make sure the quilt script can find those utilities when run. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (coreutils (assoc-ref inputs "coreutils")) + (diffutils (assoc-ref inputs "diffutils")) + (findutils (assoc-ref inputs "findutils")) + (less (assoc-ref inputs "less")) + (file (assoc-ref inputs "file")) + (ed (assoc-ref inputs "ed")) + (sed (assoc-ref inputs "sed")) + (bash (assoc-ref inputs "bash")) + (grep (assoc-ref inputs "grep"))) + (wrap-program (string-append out "/bin/quilt") + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin")) + (list coreutils diffutils findutils + less file ed sed bash grep))))) + #t))))) (home-page "https://savannah.nongnu.org/projects/quilt/") (synopsis "Script for managing patches to software") (description @@ -164,8 +165,9 @@ refreshed, and more.") #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")) "INSTALL_DIR=/bin" "MAN_DIR=/share/man/man1") #:phases - (alist-delete 'configure - (alist-delete 'build %standard-phases)))) + (modify-phases %standard-phases + (delete 'configure) + (delete 'build)))) (inputs `(("perl" ,perl) ("xmlto" ,xmlto))) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 7b76955e2..20dfdafb9 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -305,23 +305,23 @@ reading and editing of existing PDF files.") `(#:tests? #f ; there is no check target #:parallel-build? #f ; build fails randomly on 8-way machines #:configure-flags - (list (string-append "--with-freetype2-includes=" - (assoc-ref %build-inputs "freetype") - "/include/freetype2")) + (list (string-append "--with-freetype2-includes=" + (assoc-ref %build-inputs "freetype") + "/include/freetype2")) #:phases - (alist-replace - 'install - (lambda* (#:key outputs inputs #:allow-other-keys #:rest args) - (let* ((install (assoc-ref %standard-phases 'install)) - (out (assoc-ref outputs "out")) - (xpdfrc (string-append out "/etc/xpdfrc")) - (gs-fonts (assoc-ref inputs "gs-fonts"))) - (apply install args) - (substitute* xpdfrc + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs inputs #:allow-other-keys #:rest args) + (let* ((install (assoc-ref %standard-phases 'install)) + (out (assoc-ref outputs "out")) + (xpdfrc (string-append out "/etc/xpdfrc")) + (gs-fonts (assoc-ref inputs "gs-fonts"))) + (apply install args) + (substitute* xpdfrc (("/usr/local/share/ghostscript/fonts") (string-append gs-fonts "/share/fonts/type1/ghostscript")) - (("#fontFile") "fontFile")))) - %standard-phases))) + (("#fontFile") "fontFile"))) + #t))))) (synopsis "Viewer for PDF files based on the Motif toolkit") (description "Xpdf is a viewer for Portable Document Format (PDF) files.") @@ -352,7 +352,7 @@ reading and editing of existing PDF files.") "CC=gcc") #:tests? #f ; Package does not contain tests. #:phases - (alist-delete 'configure %standard-phases))) + (modify-phases %standard-phases (delete 'configure)))) (home-page "https://pwmt.org/projects/zathura-cb/") (synopsis "Comic book support for zathura (libarchive backend)") (description "The zathura-cb plugin adds comic book support to zathura @@ -383,7 +383,7 @@ using libarchive.") "CC=gcc") #:tests? #f ; Package does not contain tests. #:phases - (alist-delete 'configure %standard-phases))) + (modify-phases %standard-phases (delete 'configure)))) (home-page "https://pwmt.org/projects/zathura-ps/") (synopsis "PS support for zathura (libspectre backend)") (description "The zathura-ps plugin adds PS support to zathura @@ -415,7 +415,7 @@ using libspectre.") "CC=gcc") #:tests? #f ; Package does not contain tests. #:phases - (alist-delete 'configure %standard-phases))) + (modify-phases %standard-phases (delete 'configure)))) (home-page "https://pwmt.org/projects/zathura-djvu/") (synopsis "DjVu support for zathura (DjVuLibre backend)") (description "The zathura-djvu plugin adds DjVu support to zathura @@ -448,7 +448,7 @@ using the DjVuLibre library.") "CC=gcc") #:tests? #f ; Package does not include tests. #:phases - (alist-delete 'configure %standard-phases))) + (modify-phases %standard-phases (delete 'configure)))) (home-page "https://pwmt.org/projects/zathura-pdf-poppler/") (synopsis "PDF support for zathura (poppler backend)") (description "The zathura-pdf-poppler plugin adds PDF support to zathura @@ -486,7 +486,7 @@ by using the poppler rendering engine.") #:tests? #f ; Tests fail: "Gtk cannot open display". #:test-target "test" #:phases - (alist-delete 'configure %standard-phases))) + (modify-phases %standard-phases (delete 'configure)))) (home-page "https://pwmt.org/projects/zathura/") (synopsis "Lightweight keyboard-driven PDF viewer") (description "Zathura is a customizable document viewer. It provides a @@ -519,14 +519,14 @@ interaction.") `(#:configure-flags '("-DPODOFO_BUILD_SHARED=ON" "-DPODOFO_BUILD_STATIC=ON") #:phases - (alist-cons-before - 'configure 'patch - (lambda* (#:key inputs #:allow-other-keys) - (let ((freetype (assoc-ref inputs "freetype"))) - ;; Look for freetype include files in the correct place. - (substitute* "cmake/modules/FindFREETYPE.cmake" - (("/usr/local") freetype)))) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'configure 'patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((freetype (assoc-ref inputs "freetype"))) + ;; Look for freetype include files in the correct place. + (substitute* "cmake/modules/FindFREETYPE.cmake" + (("/usr/local") freetype))) + #t))))) (home-page "http://podofo.sourceforge.net") (synopsis "Tools to work with the PDF file format") (description @@ -772,13 +772,14 @@ the PDF pages.") "0bw224vb7jh0lrqaf4jgxk48xglvxs674qcpj5y0axyfbh896cfk")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-after - 'unpack 'patch-ldconfig - (lambda _ - (substitute* "mk/Autoconf.mk" - (("/sbin/ldconfig -p") "echo lib")) #t) - (alist-delete 'configure %standard-phases)) - #:tests? #f + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-ldconfig + (lambda _ + (substitute* "mk/Autoconf.mk" + (("/sbin/ldconfig -p") "echo lib")) #t)) + (delete 'configure)) + #:tests? #f #:make-flags (list "CC=gcc" (string-append "prefix=" (assoc-ref %outputs "out"))))) (inputs `(("libjpeg" ,libjpeg) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 6a59e6bf8..5248d773f 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3060,11 +3060,11 @@ at the end of the scope.") (build-system perl-build-system) (arguments `(#:phases - (alist-cons-after - 'unpack 'cd - (lambda* _ - (chdir "List")) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'unpack 'cd + (lambda* _ + (chdir "List") + #t))))) (license (package-license perl)) (synopsis "Perl extension for crawling directory trees and compiling lists of files") @@ -6621,16 +6621,17 @@ contents of a file is equal to a particular string.") "0gmnjss0hjkyiwvgby50nl5nzv254pn7fjqqdysjil21n09nymp7")))) (build-system perl-build-system) (arguments - `(#:phases (alist-cons-before - 'check 'patch-test - (lambda* (#:key inputs #:allow-other-keys) - ;; This test looks for "#!/usr/bin/perl" in some source. - ;; Patch what the test looks for. - (substitute* "t/source.t" - (("#!/usr/bin/perl") - (string-append "#!" (assoc-ref inputs "perl") - "/bin/perl")))) - %standard-phases))) + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'patch-test + (lambda* (#:key inputs #:allow-other-keys) + ;; This test looks for "#!/usr/bin/perl" in some source. + ;; Patch what the test looks for. + (substitute* "t/source.t" + (("#!/usr/bin/perl") + (string-append "#!" (assoc-ref inputs "perl") + "/bin/perl"))) + #t))))) (home-page "http://search.cpan.org/dist/Test-Harness") (synopsis "Run Perl standard test scripts with statistics") (description "Simple test harness which allows tests to be run and results diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 7cfbe2ffb..169a876c5 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -152,13 +152,14 @@ from digital cameras.") ("libexif" ,libexif) ("libgphoto2" ,libgphoto2))) (arguments - '(#:phases (alist-cons-before - 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "tests/data" "\\.param$") - (("/usr/bin/env") - (which "env")))) - %standard-phases) + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "tests/data" "\\.param$") + (("/usr/bin/env") + (which "env"))) + #t))) ;; FIXME: There are 2 test failures, most likely related to the build ;; environment. diff --git a/gnu/packages/popt.scm b/gnu/packages/popt.scm index 4978ea729..9c125dcc4 100644 --- a/gnu/packages/popt.scm +++ b/gnu/packages/popt.scm @@ -66,14 +66,15 @@ line syntax.") "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-before - 'configure 'patch-test - (lambda _ - (substitute* "test-poptrc.in" - (("/bin/echo") (which "echo"))) - (substitute* "testit.sh" ; don't expect old libtool names - (("lt-test1") "test1"))) - %standard-phases))) + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-test + (lambda _ + (substitute* "test-poptrc.in" + (("/bin/echo") (which "echo"))) + (substitute* "testit.sh" ; don't expect old libtool names + (("lt-test1") "test1")) + #t))))) (home-page "http://rpm5.org/files/popt/") (synopsis "Command line option parsing library") (description diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 9de281974..e97193003 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -205,22 +205,23 @@ to @code{IOStreams}.") (list (string-append "--with-boost=" (assoc-ref %build-inputs "boost"))) #:parallel-tests? #f ;There appear to be race conditions - #:phases (alist-cons-before - 'check 'patch-test-files - (lambda _ - ;; Unpatch shebangs in test input so that source-highlight - ;; is still able to infer input language - (substitute* '("tests/test.sh" - "tests/test2.sh" - "tests/test.tcl") - (((string-append "#! *" (which "sh"))) "#!/bin/sh")) - ;; Initial patching unrecoverably removes whitespace, so - ;; remove it also in the comparison output. - (substitute* '("tests/test.sh.html" - "tests/test2.sh.html" - "tests/test.tcl.html") - (("#! */bin/sh") "#!/bin/sh"))) - %standard-phases))) + #:phases + (modify-phases %standard-phases + (add-before 'check 'patch-test-files + (lambda _ + ;; Unpatch shebangs in test input so that source-highlight + ;; is still able to infer input language + (substitute* '("tests/test.sh" + "tests/test2.sh" + "tests/test.tcl") + (((string-append "#! *" (which "sh"))) "#!/bin/sh")) + ;; Initial patching unrecoverably removes whitespace, so + ;; remove it also in the comparison output. + (substitute* '("tests/test.sh.html" + "tests/test2.sh.html" + "tests/test.tcl.html") + (("#! */bin/sh") "#!/bin/sh")) + #t))))) (home-page "https://www.gnu.org/software/src-highlite/") (synopsis "Produce a document with syntax highlighting from a source file") (description @@ -292,22 +293,22 @@ highlighting. Language definitions and color themes are customizable.") #:make-flags (list (string-append "prefix=" %output) "INSTALL=install" "all") - #:phases (alist-replace - 'configure - (lambda _ (chdir "build/gcc")) - (alist-cons-after - 'install 'install-libs - (lambda* (#:key outputs #:allow-other-keys) - ;; Libraries are not installed by default - (let* ((output (assoc-ref outputs "out")) - (libdir (string-append output "/lib"))) - (begin - (mkdir-p libdir) - (for-each (lambda (l) - (copy-file - l (string-append libdir "/" (basename l)))) - (find-files "bin" "lib*"))))) - %standard-phases)))) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ (chdir "build/gcc") #t)) + (add-after 'install 'install-libs + (lambda* (#:key outputs #:allow-other-keys) + ;; Libraries are not installed by default + (let* ((output (assoc-ref outputs "out")) + (libdir (string-append output "/lib"))) + (begin + (mkdir-p libdir) + (for-each (lambda (l) + (copy-file + l (string-append libdir "/" (basename l)))) + (find-files "bin" "lib*")))) + #t))))) (home-page "http://astyle.sourceforge.net/") (synopsis "Source code indenter, formatter, and beautifier") (description diff --git a/gnu/packages/pumpio.scm b/gnu/packages/pumpio.scm index a74d47436..c692e6932 100644 --- a/gnu/packages/pumpio.scm +++ b/gnu/packages/pumpio.scm @@ -42,22 +42,22 @@ (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-replace - 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Fix dependency tests. - (substitute* "pumpa.pro" - (("/usr/include/tidy\\.h") - (string-append (assoc-ref inputs "tidy") - "/include/tidy.h")) - (("/usr/include/aspell.h") - (string-append (assoc-ref inputs "aspell") - "/include/aspell.h"))) - ;; Run qmake with proper installation prefix. - (let ((prefix (string-append "PREFIX=" - (assoc-ref outputs "out")))) - (zero? (system* "qmake" prefix)))) - %standard-phases))) + '(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Fix dependency tests. + (substitute* "pumpa.pro" + (("/usr/include/tidy\\.h") + (string-append (assoc-ref inputs "tidy") + "/include/tidy.h")) + (("/usr/include/aspell.h") + (string-append (assoc-ref inputs "aspell") + "/include/aspell.h"))) + ;; Run qmake with proper installation prefix. + (let ((prefix (string-append "PREFIX=" + (assoc-ref outputs "out")))) + (zero? (system* "qmake" prefix)))))))) (inputs `(("aspell" ,aspell) ("qtbase" ,qtbase) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2b3820221..3d6a78356 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -480,11 +480,10 @@ pidof, tty, taskset, pmap.") `(("python-py-bcrypt" ,python-py-bcrypt))) (arguments `(#:phases - (alist-cons-before - 'check 'set-PYTHON_EGG_CACHE - ;; some tests require access to "$HOME/.cython" - (lambda* _ (setenv "PYTHON_EGG_CACHE" "/tmp")) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'check 'set-PYTHON_EGG_CACHE + ;; some tests require access to "$HOME/.cython" + (lambda* _ (setenv "PYTHON_EGG_CACHE" "/tmp") #t))))) (home-page "https://bitbucket.org/ecollins/passlib") (synopsis "Comprehensive password hashing framework") @@ -1074,12 +1073,12 @@ multiple Unicode code points, e.g. \"G\" + acute-accent) ("gmp" ,gmp))) (arguments `(#:phases - (alist-cons-before - 'build 'set-build-env - ;; pycrypto runs an autoconf configure script behind the scenes - (lambda _ - (setenv "CONFIG_SHELL" (which "bash"))) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'build 'set-build-env + ;; pycrypto runs an autoconf configure script behind the scenes + (lambda _ + (setenv "CONFIG_SHELL" (which "bash")) + #t))))) (home-page "http://www.pycrypto.org/") (synopsis "Cryptographic modules for Python") (description @@ -1464,11 +1463,11 @@ other Python program.") (build-system python-build-system) (arguments `(#:python ,python-2 - #:phases (alist-replace - 'check - (lambda _ - (zero? (system* "./test.sh"))) - %standard-phases))) + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (zero? (system* "./test.sh"))))))) (home-page "http://www.alcyone.com/software/empy/") (synopsis "Templating system for Python") (description @@ -4532,10 +4531,10 @@ as the original project seems to have been abandoned circa 2007.") ("python-pytest" ,python-pytest) ("python-mock" ,python-mock))) ;for tests (arguments - `(#:phases (alist-replace - 'check - (lambda _ (zero? (system* "py.test"))) - %standard-phases))) + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ (zero? (system* "py.test"))))))) (home-page "http://www.sqlalchemy.org") (synopsis "Database abstraction library") (description @@ -8312,10 +8311,10 @@ automatically detect a wide range of file encodings.") (native-inputs `(("python-pytest" ,python-pytest))) (arguments - `(#:phases (alist-replace - 'check - (lambda _ (zero? (system* "py.test"))) - %standard-phases))) + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ (zero? (system* "py.test"))))))) (home-page "http://docopt.org") (synopsis "Command-line interface description language for Python") (description "This library allows the user to define a command-line diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 6b5cfb013..2ccfc2cec 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -127,26 +127,26 @@ Java Lucene text search engine API to C++.") "18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-after - 'remove-out-of-tree-references 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))) - (alist-cons-after - 'unpack 'remove-out-of-tree-references - (lambda _ - ;; remove symlinks to files in /usr/ - (delete-file-recursively "m4") - (for-each delete-file '("config.guess" - "config.sub" - "depcomp" - "install-sh" - "ltmain.sh" - "missing")) - ;; remove_test depends on an out-of-tree RDF file - (substitute* "examples/Makefile.am" - (("instances_test remove_test") "instances_test") - (("\\$\\(TESTS\\) remove_test") "$(TESTS)"))) - %standard-phases)))) + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-out-of-tree-references + (lambda _ + ;; remove symlinks to files in /usr/ + (delete-file-recursively "m4") + (for-each delete-file '("config.guess" + "config.sub" + "depcomp" + "install-sh" + "ltmain.sh" + "missing")) + ;; remove_test depends on an out-of-tree RDF file + (substitute* "examples/Makefile.am" + (("instances_test remove_test") "instances_test") + (("\\$\\(TESTS\\) remove_test") "$(TESTS)")) + #t)) + (add-after 'remove-out-of-tree-references 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) (inputs `(("raptor" ,raptor2) ("cyrus-sasl" ,cyrus-sasl) diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index 275912b9d..2b0e22ee2 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -85,16 +85,16 @@ Python. It is a C++ library.") "0n36cgqys59r2gmb7jzbqiwsy790v8nbxk82d2n2saz0rp145ild")))) (build-system gnu-build-system) (arguments - `(#:phases (alist-cons-before - 'check 'install-locales - (lambda _ - ;; The tests require the availability of the - ;; 'en_US.ISO-8859-1' locale. - (setenv "LOCPATH" (getcwd)) - (zero? (system* "localedef" "--no-archive" - "--prefix" (getcwd) "-i" "en_US" - "-f" "ISO-8859-1" "./en_US.ISO-8859-1"))) - %standard-phases))) + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'install-locales + (lambda _ + ;; The tests require the availability of the + ;; 'en_US.ISO-8859-1' locale. + (setenv "LOCPATH" (getcwd)) + (zero? (system* "localedef" "--no-archive" + "--prefix" (getcwd) "-i" "en_US" + "-f" "ISO-8859-1" "./en_US.ISO-8859-1"))))))) (synopsis "Approximate regex matching library and agrep utility") (description "Superset of the POSIX regex API, enabling approximate matching. Also ships a version of the agrep utility which behaves similar to diff --git a/gnu/packages/rrdtool.scm b/gnu/packages/rrdtool.scm index a07d70537..fbb6a3403 100644 --- a/gnu/packages/rrdtool.scm +++ b/gnu/packages/rrdtool.scm @@ -53,15 +53,16 @@ (native-inputs `(("pkg-config" ,pkg-config) ("groff" ,groff))) (arguments - '(#:phases (alist-cons-before - 'configure 'pre-configure - (lambda _ - (substitute* "libtool" - (("/bin/sed") (which "sed"))) - (substitute* "src/Makefile.in" - (("^rrdcached_LDADD = librrd_th.la") - "rrdcached_LDADD = librrd_th.la -lglib-2.0"))) - %standard-phases))) + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda _ + (substitute* "libtool" + (("/bin/sed") (which "sed"))) + (substitute* "src/Makefile.in" + (("^rrdcached_LDADD = librrd_th.la") + "rrdcached_LDADD = librrd_th.la -lglib-2.0")) + #t))))) (home-page "http://oss.oetiker.ch/rrdtool/") (synopsis "Time-series data storage and display system") (description diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 414b38c4f..7465a9a72 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -150,16 +150,16 @@ a focus on simplicity and productivity.") `(#:test-target "test" #:parallel-tests? #f #:phases - (alist-cons-before - 'configure 'replace-bin-sh - (lambda _ - (substitute* '("Makefile.in" - "ext/pty/pty.c" - "io.c" - "lib/mkmf.rb" - "process.c") - (("/bin/sh") (which "sh")))) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'configure 'replace-bin-sh + (lambda _ + (substitute* '("Makefile.in" + "ext/pty/pty.c" + "io.c" + "lib/mkmf.rb" + "process.c") + (("/bin/sh") (which "sh"))) + #t))))) (native-search-paths (list (search-path-specification (variable "GEM_PATH") @@ -184,16 +184,16 @@ a focus on simplicity and productivity.") `(#:test-target "test" #:parallel-tests? #f #:phases - (alist-cons-before - 'configure 'replace-bin-sh - (lambda _ - (substitute* '("Makefile.in" - "ext/pty/pty.c" - "io.c" - "lib/mkmf.rb" - "process.c") - (("/bin/sh") (which "sh")))) - %standard-phases))))) + (modify-phases %standard-phases + (add-before 'configure 'replace-bin-sh + (lambda _ + (substitute* '("Makefile.in" + "ext/pty/pty.c" + "io.c" + "lib/mkmf.rb" + "process.c") + (("/bin/sh") (which "sh"))) + #t))))))) (define-public ruby-hoe (package diff --git a/gnu/packages/sawfish.scm b/gnu/packages/sawfish.scm index 535dd8eb0..ebb8c5e1f 100644 --- a/gnu/packages/sawfish.scm +++ b/gnu/packages/sawfish.scm @@ -138,31 +138,31 @@ backend of Sawfish.") (arguments '(#:tests? #f ; no tests #:phases - (alist-cons-before - 'configure 'patch-exec-rep - (lambda _ - (substitute* '("lisp/sawfish/cfg/main.jl.in" - "scripts/sawfish-about.jl.in" - "scripts/sawfish-client.jl" - "scripts/sawfish-menu.jl") - (("exec rep") (string-append "exec " (which "rep"))))) - (alist-cons-after - 'install 'wrap-scripts - ;; Wrap scripts with REP_DL_LOAD_PATH for finding rep-gtk - ;; and sawfish.client. - (lambda* (#:key outputs #:allow-other-keys) - (define (wrap-script script) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out script) - `("REP_DL_LOAD_PATH" = - ,(list (getenv "REP_DL_LOAD_PATH") - (string-append out "/lib/rep")))))) - (for-each wrap-script - (list "/bin/sawfish-about" - "/bin/sawfish-client" - "/bin/sawfish-config" - "/lib/sawfish/sawfish-menu"))) - %standard-phases)))) + (modify-phases %standard-phases + (add-before 'configure 'patch-exec-rep + (lambda _ + (substitute* '("lisp/sawfish/cfg/main.jl.in" + "scripts/sawfish-about.jl.in" + "scripts/sawfish-client.jl" + "scripts/sawfish-menu.jl") + (("exec rep") (string-append "exec " (which "rep")))) + #t)) + (add-after 'install 'wrap-scripts + ;; Wrap scripts with REP_DL_LOAD_PATH for finding rep-gtk + ;; and sawfish.client. + (lambda* (#:key outputs #:allow-other-keys) + (define (wrap-script script) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out script) + `("REP_DL_LOAD_PATH" = + ,(list (getenv "REP_DL_LOAD_PATH") + (string-append out "/lib/rep")))))) + (for-each wrap-script + (list "/bin/sawfish-about" + "/bin/sawfish-client" + "/bin/sawfish-config" + "/lib/sawfish/sawfish-menu")) + #t))))) (native-inputs `(("gettext" ,gettext-minimal) ("makeinfo" ,texinfo) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 161138285..bafc3da33 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -417,73 +417,73 @@ implementation techniques and as an expository tool.") (build-system gnu-build-system) (arguments '(#:phases - (alist-cons-before - 'configure 'pre-configure - (lambda* (#:key inputs #:allow-other-keys) - ;; Patch dynamically loaded libraries with their absolute paths. - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path - library-path - (format #f "~a.so" soname)))) - (patch-ffi-libs (lambda (file libs) - (for-each - (lambda (lib) - (substitute* file - (((format #f "\"~a\"" lib)) - (format #f "\"~a\"" (find-so lib))))) - libs)))) - (substitute* "collects/db/private/sqlite3/ffi.rkt" - (("ffi-lib sqlite-so") - (format #f "ffi-lib \"~a\"" (find-so "libsqlite3")))) - (substitute* "collects/openssl/libssl.rkt" - (("ffi-lib libssl-so") - (format #f "ffi-lib \"~a\"" (find-so "libssl")))) - (substitute* "collects/openssl/libcrypto.rkt" - (("ffi-lib libcrypto-so") - (format #f "ffi-lib \"~a\"" (find-so "libcrypto")))) - (substitute* "share/pkgs/math-lib/math/private/bigfloat/gmp.rkt" - (("ffi-lib libgmp-so") - (format #f "ffi-lib \"~a\"" (find-so "libgmp")))) - (substitute* "share/pkgs/math-lib/math/private/bigfloat/mpfr.rkt" - (("ffi-lib libmpfr-so") - (format #f "ffi-lib \"~a\"" (find-so "libmpfr")))) - (for-each - (lambda (x) (apply patch-ffi-libs x)) - '(("share/pkgs/draw-lib/racket/draw/unsafe/cairo-lib.rkt" - ("libfontconfig" "libcairo")) - ("share/pkgs/draw-lib/racket/draw/unsafe/glib.rkt" - ("libglib-2.0" "libgmodule-2.0" "libgobject-2.0")) - ("share/pkgs/draw-lib/racket/draw/unsafe/jpeg.rkt" - ("libjpeg")) - ("share/pkgs/draw-lib/racket/draw/unsafe/pango.rkt" - ("libpango-1.0" "libpangocairo-1.0")) - ("share/pkgs/draw-lib/racket/draw/unsafe/png.rkt" - ("libpng")) - ("share/pkgs/db-lib/db/private/odbc/ffi.rkt" - ("libodbc")) - ("share/pkgs/gui-lib/mred/private/wx/gtk/x11.rkt" - ("libX11")) - ("share/pkgs/gui-lib/mred/private/wx/gtk/gsettings.rkt" - ("libgio-2.0")) - ("share/pkgs/gui-lib/mred/private/wx/gtk/gtk3.rkt" - ("libgdk-3" "libgtk-3")) - ("share/pkgs/gui-lib/mred/private/wx/gtk/unique.rkt" - ("libunique-1.0")) - ("share/pkgs/gui-lib/mred/private/wx/gtk/utils.rkt" - ("libgdk-x11-2.0" "libgdk_pixbuf-2.0" "libgtk-x11-2.0")) - ("share/pkgs/gui-lib/mred/private/wx/gtk/gl-context.rkt" - ("libGL")) - ("share/pkgs/sgl/gl.rkt" - ("libGL" "libGLU"))))) - (chdir "src")) - (alist-cons-after - 'unpack 'patch-/bin/sh - (lambda _ - (substitute* "collects/racket/system.rkt" - (("/bin/sh") (which "sh")))) - %standard-phases)) + (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda* (#:key inputs #:allow-other-keys) + ;; Patch dynamically loaded libraries with their absolute paths. + (let* ((library-path (search-path-as-string->list + (getenv "LIBRARY_PATH"))) + (find-so (lambda (soname) + (search-path + library-path + (format #f "~a.so" soname)))) + (patch-ffi-libs (lambda (file libs) + (for-each + (lambda (lib) + (substitute* file + (((format #f "\"~a\"" lib)) + (format #f "\"~a\"" (find-so lib))))) + libs)))) + (substitute* "collects/db/private/sqlite3/ffi.rkt" + (("ffi-lib sqlite-so") + (format #f "ffi-lib \"~a\"" (find-so "libsqlite3")))) + (substitute* "collects/openssl/libssl.rkt" + (("ffi-lib libssl-so") + (format #f "ffi-lib \"~a\"" (find-so "libssl")))) + (substitute* "collects/openssl/libcrypto.rkt" + (("ffi-lib libcrypto-so") + (format #f "ffi-lib \"~a\"" (find-so "libcrypto")))) + (substitute* "share/pkgs/math-lib/math/private/bigfloat/gmp.rkt" + (("ffi-lib libgmp-so") + (format #f "ffi-lib \"~a\"" (find-so "libgmp")))) + (substitute* "share/pkgs/math-lib/math/private/bigfloat/mpfr.rkt" + (("ffi-lib libmpfr-so") + (format #f "ffi-lib \"~a\"" (find-so "libmpfr")))) + (for-each + (lambda (x) (apply patch-ffi-libs x)) + '(("share/pkgs/draw-lib/racket/draw/unsafe/cairo-lib.rkt" + ("libfontconfig" "libcairo")) + ("share/pkgs/draw-lib/racket/draw/unsafe/glib.rkt" + ("libglib-2.0" "libgmodule-2.0" "libgobject-2.0")) + ("share/pkgs/draw-lib/racket/draw/unsafe/jpeg.rkt" + ("libjpeg")) + ("share/pkgs/draw-lib/racket/draw/unsafe/pango.rkt" + ("libpango-1.0" "libpangocairo-1.0")) + ("share/pkgs/draw-lib/racket/draw/unsafe/png.rkt" + ("libpng")) + ("share/pkgs/db-lib/db/private/odbc/ffi.rkt" + ("libodbc")) + ("share/pkgs/gui-lib/mred/private/wx/gtk/x11.rkt" + ("libX11")) + ("share/pkgs/gui-lib/mred/private/wx/gtk/gsettings.rkt" + ("libgio-2.0")) + ("share/pkgs/gui-lib/mred/private/wx/gtk/gtk3.rkt" + ("libgdk-3" "libgtk-3")) + ("share/pkgs/gui-lib/mred/private/wx/gtk/unique.rkt" + ("libunique-1.0")) + ("share/pkgs/gui-lib/mred/private/wx/gtk/utils.rkt" + ("libgdk-x11-2.0" "libgdk_pixbuf-2.0" "libgtk-x11-2.0")) + ("share/pkgs/gui-lib/mred/private/wx/gtk/gl-context.rkt" + ("libGL")) + ("share/pkgs/sgl/gl.rkt" + ("libGL" "libGLU"))))) + (chdir "src") + #t)) + (add-after 'unpack 'patch-/bin/sh + (lambda _ + (substitute* "collects/racket/system.rkt" + (("/bin/sh") (which "sh"))) + #t))) #:tests? #f ; XXX: how to run them? )) (inputs diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 9e2d81f18..c1a6144ac 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -400,30 +400,30 @@ directory.") (assoc-ref %build-inputs "sdl-union"))) #:parallel-build? #f ; parallel build fails #:phases - (alist-cons-before - 'configure 'fix-env-and-patch - (lambda* (#:key inputs #:allow-other-keys) - (setenv "GUILE_AUTO_COMPILE" "0") - ;; SDL_image needs to dlopen libjpeg in the test suite. - (setenv "LD_LIBRARY_PATH" - (string-append (assoc-ref inputs "libjpeg") "/lib")) - ;; Change the site directory /site/2.0 like Guile expects. - (substitute* "build-aux/guile-baux/re-prefixed-site-dirs" - (("\"/site\"") "\"/site/2.0\"")) + (modify-phases %standard-phases + (add-before 'configure 'fix-env-and-patch + (lambda* (#:key inputs #:allow-other-keys) + (setenv "GUILE_AUTO_COMPILE" "0") + ;; SDL_image needs to dlopen libjpeg in the test suite. + (setenv "LD_LIBRARY_PATH" + (string-append (assoc-ref inputs "libjpeg") "/lib")) + ;; Change the site directory /site/2.0 like Guile expects. + (substitute* "build-aux/guile-baux/re-prefixed-site-dirs" + (("\"/site\"") "\"/site/2.0\"")) - ;; Skip tests that rely on sound support, which is unavailable in - ;; the build environment. - (substitute* "test/Makefile.in" - (("HAVE_MIXER = .*$") - "HAVE_MIXER = 0\n"))) - (alist-cons-before - 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - (system (format #f "~a/bin/Xvfb :1 &" - (assoc-ref inputs "xorg-server"))) - (setenv "DISPLAY" ":1")) - %standard-phases)))) + ;; Skip tests that rely on sound support, which is unavailable in + ;; the build environment. + (substitute* "test/Makefile.in" + (("HAVE_MIXER = .*$") + "HAVE_MIXER = 0\n")) + #t)) + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + (system (format #f "~a/bin/Xvfb :1 &" + (assoc-ref inputs "xorg-server"))) + (setenv "DISPLAY" ":1") + #t))))) (synopsis "Guile interface for SDL (Simple DirectMedia Layer)") (description "Guile-SDL is a set of bindings to the Simple DirectMedia Layer (SDL). With them, Guile programmers can have easy access to graphics, diff --git a/gnu/packages/serveez.scm b/gnu/packages/serveez.scm index 974db8611..871fb00d3 100644 --- a/gnu/packages/serveez.scm +++ b/gnu/packages/serveez.scm @@ -40,13 +40,14 @@ (inputs `(("guile" ,guile-2.0))) (arguments `(#:configure-flags '("--enable-libserveez-install") - #:phases (alist-cons-before - 'patch-source-shebangs 'patch-test-source - (lambda _ - (substitute* - (find-files "test" "^t[0-9]{3}$") - (("/bin/sh") (which "sh")))) - %standard-phases))) + #:phases + (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'patch-test-source + (lambda _ + (substitute* + (find-files "test" "^t[0-9]{3}$") + (("/bin/sh") (which "sh"))) + #t))))) (home-page "https://www.gnu.org/software/serveez/") (synopsis "Framework for implementing IP-based servers") (description diff --git a/gnu/packages/skribilo.scm b/gnu/packages/skribilo.scm index 458d91e56..87dc3558d 100644 --- a/gnu/packages/skribilo.scm +++ b/gnu/packages/skribilo.scm @@ -46,20 +46,21 @@ (assoc-ref %outputs "out") "/share/guile/site/2.0")) - #:phases (alist-cons-before - 'configure 'pre-configure - (lambda* (#:key inputs #:allow-other-keys) - ;; Make sure the 'skribilo' command gets to see - ;; Guile-Reader, even if Guile-Reader is not in the search - ;; path. - (let ((reader (assoc-ref inputs "guile-reader"))) - (substitute* "src/skribilo.in" - (("^exec (.*) -c" _ things) - (string-append "exec " things - " -L " reader "/share/guile/site/2.0" - " -C " reader "/share/guile/site/2.0" - " -c"))))) - %standard-phases) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda* (#:key inputs #:allow-other-keys) + ;; Make sure the 'skribilo' command gets to see + ;; Guile-Reader, even if Guile-Reader is not in the search + ;; path. + (let ((reader (assoc-ref inputs "guile-reader"))) + (substitute* "src/skribilo.in" + (("^exec (.*) -c" _ things) + (string-append "exec " things + " -L " reader "/share/guile/site/2.0" + " -C " reader "/share/guile/site/2.0" + " -c")))) + #t))) #:parallel-build? #f)) diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index f4a50ded2..a0d6c86df 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -60,14 +60,15 @@ (inputs `(("zip" ,zip))) (arguments - `(#:phases (alist-cons-before - 'configure 'fix-libc - (lambda _ - (let ((libc (assoc-ref %build-inputs "libc"))) - (substitute* "libc.la.in" - (("@LIBC_SO_NAME@") "libc.so") - (("@LIBC_SO_DIR@") (string-append libc "/lib"))))) - %standard-phases))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-libc + (lambda _ + (let ((libc (assoc-ref %build-inputs "libc"))) + (substitute* "libc.la.in" + (("@LIBC_SO_NAME@") "libc.so") + (("@LIBC_SO_DIR@") (string-append libc "/lib")))) + #t))))) (home-page "http://smalltalk.gnu.org/") (synopsis "Smalltalk environment") (description diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 1d3d1d367..15f475510 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -154,7 +154,7 @@ optimising the environment for the application in use and the task performed.") (assoc-ref %build-inputs "freetype") "/include/freetype2")) #:phases - (alist-delete 'configure %standard-phases))) + (modify-phases %standard-phases (delete 'configure)))) (inputs `(("freetype" ,freetype) ("libxft" ,libxft) @@ -211,7 +211,7 @@ numbers of user-defined menu items efficiently.") '(#:tests? #f ; no tests #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) - #:phases (alist-delete 'configure %standard-phases))) + #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs `(("libx11" ,libx11) ("libxext" ,libxext) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index de888891c..3f7deb71d 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -114,13 +114,14 @@ (string-append "--exec-prefix=" out) (string-append "--mandir=" out "/share/man"))) - #:phases (alist-cons-before - 'configure 'set-path-to-stty - (lambda _ - (substitute* "configure" - (("STTY_BIN=/bin/stty") - (string-append "STTY_BIN=" (which "stty"))))) - %standard-phases) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'set-path-to-stty + (lambda _ + (substitute* "configure" + (("STTY_BIN=/bin/stty") + (string-append "STTY_BIN=" (which "stty")))) + #t))) #:test-target "test")) (home-page "http://expect.nist.gov/") diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index c3bf20360..5207bd241 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -56,12 +56,12 @@ "0kmgr5w3b1qwzxnsnw94q6rqs0hr8nbv9clf07ca2a2fyypx9kjk")))) (arguments `(#:phases - (alist-cons-before - 'configure 'pre-configure - (lambda _ - (substitute* "src/applog.cpp" - (("^// TODO sc.*") "#include \n#include \n"))) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda _ + (substitute* "src/applog.cpp" + (("^// TODO sc.*") "#include \n#include \n")) + #t))))) (build-system gnu-build-system) (synopsis "(u)Common C++ framework for threaded applications") (description "GNU Common C++ is an portable, optimized class framework for diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index e8ae30cd6..479527a5f 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -96,15 +96,15 @@ to DOS format and vice versa.") (native-inputs `(("python" ,python-2))) (arguments '(#:phases - (alist-cons-before - 'check 'pre-check - (lambda _ - (substitute* "tests/setup.py" - (("([[:space:]]*)include_dirs=.*" all space) - (string-append all space "library_dirs=['../src/.libs'],\n"))) - ;; The test extension 'Recode.so' lacks RUNPATH for 'librecode.so'. - (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/src/.libs"))) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + (substitute* "tests/setup.py" + (("([[:space:]]*)include_dirs=.*" all space) + (string-append all space "library_dirs=['../src/.libs'],\n"))) + ;; The test extension 'Recode.so' lacks RUNPATH for 'librecode.so'. + (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/src/.libs")) + #t))))) (home-page "https://github.com/pinard/Recode") (synopsis "Text encoding converter") (description "The Recode library converts files between character sets and @@ -207,10 +207,9 @@ encoding, supporting Unicode version 9.0.0.") (build-system gnu-build-system) (arguments '(#:phases - (alist-cons-after - 'unpack 'autoreconf - (lambda _ (zero? (system* "autoreconf" "-vif"))) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'unpack 'autoreconf + (lambda _ (zero? (system* "autoreconf" "-vif"))))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index ba54d1d00..b90606ca7 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -38,16 +38,15 @@ (build-system gnu-build-system) (arguments '(#:phases - (alist-replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - ;; This old `configure' script doesn't support - ;; variables passed as arguments. - (let ((out (assoc-ref outputs "out"))) - (setenv "CONFIG_SHELL" (which "bash")) - (zero? - (system* "./configure" - (string-append "--prefix=" out))))) - %standard-phases))) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; This old `configure' script doesn't support + ;; variables passed as arguments. + (let ((out (assoc-ref outputs "out"))) + (setenv "CONFIG_SHELL" (which "bash")) + (zero? + (system* "./configure" (string-append "--prefix=" out))))))))) (home-page "https://www.gnu.org/software/time/") (synopsis "Run a command, then display its resource usage") (description diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 1d5a1f161..93db56e26 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -134,13 +134,13 @@ rejects UDP traffic from the application you're using.") #:configure-flags (list (string-append "--sysconfdir=" (assoc-ref %outputs "out") "/etc/privoxy")) - #:phases (alist-cons-after - 'unpack 'autoconf - (lambda _ - ;; Unfortunately, this is not a tarball produced by - ;; "make dist". - (zero? (system* "autoreconf" "-vfi"))) - %standard-phases) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'autoconf + (lambda _ + ;; Unfortunately, this is not a tarball produced by + ;; "make dist". + (zero? (system* "autoreconf" "-vfi"))))) #:tests? #f)) (inputs `(("w3m" ,w3m) diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm index 7bfe76365..f5d9c7005 100644 --- a/gnu/packages/uucp.scm +++ b/gnu/packages/uucp.scm @@ -35,18 +35,18 @@ "0b5nhl9vvif1w3wdipjsk8ckw49jj1w85xw1mmqi3zbcpazia306")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - ;; The old 'configure' script doesn't support the arguments - ;; that we pass by default. - (setenv "CONFIG_SHELL" (which "sh")) - (let ((out (assoc-ref outputs "out"))) - (zero? (system* "./configure" - (string-append "--prefix=" out) - (string-append "--infodir=" out - "/share/info"))))) - %standard-phases))) + '(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; The old 'configure' script doesn't support the arguments + ;; that we pass by default. + (setenv "CONFIG_SHELL" (which "sh")) + (let ((out (assoc-ref outputs "out"))) + (zero? (system* "./configure" + (string-append "--prefix=" out) + (string-append "--infodir=" out + "/share/info"))))))))) (home-page "https://www.gnu.org/software/uucp/uucp.html") (synopsis "UUCP protocol implementation") (description diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0a551c74f..19a5e24ed 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1405,11 +1405,10 @@ encapsulated.") ("libtool" ,libtool))) (arguments '(#:phases - (alist-cons-after - 'unpack 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vif"))) - %standard-phases))))) + (modify-phases %standard-phases + (add-after 'unpack 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-vif"))))))))) (define-public libdvdcss (package diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index b5fb39b95..df3fbd728 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -165,11 +165,11 @@ features including, tables, builtin image display, bookmarks, SSL and more.") "--enable-nls" "--enable-ipv6")) #:tests? #f ; no check target - #:phases (alist-replace - 'install - (lambda* (#:key (make-flags '()) #:allow-other-keys) - (zero? (apply system* "make" "install-full" make-flags))) - %standard-phases))) + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (zero? (apply system* "make" "install-full" make-flags))))))) (synopsis "Text Web Browser") (description "Lynx is a fully-featured World Wide Web (WWW) client for users running diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 66183273e..6b4dbadb7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -632,14 +632,13 @@ used to validate and fix HTML data.") ;; For the log file, etc. "--localstatedir=/var") #:phases - (alist-cons-before - 'build 'pre-build - (lambda* (#:key inputs #:allow-other-keys #:rest args) - ;; Uncommenting the next two lines may assist in debugging - ;; (substitute* "docs/man5/Makefile" (("a2x") "a2x -v")) - ;; (setenv "XML_DEBUG_CATALOG" "1") - #t) - %standard-phases))) + (modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda* (#:key inputs #:allow-other-keys #:rest args) + ;; Uncommenting the next two lines may assist in debugging + ;; (substitute* "docs/man5/Makefile" (("a2x") "a2x -v")) + ;; (setenv "XML_DEBUG_CATALOG" "1") + #t))))) ;; All of the below are used to generate the documentation ;; (Should they be propagated inputs of asciidoc ??) (native-inputs `(("asciidoc" ,asciidoc))) diff --git a/gnu/packages/wicd.scm b/gnu/packages/wicd.scm index 9de956c6f..4b03c07bc 100644 --- a/gnu/packages/wicd.scm +++ b/gnu/packages/wicd.scm @@ -71,123 +71,121 @@ ;; we can't easily make setup.py use setuptools. #:use-setuptools? #f #:phases - (alist-cons-before - 'build 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (python (assoc-ref inputs "python"))) - (define (which* cmd) - (cond ((string=? cmd "ping") - "/run/setuid-programs/ping") - ((which cmd) - => identity) - (else - (format (current-error-port) - "WARNING: Unable to find absolute path for ~s~%" - cmd) - #f))) - (substitute* "setup.py" - ;; The handling of unrecognized distros in setup.py is - ;; broken. Work around the problem. - (("\\('init=', " all) - (string-append "#" all)) - ;; Inhibit attempts to install in /var or /etc. - (("\\(wpath\\.(log|etc|networks|.*scripts), " all) - (string-append "#" all))) + (modify-phases %standard-phases + (add-before 'build 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (python (assoc-ref inputs "python"))) + (define (which* cmd) + (cond ((string=? cmd "ping") + "/run/setuid-programs/ping") + ((which cmd) + => identity) + (else + (format (current-error-port) + "WARNING: Unable to find absolute path for ~s~%" + cmd) + #f))) + (substitute* "setup.py" + ;; The handling of unrecognized distros in setup.py is + ;; broken. Work around the problem. + (("\\('init=', " all) + (string-append "#" all)) + ;; Inhibit attempts to install in /var or /etc. + (("\\(wpath\\.(log|etc|networks|.*scripts), " all) + (string-append "#" all))) - ;; Patch references to subprograms with absolute pathnames. - (substitute* "wicd/wnettools.py" - (("(misc\\.Run\\(\\[?[\"'])([^\"' ]*)" all pre cmd) - (string-append pre (which* cmd))) - (("(self\\._find_program_path|misc\\.find_path)\\([\"']([^\"']*)[\"']\\)" - all dummy cmd) - (let ((pathname (which* cmd))) - (if pathname - (string-append "'" pathname "'") - "None"))) - (("([\"'])(ifconfig|route|wpa_cli|wpa_supplicant|iwconfig|iwpriv|iwlist|ping)" - all open-quote cmd) - (string-append open-quote (which* cmd)))) + ;; Patch references to subprograms with absolute pathnames. + (substitute* "wicd/wnettools.py" + (("(misc\\.Run\\(\\[?[\"'])([^\"' ]*)" all pre cmd) + (string-append pre (which* cmd))) + (("(self\\._find_program_path|misc\\.find_path)\\([\"']([^\"']*)[\"']\\)" + all dummy cmd) + (let ((pathname (which* cmd))) + (if pathname + (string-append "'" pathname "'") + "None"))) + (("([\"'])(ifconfig|route|wpa_cli|wpa_supplicant|iwconfig|iwpriv|iwlist|ping)" + all open-quote cmd) + (string-append open-quote (which* cmd)))) - ;; setup.py cannot cope without LANG - (setenv "LANG" "C") + ;; setup.py cannot cope without LANG + (setenv "LANG" "C") - (let ((params - (list - (string-append "--python=" python "/bin/python") - "--no-install-init" - "--no-install-docs" - "--no-install-acpi" - "--no-install-pmutils" - "--no-install-kde" - "--no-install-gnome-shell-extensions" + (let ((params + (list + (string-append "--python=" python "/bin/python") + "--no-install-init" + "--no-install-docs" + "--no-install-acpi" + "--no-install-pmutils" + "--no-install-kde" + "--no-install-gnome-shell-extensions" - "--distro=guixsd" - "--wicdgroup=netdev" - "--loggroup=root" - "--logperms=0640" + "--distro=guixsd" + "--wicdgroup=netdev" + "--loggroup=root" + "--logperms=0640" - ;; XXX setup.py configure asks us to pass --init=, - ;; but if we do it says "no such option 'init'". - ;; (string-append "--init=" out "/etc/init.d") + ;; XXX setup.py configure asks us to pass --init=, + ;; but if we do it says "no such option 'init'". + ;; (string-append "--init=" out "/etc/init.d") - (string-append "--initfile=" out "/etc/init.d/wicd") - (string-append "--lib=" out "/lib/wicd") - (string-append "--share=" out "/share/wicd") + (string-append "--initfile=" out "/etc/init.d/wicd") + (string-append "--lib=" out "/lib/wicd") + (string-append "--share=" out "/share/wicd") - "--etc=/etc/wicd" - "--scripts=/etc/wicd/scripts" - "--pmutils=/etc/pm-utils/sleep.d" + "--etc=/etc/wicd" + "--scripts=/etc/wicd/scripts" + "--pmutils=/etc/pm-utils/sleep.d" - (string-append "--encryption=" - out "/etc/encryption/templates") - (string-append "--bin=" out "/bin") - (string-append "--sbin=" out "/sbin") - (string-append "--daemon=" out "/share/wicd/daemon") - (string-append "--backends=" out "/share/wicd/backends") - (string-append "--curses=" out "/share/wicd/curses") - (string-append "--gtk=" out "/share/wicd/gtk") - (string-append "--cli=" out "/share/wicd/cli") - (string-append "--gnome-shell-extensions=" - out "/share/gnome-shell-extensions") - (string-append "--icons=" out "/share/icons/hicolor") - (string-append "--pixmaps=" out "/share/pixmaps") - (string-append "--images=" out "/share/icons") - (string-append "--dbus=" out "/etc/dbus-1/system.d") - (string-append "--dbus-service=" - out "/share/dbus-1/system-services") - (string-append "--systemd=" out "/lib/systemd/system") - (string-append "--logrotate=" out "/etc/logrotate.d") - (string-append "--desktop=" out "/share/applications") - (string-append "--translations=" out "/share/locale") - (string-append "--autostart=" out "/etc/xdg/autostart") - (string-append "--docdir=" out "/share/doc/wicd") - (string-append "--mandir=" out "/share/man") - (string-append "--kdedir=" out "/share/autostart")))) - (format #t - "running ~s with command ~s and parameters ~s~%" - "python setup.py" "configure" params) - (zero? (apply system* "python" "setup.py" "configure" params))))) - (alist-cons-after - 'install 'post-install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; wicd's installer tries to put dhclient.conf.template.default - ;; in /etc/wicd/other, which is not available in the build - ;; environment, so here we install it manually in the output - ;; directory. - (let ((dest-dir (string-append out "/etc/wicd")) - (name "dhclient.conf.template.default")) - (install-file (string-append "other/" name) dest-dir)) + (string-append "--encryption=" + out "/etc/encryption/templates") + (string-append "--bin=" out "/bin") + (string-append "--sbin=" out "/sbin") + (string-append "--daemon=" out "/share/wicd/daemon") + (string-append "--backends=" out "/share/wicd/backends") + (string-append "--curses=" out "/share/wicd/curses") + (string-append "--gtk=" out "/share/wicd/gtk") + (string-append "--cli=" out "/share/wicd/cli") + (string-append "--gnome-shell-extensions=" + out "/share/gnome-shell-extensions") + (string-append "--icons=" out "/share/icons/hicolor") + (string-append "--pixmaps=" out "/share/pixmaps") + (string-append "--images=" out "/share/icons") + (string-append "--dbus=" out "/etc/dbus-1/system.d") + (string-append "--dbus-service=" + out "/share/dbus-1/system-services") + (string-append "--systemd=" out "/lib/systemd/system") + (string-append "--logrotate=" out "/etc/logrotate.d") + (string-append "--desktop=" out "/share/applications") + (string-append "--translations=" out "/share/locale") + (string-append "--autostart=" out "/etc/xdg/autostart") + (string-append "--docdir=" out "/share/doc/wicd") + (string-append "--mandir=" out "/share/man") + (string-append "--kdedir=" out "/share/autostart")))) + (format #t + "running ~s with command ~s and parameters ~s~%" + "python setup.py" "configure" params) + (zero? (apply system* "python" "setup.py" "configure" params)))))) + (add-after 'install 'post-install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; wicd's installer tries to put dhclient.conf.template.default + ;; in /etc/wicd/other, which is not available in the build + ;; environment, so here we install it manually in the output + ;; directory. + (let ((dest-dir (string-append out "/etc/wicd")) + (name "dhclient.conf.template.default")) + (install-file (string-append "other/" name) dest-dir)) - ;; Copy index.theme from hicolor-icon-theme. This is needed to - ;; allow wicd-gtk to find its icons. - (let ((hicolor (assoc-ref inputs "hicolor-icon-theme")) - (name "/share/icons/hicolor/index.theme")) - (install-file (string-append hicolor name) - (string-append out "/share/icons/hicolor"))) - #t)) - %standard-phases)))) + ;; Copy index.theme from hicolor-icon-theme. This is needed to + ;; allow wicd-gtk to find its icons. + (let ((hicolor (assoc-ref inputs "hicolor-icon-theme")) + (name "/share/icons/hicolor/index.theme")) + (install-file (string-append hicolor name) + (string-append out "/share/icons/hicolor"))) + #t)))))) (synopsis "Network connection manager") (description "Wicd is a network manager that aims to simplify wired and wireless networking.") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 6e458bfde..0e9ec19b5 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -115,7 +115,7 @@ nested include statements).") ("xcb-util-keysyms" ,xcb-util-keysyms) ("xcb-util-wm" ,xcb-util-wm))) (arguments - '(#:phases (alist-delete 'configure %standard-phases) + '(#:phases (modify-phases %standard-phases (delete 'configure)) #:tests? #f ; no check target #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)))) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 84794a05c..e6f6fb483 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -668,7 +668,7 @@ Guile will work for XBindKeys.") ("xcb-util-keysyms" ,xcb-util-keysyms) ("xcb-util-wm" ,xcb-util-wm))) (arguments - '(#:phases (alist-delete 'configure %standard-phases) + '(#:phases (modify-phases %standard-phases (delete 'configure)) #:tests? #f ; no check target #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)))) @@ -775,7 +775,8 @@ within a single process.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target - #:phases (alist-delete 'configure %standard-phases) ; no configure script + ;; no configure script + #:phases (modify-phases %standard-phases (delete 'configure)) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) "MANDIR=/share/man/man1" "CC=gcc"))) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 35c425a89..664e8e592 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -114,17 +114,18 @@ Xfce Desktop Environment.") (arguments '(#:phases ;; Run check after install phase to test dbus activation. - (alist-cons-after - 'install 'check - (lambda _ - (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME - ;; Run test-suite under a dbus session. - (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service - (string-append %output "/share")) - ;; For the missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0"); - (zero? (system* "dbus-launch" "make" "check"))) - (alist-delete 'check %standard-phases)))) + (modify-phases %standard-phases + (delete 'check) + (add-after 'install 'check + (lambda _ + ;; xfconfd requires a writable HOME + (setenv "HOME" (getenv "TMPDIR")) + ;; Run test-suite under a dbus session. + (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service + (string-append %output "/share")) + ;; For the missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0"); + (zero? (system* "dbus-launch" "make" "check"))))))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index 2e65000eb..c2e0408bd 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -159,44 +159,43 @@ selected in various ways. For text, 35 fonts are available.") (arguments `(#:tests? #f #:phases - (alist-replace - 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((imake (assoc-ref inputs "imake")) - (out (assoc-ref outputs "out"))) - (substitute* '("fig2dev/Imakefile" - "transfig/Imakefile") - (("XCOMM (BINDIR = )[[:graph:]]*" _ front) - (string-append front out "/bin")) - (("XCOMM USEINLINE") "USEINLINE") - ;; The variable name is deceptive. The directory is used as an - ;; installation path for bitmaps. - (("(XFIGLIBDIR =[[:blank:]]*)[[:graph:]]*" _ front) - (string-append front out "/lib")) - (("(XPMLIBDIR = )[[:graph:]]*" _ front) - (string-append front (assoc-ref inputs "libxpm") "/lib")) - (("(XPMINC = -I)[[:graph:]]*" _ front) - (string-append front (assoc-ref inputs "libxpm") "/include/X11")) - (("/usr/local/lib/fig2dev") (string-append out "/lib"))) - ;; The -a argument is required in order to pick up the correct paths - ;; to several X header files. - (zero? (system* "xmkmf" "-a")) - (substitute* '("Makefile" - "fig2dev/Makefile" - "transfig/Makefile") - ;; These imake variables somehow remain undefined - (("DefaultGcc2[[:graph:]]*Opt") "-O2") - ;; Reset a few variable defaults that are set in imake templates - ((imake) out) - (("(MANPATH = )[[:graph:]]*" _ front) - (string-append front out "/share/man")) - (("(CONFDIR = )([[:graph:]]*)" _ front default) - (string-append front out default))))) - (alist-cons-after - 'install 'install/doc - (lambda _ - (zero? (system* "make" "install.man"))) - %standard-phases)))) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((imake (assoc-ref inputs "imake")) + (out (assoc-ref outputs "out"))) + (substitute* '("fig2dev/Imakefile" + "transfig/Imakefile") + (("XCOMM (BINDIR = )[[:graph:]]*" _ front) + (string-append front out "/bin")) + (("XCOMM USEINLINE") "USEINLINE") + ;; The variable name is deceptive. The directory is used as an + ;; installation path for bitmaps. + (("(XFIGLIBDIR =[[:blank:]]*)[[:graph:]]*" _ front) + (string-append front out "/lib")) + (("(XPMLIBDIR = )[[:graph:]]*" _ front) + (string-append front (assoc-ref inputs "libxpm") "/lib")) + (("(XPMINC = -I)[[:graph:]]*" _ front) + (string-append front (assoc-ref inputs "libxpm") "/include/X11")) + (("/usr/local/lib/fig2dev") (string-append out "/lib"))) + ;; The -a argument is required in order to pick up the correct + ;; paths to several X header files. + (system* "xmkmf" "-a") + (substitute* '("Makefile" + "fig2dev/Makefile" + "transfig/Makefile") + ;; These imake variables somehow remain undefined + (("DefaultGcc2[[:graph:]]*Opt") "-O2") + ;; Reset a few variable defaults that are set in imake templates + ((imake) out) + (("(MANPATH = )[[:graph:]]*" _ front) + (string-append front out "/share/man")) + (("(CONFDIR = )([[:graph:]]*)" _ front default) + (string-append front out default))) + #t))) + (add-after 'install 'install/doc + (lambda _ + (zero? (system* "make" "install.man"))))))) (home-page "http://www.xfig.org/") (synopsis "Create portable LaTeX figures") (description diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b50807702..04e210642 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -112,26 +112,25 @@ ("xproto" ,xproto))) (arguments `(#:phases - (alist-cons-after - 'install 'install-data - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((cf-files (assoc-ref inputs "xorg-cf-files")) - (out (assoc-ref outputs "out")) - (unpack (assoc-ref %standard-phases 'unpack)) - (patch-source-shebangs - (assoc-ref %standard-phases 'patch-source-shebangs))) - (mkdir "xorg-cf-files") - (with-directory-excursion "xorg-cf-files" - (apply unpack (list #:source cf-files)) - (apply patch-source-shebangs (list #:source cf-files)) - (substitute* '("mingw.cf" "Imake.tmpl" "nto.cf" "os2.cf" - "linux.cf" "Amoeba.cf" "cygwin.cf") - (("/bin/sh") (which "bash"))) - (and (zero? (system* "./configure" - (string-append "SHELL=" (which "bash")) - (string-append "--prefix=" out))) - (zero? (system* "make" "install")))))) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'install 'install-data + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((cf-files (assoc-ref inputs "xorg-cf-files")) + (out (assoc-ref outputs "out")) + (unpack (assoc-ref %standard-phases 'unpack)) + (patch-source-shebangs + (assoc-ref %standard-phases 'patch-source-shebangs))) + (mkdir "xorg-cf-files") + (with-directory-excursion "xorg-cf-files" + (apply unpack (list #:source cf-files)) + (apply patch-source-shebangs (list #:source cf-files)) + (substitute* '("mingw.cf" "Imake.tmpl" "nto.cf" "os2.cf" + "linux.cf" "Amoeba.cf" "cygwin.cf") + (("/bin/sh") (which "bash"))) + (and (zero? (system* "./configure" + (string-append "SHELL=" (which "bash")) + (string-append "--prefix=" out))) + (zero? (system* "make" "install")))))))))) (home-page "http://www.x.org") (synopsis "Source code configuration and build system") (description -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 01 03:22:32 2017 Received: (at 27898) by debbugs.gnu.org; 1 Aug 2017 07:22:32 +0000 Received: from localhost ([127.0.0.1]:36040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcRVX-0003YY-7P for submit@debbugs.gnu.org; Tue, 01 Aug 2017 03:22:32 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:57546 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcRVQ-0003YE-4Y for 27898@debbugs.gnu.org; Tue, 01 Aug 2017 03:22:20 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 7058A4E3039; Tue, 1 Aug 2017 09:22:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1501572135; bh=kCP7awpKnMvjkNQY/fAQ2uSk5qS0kosDgT+AalOUHqU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F1D0rKQNno8y9+D4TJmFVKsm6ENFq1rVyeim9ONCOuLWxTrriZ2UpS4nOPo6tYChK W8hg6i4MwlZ7GVQM6a5Ga6QUrnDXxA7h37HyyFo3v0PeeBCLrCNVl5lq/j4sea6Pwr SY42yk/E6XwfmjurX0UEXbazXlMrDjXRgESdyzpc= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1501572132; bh=kCP7awpKnMvjkNQY/fAQ2uSk5qS0kosDgT+AalOUHqU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c00zP/5t0oia/3meN6YDPL+mh7FYNciYHjJP0yYV3ipL2nmcRukARNYf855rBgqcf dY3c7Dt1vsjrgNR5yyCUfBLbfHKIgOM9dQELsGPLTozQ3eEelb3RnnWM9LP8jA9TAq +unMZrIXu9J3o4ZG3+kWCF1imx9UOCjD15dqI5KU= To: 27898@debbugs.gnu.org Subject: [PATCH 2/2] gnu: Put autoconf-related phases immediately after the 'unpack phase. Date: Tue, 1 Aug 2017 03:21:53 -0400 Message-Id: <20170801072153.19077-2-kei@openmailbox.org> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170801072153.19077-1-kei@openmailbox.org> References: <20170801072153.19077-1-kei@openmailbox.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 27898 Cc: Kei Kebreau X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) * gnu/packages/audio.scm (audacity, rtmidi)[arguments]: Correct phases accordingly. * gnu/packages/bioinformatics.scm (mash, seek, vsearch, emboss, htslib-for-sambamba)[arguments]: Likewise. * gnu/packages/ci.scm (cuirass)[arguments]: Likewise. * gnu/packages/compression.scm (minizip, xdelta)[arguments]: Likewise. * gnu/packages/cpp.scm (libzen)[arguments]: Likewise. * gnu/packages/crypto.scm (opendht)[arguments]: Likewise. * gnu/packages/databases.scm (4store, mdbtools)[arguments]: Likewise. * gnu/packages/debug.scm (stress-make)[arguments]: Likewise. * gnu/packages/dns.scm (dnscrypt-proxy, dnscrypt-wrapper)[arguments]: Likewise. * gnu/packages/emacs.scm (emacs-pdf-tools)[arguments]: Likewise. * gnu/packages/embedded.scm (libjaylink, openocd)[arguments]: Likewise. * gnu/packages/engineering.scm (gerbv)[arguments]: Likewise. * gnu/packages/erlang.scm (erlang)[arguments]: Likewise. * gnu/packages/ftp.scm (weex)[arguments]: Likewise. * gnu/packages/gnome.scm (dia)[arguments]: Likewise. * gnu/packages/gnunet.scm (gnurl, guile-gnunet)[arguments]: Likewise. * gnu/packages/gtk.scm (guile-rsvg, graphene)[arguments]: Likewise. * gnu/packages/guile.scm (guildhall, guile-ics, guile-sqlite3)[arguments]: Likewise. * gnu/packages/ibus.scm (ibus-libpinyin)[arguments]: Likewise. * gnu/packages/irc.scm (weechat)[arguments]: Likewise. * gnu/packages/java.scm (classpath-devel)[arguments]: Likewise. * gnu/packages/libreoffice.scm (libetonyek)[arguments]: Likewise. * gnu/packages/libusb.scm (hidapi)[arguments]: Likewise. * gnu/packages/linux.scm (gpm)[arguments]: Likewise. * gnu/packages/logging.scm (glog)[arguments]: Likewise. * gnu/packages/machine-learning.scm (ghmm)[arguments]: Likewise. * gnu/packages/mail.scm (dovecot-trees, dovecot-libsodium-plugin, esmtp) [arguments]: Likewise. * gnu/packages/maths.scm (wxmaxima)[arguments]: Likewise. * gnu/packages/messaging.scm (freetalk, libmesode, libstrophe)[arguments]: Likewise. * gnu/packages/microcom.scm (microcom)[arguments]: Likewise. * gnu/packages/ocaml.scm (ocaml-ssl)[arguments]: Likewise. * gnu/packages/parallel.scm (slurm)[arguments]: Likewise. * gnu/packages/pdf.scm (libharu)[arguments]: Likewise. * gnu/packages/samba.scm (cifs-utils)[arguments]: Likewise. * gnu/packages/serialization.scm (msgpack)[arguments]: Likewise. * gnu/packages/shells.scm (scsh)[arguments]: Likewise. * gnu/packages/telephony.scm (libiax2)[arguments]: Likewise. * gnu/packages/textutils.scm (dotconf)[arguments]: Likewise. * gnu/packages/version-control.scm (findnewest)[arguments]: Likewise. * gnu/packages/video.scm (vlc, libmediainfo, mediainfo)[arguments]: Likewise. --- gnu/packages/audio.scm | 6 ++--- gnu/packages/bioinformatics.scm | 20 +++++++++------- gnu/packages/ci.scm | 7 ++++-- gnu/packages/compression.scm | 4 ++-- gnu/packages/cpp.scm | 8 +++---- gnu/packages/crypto.scm | 2 +- gnu/packages/databases.scm | 6 ++--- gnu/packages/debug.scm | 2 +- gnu/packages/dns.scm | 4 ++-- gnu/packages/emacs.scm | 2 +- gnu/packages/embedded.scm | 4 ++-- gnu/packages/engineering.scm | 2 +- gnu/packages/erlang.scm | 8 +++++-- gnu/packages/ftp.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/gnunet.scm | 6 ++--- gnu/packages/gtk.scm | 6 ++--- gnu/packages/guile.scm | 16 ++++++------- gnu/packages/ibus.scm | 4 ++-- gnu/packages/irc.scm | 6 +++-- gnu/packages/java.scm | 2 +- gnu/packages/libreoffice.scm | 4 ++-- gnu/packages/libusb.scm | 2 +- gnu/packages/linux.scm | 4 ++-- gnu/packages/logging.scm | 2 +- gnu/packages/machine-learning.scm | 8 +++---- gnu/packages/mail.scm | 12 +++++----- gnu/packages/maths.scm | 49 +++++++++++++++++++-------------------- gnu/packages/messaging.scm | 10 ++++---- gnu/packages/microcom.scm | 2 +- gnu/packages/ocaml.scm | 4 ++-- gnu/packages/parallel.scm | 4 ++-- gnu/packages/pdf.scm | 2 +- gnu/packages/samba.scm | 2 +- gnu/packages/serialization.scm | 2 +- gnu/packages/shells.scm | 2 +- gnu/packages/telephony.scm | 2 +- gnu/packages/textutils.scm | 2 +- gnu/packages/version-control.scm | 2 +- gnu/packages/video.scm | 18 ++++++-------- 40 files changed, 128 insertions(+), 124 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e756fbf7c..08095e16d 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -328,7 +328,7 @@ engineers, musicians, soundtrack editors and composers.") #:phases (modify-phases %standard-phases ;; FFmpeg is only detected if autoreconf runs. - (add-before 'configure 'autoreconf + (add-after 'unpack 'autoreconf (lambda _ (zero? (system* "autoreconf" "-vfi"))))) ;; The test suite is not "well exercised" according to the developers, @@ -1975,8 +1975,8 @@ tempo and pitch of an audio recording independently of one another.") (arguments `(#:tests? #f ;no "check" target #:phases (modify-phases %standard-phases - (add-before - 'configure 'autoconf + (add-after + 'unpack 'autoconf (lambda _ (zero? (system* "autoreconf" "-vfi")))) (add-before 'build 'fix-makefile diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 02250dfaf..d205e296f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3444,7 +3444,7 @@ sequences).") (("^#include \"kseq\\.h\"") "#include \"htslib/kseq.h\"")) #t)) - (add-before 'configure 'autoconf + (add-after 'unpack 'autoconf (lambda _ (zero? (system* "autoconf"))))))) (native-inputs `(("autoconf" ,autoconf) @@ -4479,9 +4479,11 @@ distribution, coverage uniformity, strand specificity, etc.") "Data2DB" "PCL2Bin"))) (modify-phases %standard-phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ - (zero? (system* "bash" "gen_auto")))) + (substitute* "gen_tools_am" + (("/usr/bin/env perl") (which "perl"))) + (zero? (system* "sh" "gen_auto")))) (add-after 'build 'build-additional-tools (lambda* (#:key make-flags #:allow-other-keys) (every (lambda (dir) @@ -6095,8 +6097,8 @@ track. The database is exposed as a @code{TxDb} object.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'autogen - (lambda _ (zero? (system* "autoreconf" "-vif"))))))) + (add-after 'unpack 'autogen + (lambda _ (zero? (system* "autoreconf" "-vif"))))))) (inputs `(("zlib" ,zlib) ("bzip2" ,bzip2) @@ -8274,6 +8276,8 @@ the available RAM.") (assoc-ref %build-inputs "libharu"))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ (zero? (system* "autoreconf" "-vif")))) (add-after 'unpack 'fix-checks (lambda _ ;; The PNGDRIVER tests check for the presence of libgd, libpng @@ -8291,9 +8295,7 @@ AM_CONDITIONAL(AMPNG, true)")) ;; looking for updates will not work. (substitute* "Makefile.am" (("\\$\\(bindir\\)/embossupdate") "")) - #t)) - (add-before 'configure 'autogen - (lambda _ (zero? (system* "autoreconf" "-vif"))))))) + #t))))) (inputs `(("perl" ,perl) ("libpng" ,libpng) @@ -9191,7 +9193,7 @@ global-scaling and full-quantile normalization.") (substitute-keyword-arguments (package-arguments htslib) ((#:phases phases) `(modify-phases ,phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ (zero? (system* "autoreconf" "-vif")))))))) (native-inputs diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index e2cb712bf..32e7e6e16 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -215,8 +215,11 @@ their dependencies.") (substitute* "Makefile.am" (("tests/repo.scm \\\\") "\\")) #t)) - (add-before 'configure 'bootstrap - (lambda _ (zero? (system* "sh" "bootstrap")))) + (add-after 'disable-repo-tests 'bootstrap + (lambda _ + (substitute* "build-aux/git-version-gen" + (("/bin/sh") (which "sh"))) + (zero? (system* "sh" "bootstrap")))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) ;; Wrap the 'cuirass' command to refer to the right modules. diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 2a9ccd167..a28a31572 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -114,7 +114,7 @@ in compression.") (modify-phases %standard-phases (add-after 'unpack 'enter-source (lambda _ (chdir "contrib/minizip") #t)) - (add-before 'configure 'autoreconf + (add-after 'enter-source 'autoreconf (lambda _ (zero? (system* "autoreconf" "-vif"))))))) (native-inputs @@ -960,7 +960,7 @@ respectively, based on the reference implementation from Google.") (modify-phases %standard-phases (add-after 'unpack 'enter-build-directory (lambda _ (chdir "xdelta3"))) - (add-before 'configure 'autoconf + (add-after 'enter-build-directory 'autoconf (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (home-page "http://xdelta.com") (synopsis "Delta encoder for binary files") diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index da192553a..a1289ec21 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -45,12 +45,10 @@ '(#:phases ;; build scripts not in root of archive (modify-phases %standard-phases - (add-before 'configure 'pre-configure + (add-after 'unpack 'autogen (lambda _ - (chdir "Project/GNU/Library"))) - (add-before 'configure 'autogen - (lambda _ - (zero? (system* "./autogen.sh"))))))) + (chdir "Project/GNU/Library") + (zero? (system* "sh" "autogen.sh"))))))) (home-page "https://github.com/MediaArea/ZenLib") (synopsis "C++ utility library") (description "ZenLib is a C++ utility library. It includes classes for handling diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index d02bc20f2..fa8ecf831 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -160,7 +160,7 @@ OpenBSD tool of the same name.") (arguments `(#:configure-flags '("--disable-tools" "--disable-python") #:phases (modify-phases %standard-phases - (add-before 'configure 'autoconf + (add-after 'unpack 'autoconf (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (home-page "https://github.com/savoirfairelinux/opendht/") diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 655c6db18..4d231a045 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -114,9 +114,9 @@ (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'generate-configure + (add-after 'unpack 'autogen (lambda _ - (zero? (system* "./autogen.sh"))))))) + (zero? (system* "sh" "autogen.sh"))))))) ;; http://www.4store.org has been down for a while now. (home-page "https://github.com/garlik/4store") (synopsis "Clustered RDF storage and query engine") @@ -1559,7 +1559,7 @@ for ODBC.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'autoreconf + (add-after 'unpack 'autoreconf (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (home-page "http://mdbtools.sourceforge.net/") diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 1dab0085c..017e81656 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -300,7 +300,7 @@ down the road.") (zero? (system* "tar" "cJf" "./make.tar.xz" (string-append "make-" ,(package-version gnu-make)))))) - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (home-page "https://github.com/losalamos/stress-make") diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 64fdc9c3e..ce2f4d81b 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -181,7 +181,7 @@ high-volume and high-reliability applications. The name BIND stands for (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'autoreconf + (add-after 'unpack 'autoreconf (lambda _ ;; Re-generate build files due to unbundling ltdl. ;; TODO: Prevent generating new libltdl and building it. @@ -229,7 +229,7 @@ servers is included, and an up-to-date version is available at #:tests? #f #:phases (modify-phases %standard-phases - (add-before 'configure 'create-configure + (add-after 'unpack 'create-configure (lambda _ (zero? (system* "make" "configure"))))))) (native-inputs diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b77abc778..11eebc063 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1274,7 +1274,7 @@ single buffer.") ;; Build server side using 'gnu-build-system'. (add-after 'unpack 'enter-server-dir (lambda _ (chdir "server") #t)) - (add-before 'configure 'autogen + (add-after 'enter-server-dir 'autogen (lambda _ (zero? (system* "bash" "autogen.sh")))) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index e509647ea..d3bd99274 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -316,7 +316,7 @@ languages are C and C++.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'autoreconf + (add-after 'unpack 'autoreconf (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (home-page "http://repo.or.cz/w/libjaylink.git") @@ -400,7 +400,7 @@ language.") "presto" "openjtag"))) #:phases (modify-phases %standard-phases - (add-before 'configure 'autoreconf + (add-after 'unpack 'autoreconf (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (home-page "http://openocd.org") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 28d9a718e..1d133b966 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -483,7 +483,7 @@ ready for production.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'autoconf + (add-after 'unpack 'autoconf (lambda _ ;; Build rules contain references to Russian translation, but the ;; needed files are missing; see diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index a400e712d..519100849 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -124,6 +124,12 @@ (("\\{H,Mi,S\\} = time\\(\\),") (date->string source-date-epoch "{H,Mi,S} = {~H,~M,~S},")))))) + (add-after 'unpack 'autoconf + (lambda _ + (substitute* '("erts/autoconf/config.guess" + "erts/autoconf/install-sh") + (("/bin/sh") (which "sh"))) + (zero? (system* "sh" "otp_build" "autoconf")))) (add-after 'patch-source-shebangs 'patch-source-env (lambda _ (let ((escripts @@ -143,8 +149,6 @@ (add-before 'configure 'set-erl-top (lambda _ (setenv "ERL_TOP" (getcwd)))) - (add-before 'configure 'autoconf - (lambda _ (zero? (system* "./otp_build" "autoconf")))) (add-after 'install 'patch-erl ;; This only works after install. (lambda _ diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 49e721499..5563b6473 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -159,7 +159,7 @@ FTP browser, as well as non-interactive commands such as 'ncftpput' and (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (home-page "http://weex.sourceforge.net/") (synopsis "Non-interactive client for FTP synchronization") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f40381498..7f5fadb79 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -310,7 +310,7 @@ either on a local, or remote machine via a number of methods.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'run-autogen + (add-after 'unpack 'run-autogen (lambda _ (system* "sh" "autogen.sh")))))) (home-page "https://wiki.gnome.org/Apps/Dia") diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 9ca2d9502..6902461e4 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -234,10 +234,10 @@ and support for SSL3 and TLS.") (rename-file (string-append out "/share/man/man3") (string-append doc "/share/man/man3")) #t))) - (add-before 'configure 'autoconf + (add-after 'unpack 'autoconf ;; Clear artifacts left (shebangs) from release preparation. (lambda _ - (zero? (system* "./buildconf")))) + (zero? (system* "sh" "buildconf")))) (replace 'check (lambda _ ;; It is unclear why test1026 fails, however the content of it @@ -345,7 +345,7 @@ kinds of basic applications for the foundation of a GNU internet.") (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 11e2ace98..12319ac76 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -839,7 +839,7 @@ exceptions, macros, and a dynamic programming environment.") (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (native-inputs `(("pkg-config" ,pkg-config) @@ -1464,9 +1464,9 @@ Parcellite and adds bugfixes and features.") `(#:configure-flags '("--enable-introspection=yes") #:phases (modify-phases %standard-phases - (add-before 'configure 'autogen + (add-after 'unpack 'autogen (lambda _ - (zero? (system* "./autogen.sh"))))))) + (zero? (system* "sh" "autogen.sh"))))))) (native-inputs `(("autoconf" ,autoconf) ("which" ,which) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f377d83b1..85482b865 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -353,7 +353,7 @@ AM_SCM_LOG_FLAGS = --no-auto-compile -s") ;; reasons. It does not fail when run outside of Guix. (("tests/database.scm") "")) #t)) - (add-before 'configure 'autogen + (add-after 'fix-bug-22 'autogen (lambda _ (zero? (system* "sh" "autogen.sh"))))))) (inputs @@ -616,12 +616,12 @@ format is also supported.") (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-before 'configure 'autoreconf - (lambda _ - ;; Repository comes with a broken symlink - (delete-file "README") - (symlink "README.org" "README") - (zero? (system* "autoreconf" "-fi"))))))) + (add-after 'unpack 'autoreconf + (lambda _ + ;; Repository comes with a broken symlink + (delete-file "README") + (symlink "README.org" "README") + (zero? (system* "autoreconf" "-fi"))))))) (native-inputs `(("autoconf" ,(autoconf-wrapper)) ("automake" ,automake) @@ -1088,7 +1088,7 @@ Guile's foreign function interface.") ("sqlite" ,sqlite))) (arguments '(#:phases (modify-phases %standard-phases - (add-before 'configure 'autoreconf + (add-after 'unpack 'autoreconf (lambda _ (zero? (system* "autoreconf" "-vfi")))) (add-before 'build 'set-sqlite3-file-name diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 2200b6663..4c0d6e219 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -148,7 +148,7 @@ may also simplify input method development.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'autogen + (add-after 'unpack 'autogen (lambda _ (and (zero? (system* "intltoolize")) (zero? (system* "autoreconf" "-vif"))))) (add-after 'wrap-program 'wrap-with-additional-paths @@ -204,7 +204,7 @@ ZhuYin (Bopomofo) input method based on libpinyin for IBus.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'autogen + (add-after 'unpack 'autogen (lambda _ (zero? (system* "autoreconf" "-vif")))) (add-after 'unpack 'unpack-model (lambda* (#:key inputs #:allow-other-keys) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 1d6ac82e5..b38336c46 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -180,9 +180,11 @@ SILC and ICB protocols via plugins.") "--with-tclconfig=" (assoc-ref %build-inputs "tcl") "/lib")) #:phases (modify-phases %standard-phases - (add-before 'configure 'autogen + (add-after 'unpack 'autogen (lambda _ - (zero? (system* "./autogen.sh")))) + (substitute* "version.sh" + (("/bin/sh") (which "sh"))) + (zero? (system* "sh" "autogen.sh")))) (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5744db6eb..a4200e4de 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -684,7 +684,7 @@ the standard javac executable. The tool runs on JamVM instead of SableVM."))) "--disable-gjdoc") #:phases (modify-phases %standard-phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ (zero? (system* "autoreconf" "-vif")))) (add-after 'unpack 'remove-unsupported-annotations diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index f7775ff4a..000396100 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -362,8 +362,8 @@ CorelDRAW documents of all versions.") (arguments `(#:configure-flags '("--with-mdds=1.2") #:phases (modify-phases %standard-phases - (add-before 'configure 'autoreconf - (lambda _ (system* "autoreconf")))))) + (add-after 'unpack 'autoreconf + (lambda _ (system* "autoreconf")))))) (native-inputs `(("cppunit" ,cppunit) ("doxygen" ,doxygen) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index ed97ed9de..f1d75220a 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -332,7 +332,7 @@ devices.") (arguments '(#:phases (modify-phases %standard-phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (inputs diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7f44ea789..4fff74c34 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3066,11 +3066,11 @@ write access to exFAT devices.") (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ ;; The tarball was not generated with 'make dist' so we ;; need to bootstrap things ourselves. - (and (zero? (system* "./autogen.sh")) + (and (zero? (system* "sh" "autogen.sh")) (begin (patch-makefile-SHELL "Makefile.include.in") #t))))) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index eecfe4558..deaaffd31 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -75,7 +75,7 @@ staying as close to their API as is reasonable.") ("libtool" ,libtool))) (arguments '(#:phases (modify-phases %standard-phases - (add-before 'configure 'add-automake-files + (add-after 'unpack 'add-automake-files (lambda _ ;; The 'test-driver' file is a dangling symlink to ;; /usr/share/automake; replace it. We can't just run diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 91fab8ccf..134303362 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -142,6 +142,9 @@ classification.") (modify-phases %standard-phases (add-after 'unpack 'enter-dir (lambda _ (chdir "ghmm") #t)) + (add-after 'enter-dir 'autogen + (lambda _ + (zero? (system* "bash" "./autogen.sh")))) (delete 'check) (add-after 'install 'check (assoc-ref %standard-phases 'check)) @@ -188,10 +191,7 @@ classification.") (string-append indent "@unittest.skip(\"Disabled by Guix\")\n" line))) - #t)) - (add-before 'configure 'autogen - (lambda _ - (zero? (system* "bash" "./autogen.sh"))))))) + #t))))) (inputs `(("python" ,python-2) ; only Python 2 is supported ("libxml2" ,libxml2))) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index af8690dda..c1350cc99 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1169,9 +1169,9 @@ It supports mbox/Maildir and its own dbox/mdbox formats.") "/lib/dovecot")) #:phases (modify-phases %standard-phases - (add-before 'configure 'autogen + (add-after 'unpack 'autogen (lambda _ - (zero? (system* "./autogen.sh"))))))) + (zero? (system* "sh" "autogen.sh"))))))) (home-page "https://0xacab.org/riseuplabs/trees") (synopsis "NaCL-based Dovecot email storage encryption plugin") (description @@ -1225,9 +1225,9 @@ using lidsodium sealed boxes. "/lib/dovecot")) #:phases (modify-phases %standard-phases - (add-before 'configure 'autogen + (add-after 'unpack 'autogen (lambda _ - (zero? (system* "./autogen.sh"))))))) + (zero? (system* "sh" "autogen.sh"))))))) (home-page "https://github.com/LuckyFellow/dovecot-libsodium-plugin") (synopsis "Libsodium password hashing schemes plugin for Dovecot") (description @@ -1506,8 +1506,8 @@ program's primary purpose.") (file-name (string-append name "-" version "-checkout")))) (arguments `(#:phases (modify-phases %standard-phases - (add-before - 'configure 'autoconf + (add-after + 'unpack 'autoconf (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (build-system gnu-build-system) (native-inputs diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 31ed4a49d..8655dd7c8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2174,31 +2174,30 @@ point numbers.") ("gtk+" ,gtk+) ("shared-mime-info" ,shared-mime-info))) (arguments - `(#:phases (modify-phases %standard-phases - (add-before - 'configure 'autoconf - (lambda _ - (zero? (system* "./bootstrap")))) - (add-after - 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/wxmaxima") - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "maxima") - "/bin"))) - ;; For GtkFileChooserDialog. - `("GSETTINGS_SCHEMA_DIR" = - (,(string-append (assoc-ref inputs "gtk+") - "/share/glib-2.0/schemas"))) - `("XDG_DATA_DIRS" ":" prefix - (;; Needed by gdk-pixbuf to know supported icon formats. - ,(string-append - (assoc-ref inputs "shared-mime-info") "/share") - ;; The default icon theme of GTK+. - ,(string-append - (assoc-ref inputs "adwaita-icon-theme") "/share")))) - #t))))) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'autoconf + (lambda _ + (zero? (system* "sh" "bootstrap")))) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/wxmaxima") + `("PATH" ":" prefix + (,(string-append (assoc-ref inputs "maxima") + "/bin"))) + ;; For GtkFileChooserDialog. + `("GSETTINGS_SCHEMA_DIR" = + (,(string-append (assoc-ref inputs "gtk+") + "/share/glib-2.0/schemas"))) + `("XDG_DATA_DIRS" ":" prefix + (;; Needed by gdk-pixbuf to know supported icon formats. + ,(string-append + (assoc-ref inputs "shared-mime-info") "/share") + ;; The default icon theme of GTK+. + ,(string-append + (assoc-ref inputs "adwaita-icon-theme") "/share")))) + #t))))) (home-page "https://andrejv.github.io/wxmaxima/") (synopsis "Graphical user interface for the Maxima computer algebra system") (description diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index adb7b938f..23eedac71 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1208,7 +1208,7 @@ support, and more.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'autogen + (add-after 'unpack 'autogen (lambda _ (zero? (system* "sh" "autogen.sh")))) ;; For 'system' commands in Scheme code. @@ -1261,9 +1261,9 @@ is also scriptable and extensible via Guile.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ - (zero? (system* "./bootstrap.sh"))))))) + (zero? (system* "sh" "bootstrap.sh"))))))) (inputs `(("expat" ,expat) ("openssl" ,openssl))) @@ -1296,9 +1296,9 @@ manual SSL certificate verification.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ - (zero? (system* "./bootstrap.sh"))))))) + (zero? (system* "sh" "bootstrap.sh"))))))) (inputs `(("expat" ,expat) ("openssl" ,openssl))) diff --git a/gnu/packages/microcom.scm b/gnu/packages/microcom.scm index cfa2518f1..afadbecf1 100644 --- a/gnu/packages/microcom.scm +++ b/gnu/packages/microcom.scm @@ -42,7 +42,7 @@ (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ (zero? (system* "autoreconf" "-i"))))))) (inputs `(("readline" ,readline))) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 43bbdcd6e..ecf113925 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1591,9 +1591,9 @@ lets the client choose the concrete timeline.") #:make-flags (list "OCAMLFIND_LDCONF=ignore") #:phases (modify-phases %standard-phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda* (#:key #:allow-other-keys) - (system* "./bootstrap") + (system* "sh" "bootstrap") (substitute* "src/OCamlMakefile" (("/bin/sh") (which "bash"))) (substitute* "configure" diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 179fa7ed3..e0e6bba7b 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -136,8 +136,8 @@ and they are executed on lists of files, hosts, users or other items.") (string-append "--with-ssl=" (assoc-ref %build-inputs "openssl"))) #:phases (modify-phases %standard-phases - (add-before - 'configure 'autogen + (add-after + 'unpack 'autogen (lambda _ (zero? (system* "autoconf"))))))) ; configure.ac was patched (home-page "http://slurm.schedmd.com/") (synopsis "Workload manager for cluster computing") diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 20dfdafb9..59ed691ec 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -263,7 +263,7 @@ Poppler PDF rendering library.") (assoc-ref %build-inputs "libpng"))) #:phases (modify-phases %standard-phases - (add-before 'configure 'autogen + (add-after 'unpack 'autogen (lambda _ (zero? (system* "autoreconf" "-vif"))))))) (inputs `(("zlib" ,zlib) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 4a7880cfe..2d0f78016 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -71,7 +71,7 @@ `(#:phases (modify-phases %standard-phases ;; The 6.7 tarball is missing ‘install.sh’. Create it. - (add-before 'configure 'autoreconf + (add-after 'unpack 'autoreconf (lambda _ (zero? (system* "autoreconf" "-i")))) (add-before 'configure 'set-root-sbin diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 3994191bd..3743ca8f3 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -127,7 +127,7 @@ such as compact binary encodings, XML, or JSON.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'autoconf + (add-after 'unpack 'autoconf (lambda _ (system* "autoreconf" "-vfi")))))) (home-page "http://www.msgpack.org") diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 8d2a957ea..d918c091d 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -430,7 +430,7 @@ use of experts and novices alike.") (delete-file-recursively "rx") (symlink rxpath "rx")) #t)) - (add-before 'configure 'autoreconf + (add-after 'unpack 'autoreconf (lambda _ (zero? (system* "autoreconf"))))))) (inputs diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 5207bd241..5df5e9e4a 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -272,7 +272,7 @@ and a supporting cryptographic kernel.") ("libtool" ,libtool))) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'autoconf + (add-after 'unpack 'autoconf (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (home-page "https://gitlab.savoirfairelinux.com/sflphone/libiax2") diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 479527a5f..45cef19d0 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -576,7 +576,7 @@ categories.") `(#:tests? #f ; FIXME maketest.sh does not work. #:phases (modify-phases %standard-phases - (add-before 'configure 'autoreconf + (add-after 'unpack 'autoreconf (lambda _ (zero? (system* "autoreconf" "-vif"))))))) (native-inputs diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 9667b2f3e..75d7eba20 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1227,7 +1227,7 @@ output of the 'git' command.") (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (native-inputs `(("autoconf" ,autoconf) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 19a5e24ed..1f0467b1e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -840,7 +840,7 @@ audio/video codec library.") #:phases (modify-phases %standard-phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ (zero? (system* "sh" "bootstrap")))) (add-before 'bootstrap 'fix-livemedia-utils-prefix (lambda* (#:key inputs #:allow-other-keys) @@ -2258,12 +2258,10 @@ practically any type of media.") #:phases ;; build scripts not in root of archive (modify-phases %standard-phases - (add-before 'configure 'pre-configure + (add-after 'unpack 'autogen (lambda _ - (chdir "Project/GNU/Library"))) - (add-before 'configure 'autogen - (lambda _ - (zero? (system* "./autogen.sh"))))))) + (chdir "Project/GNU/Library") + (zero? (system* "sh" "autogen.sh"))))))) (home-page "https://mediaarea.net/en/MediaInfo") (synopsis "Library for retrieving media metadata") (description "MediaInfo is a library used for retrieving technical @@ -2316,12 +2314,10 @@ MPEG-2, MPEG-4, DVD (VOB)... #:phases ;; build scripts not in root of archive (modify-phases %standard-phases - (add-before 'configure 'pre-configure - (lambda _ - (chdir "Project/GNU/CLI"))) - (add-before 'configure 'autogen + (add-after 'unpack 'autogen (lambda _ - (zero? (system* "./autogen.sh"))))))) + (chdir "Project/GNU/CLI") + (zero? (system* "sh" "autogen.sh"))))))) (home-page "https://mediaarea.net/en/MediaInfo") (synopsis "Utility for reading media metadata") (description "MediaInfo is a utility used for retrieving technical -- 2.13.3 From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 02 15:12:14 2017 Received: (at 27898) by debbugs.gnu.org; 2 Aug 2017 19:12:14 +0000 Received: from localhost ([127.0.0.1]:38816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcz41-00075O-SA for submit@debbugs.gnu.org; Wed, 02 Aug 2017 15:12:14 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:37797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcz40-00075G-4L for 27898@debbugs.gnu.org; Wed, 02 Aug 2017 15:12:12 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 17CC9208C1; Wed, 2 Aug 2017 15:12:12 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 02 Aug 2017 15:12:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=1dYYYd26Llm92JzUzyox5shaT4rMV+zHXJ2pRk6F/ UY=; b=IvZS2GE7ikmhp8v9sRIamjcO0t0rRCUWFysc+kBWKYkEew5GOGMzR7y/c Bp7d2uvFTIvFjRrhto0mOI2pY5ql/a5h00isC9FTXBojaPQL5oWKf7XwkRf3uAux BA3oy8loXmri4tHnoDc+mkWkaZAOkpV3PLL40rExtcFrVuV8ohtTSxLaZlDicunL oUskScu+Cya3QyzN6ad1oKGev7JsZBRk2T2OvxMhMwPAvYW17gjKzRif6C2qMha3 tiIBo6EwofxMbzdl4wZ75Db7uQeY7BdeO6fIZ4VCb1PAh4m969QmNDUoDR/sWNq1 hne8DFGHLtZM9njndGmXhIV39f8Vg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=1dYYYd26Llm92JzUzy ox5shaT4rMV+zHXJ2pRk6F/UY=; b=qQfX6mWpcnOkaq+XSyZMCIbXtYRWJIIIL7 eQeiIDXHHNhdDZdWz2asdKnlD/+wg4z9trhy9a5tLeYIvms6PPNMoRIh5QZgRdf8 ofk6tka66Ljj1wBL+al34KtCFVNBz3zeXVFGRe0Nhg0xDVfYwIz+qwexwY4PWCK0 6okfKe/s9UhJxMTiiC9d+BZRp5xD8R4dNwGN3/14oVKCIJnk15weJsuBVoQyLd92 lqOT9RzRPRop/Wk99Frnq+pGldf0jYuAS8afC2BmTCHc8mYMNH/QTct4MSkqUiuP p20YS1xQ7/nYWdNS+klL/yxpzipdAl1HxzY7urS/PeDa3cv/7+hg== X-ME-Sender: X-Sasl-enc: yHdkRvV6k+s3NiuujS12GroNeQNcD0EPkocJo8tvhRlc 1501701131 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 8CD8E7E4F0; Wed, 2 Aug 2017 15:12:11 -0400 (EDT) From: Marius Bakke To: Kei Kebreau , 27898@debbugs.gnu.org Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. In-Reply-To: <20170801072153.19077-1-kei@openmailbox.org> References: <871sov69jq.fsf@openmailbox.org> <20170801072153.19077-1-kei@openmailbox.org> User-Agent: Notmuch/0.25 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Wed, 02 Aug 2017 21:12:09 +0200 Message-ID: <87mv7hwzqu.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 Cc: Kei Kebreau X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > * gnu/packages/admin.scm (mingetty, clusterssh, sudo, wpa-supplicant-minimal, > wpa-supplicant, wakelan, acpica, tree, direvent, dstat)[arguments]: Use > 'modify-phases' syntax. > * gnu/packages/algebra.scm (arb)[arguments]: Likewise. > * gnu/packages/apr.scm (apr-util)[arguments]: Likewise. > * gnu/packages/audio.scm (clalsadrv, fluidsynth, faad2, lv2-mda-piano, > lv2-mda-epiano, timidity++, vamp, soundtouch, portaudio, rsound, > zita-convolver, zita-alsa-pcmi)[arguments]: Likewise. > * gnu/packages/backup.scm (rdup, btar)[arguments]: Likewise. > * gnu/packages/bioinformatics.scm (bedops, bwa, crossmap, express, > flexbar, grit, hisat, ngs-sdk, subread)[arguments]: Likewise. > * gnu/packages/bittorrent.scm (transmission)[arguments]: Likewise. > * gnu/packages/cdrom.scm (cd-discid)[arguments]: Likewise. > * gnu/packages/compression.scm (sharutils)[arguments]: Likewise. > * gnu/packages/conky.scm (conky)[arguments]: Likewise. > * gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Likewise. > * gnu/packages/debug.scm (delta, c-reduce)[arguments]: Likewise. > * gnu/packages/display-managers.scm (slim)[arguments]: Likewise. > * gnu/packages/dns.scm (dnsmasq)[arguments]: Likewise. > * gnu/packages/emacs.scm (geiser, emacs-wget, bbdb)[arguments]: Likewise. > * gnu/packages/engineering.scm (pcb)[arguments]: Likewise. > * gnu/packages/firmware.scm (ath9k-htc-firmware)[arguments]: Likewise. > * gnu/packages/flashing-tools.scm (flashrom)[arguments]: Likewise. > * gnu/packages/fltk.scm (fltk)[arguments]: Likewise. > * gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Likewise. > * gnu/packages/gd.scm (perl-gd)[arguments]: Likewise. > * gnu/packages/gimp.scm (gegl)[arguments]: Likewise. > * gnu/packages/gkrellm.scm (gkrellm)[arguments]: Likewise. > * gnu/packages/glib.scm (glibmm)[arguments]: Likewise. > * gnu/packages/gl.scm (glew)[arguments]: Likewise. > * gnu/packages/gnome.scm (icon-naming-utils, orbit2, libbonobo, gnome-vfs, > libgnome, libbonoboui, goffice-0.8, dconf)[arguments]: Likewise. > * gnu/packages/gprolog.scm (gprolog)[arguments]: Likewise. > * gnu/packages/gps.scm (gpscorrelate)[arguments]: Likewise. > * gnu/packages/graphics.scm (agg)[arguments]: Likewise. > * gnu/packages/gtk.scm (ganv, gtksourceview-2, guile-present, python2-pycairo) > [arguments]: Likewise. > * gnu/packages/guile.scm (guile-1.8)[arguments]: Likewise. > * gnu/packages/guile-wm.scm (guile-wm)[arguments]: Likewise. > * gnu/packages/hugs.scm (hugs)[arguments]: Likewise. > * gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal) > [arguments]: Likewise. > * gnu/packages/image-viewers.scm (feh, sxiv)[arguments]: Likewise. > * gnu/packages/libcanberra.scm (libcanberra)[arguments]: Likewise. > * gnu/packages/libsigsegv.scm (libsigsegv)[arguments]: Likewise. > * gnu/packages/linux.scm (zerofree, net-tools, bridge-utils, iw, fuse, > unionfs-fuse/static, lm-sensors, i2c-tools, xsensors, perf, mdadm, libaio, > module-init-tools)[arguments]: Likewise. > * gnu/packages/lisp.scm (ccl)[arguments]: Likewise. > * gnu/packages/lout.scm (lout)[arguments]: Likewise. > * gnu/packages/lua.scm (luajit)[arguments]: Likewise. > * gnu/packages/machine-learning.scm (shogun)[arguments]: Likewise. > * gnu/packages/mail.scm (exim)[arguments]: Likewise. > * gnu/packages/man.scm (man-pages, txt2man)[arguments]: Likewise. > * gnu/packages/maths.scm (lapack, superlu-dist, openlibm, openspecfun, > suitesparse)[arguments]: Likewise. > * gnu/packages/messaging.scm (bitlbee)[arguments]: Likewise. > * gnu/packages/mp3.scm (libmad, id3lib, mp3info)[arguments]: Likewise. > * gnu/packages/music.scm (solfege)[arguments]: Likewise. > * gnu/packages/noweb.scm (noweb)[arguments]: Likewise. > * gnu/packages/patchutils.scm (patchutils, quilt, colordiff)[arguments]: > Likewise. > * gnu/packages/pdf.scm (xpdf, zathura-cb, zathura-ps, zathura-djvu, > zathura-pdf-poppler, zathura, podofo, fbidag)[arguments]: Likewise. > * gnu/packages/perl.scm (perl-file-list, perl-test-harness)[arguments]: > Likewise. > * gnu/packages/photo.scm (gphoto2)[arguments]: Likewise. > * gnu/packages/popt.scm (popt)[arguments]: Likewise. > * gnu/packages/pretty-print.scm (source-highlight, astyle)[arguments]: > Likewise. > * gnu/packages/pumpio.scm (pumpa)[arguments]: Likewise. > * gnu/packages/python.scm (python-passlib, python-pycrypto, python2-empy, > python-sqlalchemy, python-docopt)[arguments]: Likewise. > * gnu/packages/rdf.scm (lrdf)[arguments]: Likewise. > * gnu/packages/regex.scm (tre)[arguments]: Likewise. > * gnu/packages/rrdtool.scm (rrdtool)[arguments]: Likewise. > * gnu/packages/ruby.scm (ruby-2.1, ruby-1.8)[arguments]: Likewise. > * gnu/packages/sawfish.scm (sawfish)[arguments]: Likewise. > * gnu/packages/scheme.scm (racket)[arguments]: Likewise. > * gnu/packages/sdl.scm (guile-sdl)[arguments]: Likewise. > * gnu/packages/serveez.scm (serveez)[arguments]: Likewise. > * gnu/packages/skribilo.scm (skribilo)[arguments]: Likewise. > * gnu/packages/smalltalk.scm (smalltalk)[arguments]: Likewise. > * gnu/packages/suckless.scm (dmenu, slock)[arguments]: Likewise. > * gnu/packages/tcl.scm (expect)[arguments]: Likewise. > * gnu/packages/telephony.scm (commoncpp)[arguments]: Likewise. > * gnu/packages/textutils.scm (recode, libgtextutils)[arguments]: > Likewise. > * gnu/packages/time.scm (time)[arguments]: Likewise. > * gnu/packages/tor.scm (privoxy)[arguments]: Likewise. > * gnu/packages/uucp.scm (uucp)[arguments]: Likewise. > * gnu/packages/video.scm (libdvdnav-4)[arguments]: Likewise. > * gnu/packages/web-browsers.scm (lynx)[arguments]: Likewise. > * gnu/packages/web.scm (tinyproxy)[arguments]: Likewise. > * gnu/packages/wicd.scm (wicd)[arguments]: Likewise. > * gnu/packages/wm.scm (bspwm)[arguments]: Likewise. > * gnu/packages/xdisorg.scm (sxhkd, xcape)[arguments]: Likewise. > * gnu/packages/xfce.scm (xfconf)[arguments]: Likewise. > * gnu/packages/xfig.scm (transfig)[arguments]: Likewise. > * gnu/packages/xorg.scm (imake)[arguments]: Likewise. > --- > gnu/packages/admin.scm | 294 ++++++++++++++--------------- > gnu/packages/algebra.scm | 31 ++-- > gnu/packages/apr.scm | 25 ++- > gnu/packages/audio.scm | 193 +++++++++---------- > gnu/packages/backup.scm | 33 ++-- > gnu/packages/bioinformatics.scm | 250 +++++++++++++------------ > gnu/packages/bittorrent.scm | 33 ++-- > gnu/packages/cdrom.scm | 2 +- > gnu/packages/compression.scm | 16 +- > gnu/packages/conky.scm | 31 ++-- > gnu/packages/databases.scm | 102 +++++----- > gnu/packages/debug.scm | 70 +++---- > gnu/packages/display-managers.scm | 22 +-- > gnu/packages/dns.scm | 2 +- > gnu/packages/docbook.scm | 26 +-- > gnu/packages/emacs.scm | 74 ++++---- > gnu/packages/engineering.scm | 43 +++-- > gnu/packages/firmware.scm | 48 ++--- > gnu/packages/flashing-tools.scm | 21 +-- > gnu/packages/fltk.scm | 42 ++--- > gnu/packages/freedesktop.scm | 33 ++-- > gnu/packages/gd.scm | 19 +- > gnu/packages/gimp.scm | 30 +-- > gnu/packages/gkrellm.scm | 4 +- > gnu/packages/gl.scm | 2 +- > gnu/packages/glib.scm | 33 ++-- > gnu/packages/gnome.scm | 145 +++++++-------- > gnu/packages/gprolog.scm | 17 +- > gnu/packages/gps.scm | 19 +- > gnu/packages/graphics.scm | 13 +- > gnu/packages/gtk.scm | 80 ++++---- > gnu/packages/guile-wm.scm | 81 ++++---- > gnu/packages/guile.scm | 36 ++-- > gnu/packages/hugs.scm | 61 +++--- > gnu/packages/hurd.scm | 60 +++--- > gnu/packages/image-viewers.scm | 14 +- > gnu/packages/libcanberra.scm | 18 +- > gnu/packages/libsigsegv.scm | 13 +- > gnu/packages/linux.scm | 379 +++++++++++++++++++------------------- > gnu/packages/lisp.scm | 61 +++--- > gnu/packages/lout.scm | 142 +++++++------- > gnu/packages/lua.scm | 2 +- > gnu/packages/machine-learning.scm | 88 +++++---- > gnu/packages/mail.scm | 90 ++++----- > gnu/packages/man.scm | 4 +- > gnu/packages/maths.scm | 119 ++++++------ > gnu/packages/messaging.scm | 27 ++- > gnu/packages/mp3.scm | 87 ++++----- > gnu/packages/music.scm | 102 +++++----- > gnu/packages/noweb.scm | 79 ++++---- > gnu/packages/patchutils.scm | 120 ++++++------ > gnu/packages/pdf.scm | 69 +++---- > gnu/packages/perl.scm | 31 ++-- > gnu/packages/photo.scm | 15 +- > gnu/packages/popt.scm | 17 +- > gnu/packages/pretty-print.scm | 65 +++---- > gnu/packages/pumpio.scm | 32 ++-- > gnu/packages/python.scm | 47 +++-- > gnu/packages/rdf.scm | 40 ++-- > gnu/packages/regex.scm | 20 +- > gnu/packages/rrdtool.scm | 19 +- > gnu/packages/ruby.scm | 40 ++-- > gnu/packages/sawfish.scm | 50 ++--- > gnu/packages/scheme.scm | 134 +++++++------- > gnu/packages/sdl.scm | 46 ++--- > gnu/packages/serveez.scm | 15 +- > gnu/packages/skribilo.scm | 29 +-- > gnu/packages/smalltalk.scm | 17 +- > gnu/packages/suckless.scm | 4 +- > gnu/packages/tcl.scm | 15 +- > gnu/packages/telephony.scm | 12 +- > gnu/packages/textutils.scm | 25 ++- > gnu/packages/time.scm | 19 +- > gnu/packages/tor.scm | 14 +- > gnu/packages/uucp.scm | 24 +-- > gnu/packages/video.scm | 9 +- > gnu/packages/web-browsers.scm | 10 +- > gnu/packages/web.scm | 15 +- > gnu/packages/wicd.scm | 214 +++++++++++---------- > gnu/packages/wm.scm | 2 +- > gnu/packages/xdisorg.scm | 5 +- > gnu/packages/xfce.scm | 23 +-- > gnu/packages/xfig.scm | 75 ++++---- > gnu/packages/xorg.scm | 39 ++-- > 84 files changed, 2253 insertions(+), 2274 deletions(-) Wow! That is a lot of code to review at once. Can you split this into maybe one patch per file? I guess some can be consolidated, but we should try to make each patch easily digestible both for current and future code reviewers. Hopefully we can alternate on the LGTMs. It would be good to have this as a "slow-rolling" change on 'master' as well since it will likely cause a lot of rebuilds. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlmCJAoACgkQoqBt8qM6 VPorQgf+IHey/KNBijy2p2CUlWGG/LsRNIPlwW+/CrksMopf28a6wTTmvb47ZB5M HajvQgWIc8zpkmBEc7yfF/0PX5M5nCquHifTCVDfQp6956PVfdnx3GwMDPe/JuBV rz0fkiALoIhHNGQtnXVZipXMEFxpnnreSQTFRCvJw95adwL31EosOVYCpyNWjybQ zPgUO8rzNiIK61QzbWogiLQjs1vO7YUMYRuhuxQk0QRUlcpEhnfegc9sYJfRhhBQ Mz89ZscGfBGgtanF2XZvmL3Oa455o7ApWDRs+Cgs8ziMF5Pnn/3CMdi2s1FYgeG1 WbFSDQ2JkKDl6QX6hpyVE96ZkJs5Qw== =63LA -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 02 15:33:05 2017 Received: (at 27898) by debbugs.gnu.org; 2 Aug 2017 19:33:05 +0000 Received: from localhost ([127.0.0.1]:38830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dczOD-0007aC-Hf for submit@debbugs.gnu.org; Wed, 02 Aug 2017 15:33:05 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:33161) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dczOC-0007a5-8h for 27898@debbugs.gnu.org; Wed, 02 Aug 2017 15:33:04 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 1965C20A4C; Wed, 2 Aug 2017 15:33:04 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 02 Aug 2017 15:33:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=1oTWxX67zveW6Gkq3iH7hF2faF80e8opZ8aO/rbNh kE=; b=AvTs9pVSCol1cKHxfeev8t/iwDJnuoZUoEUoGSxlkDbPS/GWznzQsK0H0 EZzfKQrPJBwogXXTi8fBhGhTLz8RFJwWkedD4weYNbydEZ1ZOuuvQlU41yjTyBSM Q2Ncg+E/pNCP6nVldfwq/5TLCGSrNUHN4YYmp53HezmrWGkDIRMN8BADLu7+2cOY gyN8NQdONB7y4fD0IseEeocsHs2DF82yokfn9XZW/uRaSxuR0aXYF9eIcOp7qUxu wAnHPJFvaOJL35TLLpOTtBraBGVjWqnCCHRtqU5P2zfsIF4B6MHawGxfgqjg/i3y AQzSAspgwHVqkNywPbmG+n+FBtFDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=1oTWxX67zveW6Gkq3i H7hF2faF80e8opZ8aO/rbNhkE=; b=b5hzXyzVcFP0w3hnsAO8rwrtwZNm7bwicO gyCsg/01Gl1Rr7QDgUQe+8ANpCLdFMhyrcatHKKrrGc23ZjWYOU7WAnCHJOCVzN/ LmhFoO8B3+5G5/tmYy2Eeja8mP0hTKMJAazsb6QrSRSk6w6FtcRAs/SBx5iNfwR+ BJ7MM/v19Gjk9KP36Jt11ltvATb/lnWzt2RA9Mw4zbXNLgizcy/whZO9cSghaIRQ SQtczyGz2P3ZLBtW0D1B8p3NnZQ9A1jzPZglHPwlC4Qb4bbSN+iiW2IkcoTH5E/d 7pJFu82+KlloAIWYHpSPkC8xCzjpzimMyUG40esoVe0P0qEnE6bA== X-ME-Sender: X-Sasl-enc: h85qaeTEw4LHdFI3wmcexWgoOkJ8byefl3JK5Q4T2J6F 1501702383 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 7BDC37E51F; Wed, 2 Aug 2017 15:33:03 -0400 (EDT) From: Marius Bakke To: Kei Kebreau , 27898@debbugs.gnu.org Subject: Re: [bug#27898] [PATCH 2/2] gnu: Put autoconf-related phases immediately after the 'unpack phase. In-Reply-To: <20170801072153.19077-2-kei@openmailbox.org> References: <20170801072153.19077-1-kei@openmailbox.org> <20170801072153.19077-2-kei@openmailbox.org> User-Agent: Notmuch/0.25 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Wed, 02 Aug 2017 21:33:01 +0200 Message-ID: <87k22lwys2.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 Cc: Kei Kebreau X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > * gnu/packages/audio.scm (audacity, rtmidi)[arguments]: Correct phases > accordingly. > * gnu/packages/bioinformatics.scm (mash, seek, vsearch, emboss, > htslib-for-sambamba)[arguments]: Likewise. > * gnu/packages/ci.scm (cuirass)[arguments]: Likewise. > * gnu/packages/compression.scm (minizip, xdelta)[arguments]: Likewise. > * gnu/packages/cpp.scm (libzen)[arguments]: Likewise. > * gnu/packages/crypto.scm (opendht)[arguments]: Likewise. > * gnu/packages/databases.scm (4store, mdbtools)[arguments]: Likewise. > * gnu/packages/debug.scm (stress-make)[arguments]: Likewise. > * gnu/packages/dns.scm (dnscrypt-proxy, dnscrypt-wrapper)[arguments]: > Likewise. > * gnu/packages/emacs.scm (emacs-pdf-tools)[arguments]: Likewise. > * gnu/packages/embedded.scm (libjaylink, openocd)[arguments]: Likewise. > * gnu/packages/engineering.scm (gerbv)[arguments]: Likewise. > * gnu/packages/erlang.scm (erlang)[arguments]: Likewise. > * gnu/packages/ftp.scm (weex)[arguments]: Likewise. > * gnu/packages/gnome.scm (dia)[arguments]: Likewise. > * gnu/packages/gnunet.scm (gnurl, guile-gnunet)[arguments]: Likewise. > * gnu/packages/gtk.scm (guile-rsvg, graphene)[arguments]: Likewise. > * gnu/packages/guile.scm (guildhall, guile-ics, guile-sqlite3)[arguments]: > Likewise. > * gnu/packages/ibus.scm (ibus-libpinyin)[arguments]: Likewise. > * gnu/packages/irc.scm (weechat)[arguments]: Likewise. > * gnu/packages/java.scm (classpath-devel)[arguments]: Likewise. > * gnu/packages/libreoffice.scm (libetonyek)[arguments]: Likewise. > * gnu/packages/libusb.scm (hidapi)[arguments]: Likewise. > * gnu/packages/linux.scm (gpm)[arguments]: Likewise. > * gnu/packages/logging.scm (glog)[arguments]: Likewise. > * gnu/packages/machine-learning.scm (ghmm)[arguments]: Likewise. > * gnu/packages/mail.scm (dovecot-trees, dovecot-libsodium-plugin, esmtp) > [arguments]: Likewise. > * gnu/packages/maths.scm (wxmaxima)[arguments]: Likewise. > * gnu/packages/messaging.scm (freetalk, libmesode, libstrophe)[arguments]: > Likewise. > * gnu/packages/microcom.scm (microcom)[arguments]: Likewise. > * gnu/packages/ocaml.scm (ocaml-ssl)[arguments]: Likewise. > * gnu/packages/parallel.scm (slurm)[arguments]: Likewise. > * gnu/packages/pdf.scm (libharu)[arguments]: Likewise. > * gnu/packages/samba.scm (cifs-utils)[arguments]: Likewise. > * gnu/packages/serialization.scm (msgpack)[arguments]: Likewise. > * gnu/packages/shells.scm (scsh)[arguments]: Likewise. > * gnu/packages/telephony.scm (libiax2)[arguments]: Likewise. > * gnu/packages/textutils.scm (dotconf)[arguments]: Likewise. > * gnu/packages/version-control.scm (findnewest)[arguments]: Likewise. > * gnu/packages/video.scm (vlc, libmediainfo, mediainfo)[arguments]: Likewise. Phew! This too will cause a lot of rebuilds, but I guess we could put it on 'staging'. It would have to be committed just before starting it to reduce the amount of merge conflicts. That said, I'm not sure how necessary this change is, but I don't have a strong argument against it. Other opinions welcome! Maybe we could add an '#:autoreconf?' parameter to gnu-build-system, which runs `autoreconf -vif` in a phase and automatically pulls in automake and autoconf (and probably also libtool). Thoughts? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlmCKO4ACgkQoqBt8qM6 VPqc+wgAui46n+dW54eu4RjT+XAsX7CO22KUvOqyxQ9bwMcJNnTAx5u7yN1mQViC XY/WYIqhPFTYd37LDeYxxCmqffh77oIa2cV2/E3iM7/8f9DoAjj9cFsYmGGz2EV1 9X5IbDvgN7oaingWPFwjVVhn84otX4/37ZRud0T1GfVQGtDzmTfauZwXptoRIcM+ lfFQ89kkmSyN5a1pJ5qrGJA4HE8IbbD8mA+fuMGAE+VU1hqKVhVIRIj1sS9o71tZ YPLXvisaQzf6uDLbicDeBhNVNLSaP0qoefBtwOHKN/e1wjl6/9hEWVNHRj4DiM/S OoFooYim5xZ7bdADbG7fJLx4bYCV1g== =ajo3 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 02 15:41:52 2017 Received: (at 27898) by debbugs.gnu.org; 2 Aug 2017 19:41:52 +0000 Received: from localhost ([127.0.0.1]:38835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dczWh-0007lc-Ig for submit@debbugs.gnu.org; Wed, 02 Aug 2017 15:41:52 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:56787) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dczWf-0007lV-VC for 27898@debbugs.gnu.org; Wed, 02 Aug 2017 15:41:50 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id CF87620BAD; Wed, 2 Aug 2017 15:41:49 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Wed, 02 Aug 2017 15:41:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=WJ0dN6gAgpdzazk+aRAS+lV/TXkU/CYROqym7Y RUc+0=; b=RE2rMiqH7T+ZqCOD2rtjHzlDzfyv2mD4zz4nPO+QHl3YvBPAWqM3hB HfiG8i+97YB5k/3lbpBlcQyhnrJBfpemHaOAmevufQdKgbJqkplsa6ANWoDaSo// hKE+wzQGmYfamhTc7BpZ9l7q7rCz846MmB1H6cdZTPWGorDGf7Ggc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=WJ0dN6gAgpdzazk+aR AS+lV/TXkU/CYROqym7YRUc+0=; b=LinSYmApCeHNJY80ouHvtRCrXHrmU/nG4I XRL6Gu/idqDZVVzAgpTJSEJYLRf0JHl7ern/AgtdzTanZxlzehUYe7eCWsdmdx9U 32vEdTkS35XtEWma/zMAdFYWs1UXSw/b/4OrQ+t3edR6aCC5UVCgbBfiBeKAKiB2 fWeAUfVzMzBztBQaoBcgq0pDn9QC6JCLLl/qqe3xGelk5AUQcL6ZSLmFFSIjo2tt EX3H8JgYFKmuym9G8MvmLwHHqeFnF3uHUba1GDsvcDLpNZHXbN61OmDeBwtpRiWd D5GIe8oFYTOI8pshj/IPzNOm/MPk9XfCDyBEm5MU6byQ1r15UeXQ== X-ME-Sender: X-Sasl-enc: tISorrb2tAU148UQKeySoSYRtTRRzPfR8SuQlOGTvV2S 1501702909 Received: from localhost (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id 7A5977E335; Wed, 2 Aug 2017 15:41:49 -0400 (EDT) Date: Wed, 2 Aug 2017 15:41:48 -0400 From: Leo Famulari To: Marius Bakke Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. Message-ID: <20170802194148.GB13105@jasmine.lan> References: <871sov69jq.fsf@openmailbox.org> <20170801072153.19077-1-kei@openmailbox.org> <87mv7hwzqu.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="TB36FDmn/VVEgNH/" Content-Disposition: inline In-Reply-To: <87mv7hwzqu.fsf@fastmail.com> User-Agent: Mutt/1.8.3 (2017-05-23) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 Cc: Kei Kebreau , 27898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --TB36FDmn/VVEgNH/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Aug 02, 2017 at 09:12:09PM +0200, Marius Bakke wrote: > Kei Kebreau writes: >=20 > > * gnu/packages/admin.scm (mingetty, clusterssh, sudo, wpa-supplicant-mi= nimal, > > wpa-supplicant, wakelan, acpica, tree, direvent, dstat)[arguments]: Use > > 'modify-phases' syntax. > > * gnu/packages/algebra.scm (arb)[arguments]: Likewise. > > * gnu/packages/apr.scm (apr-util)[arguments]: Likewise. > > * gnu/packages/audio.scm (clalsadrv, fluidsynth, faad2, lv2-mda-piano, > > lv2-mda-epiano, timidity++, vamp, soundtouch, portaudio, rsound, > > zita-convolver, zita-alsa-pcmi)[arguments]: Likewise. > > * gnu/packages/backup.scm (rdup, btar)[arguments]: Likewise. > > * gnu/packages/bioinformatics.scm (bedops, bwa, crossmap, express, > > flexbar, grit, hisat, ngs-sdk, subread)[arguments]: Likewise. > > * gnu/packages/bittorrent.scm (transmission)[arguments]: Likewise. > > * gnu/packages/cdrom.scm (cd-discid)[arguments]: Likewise. > > * gnu/packages/compression.scm (sharutils)[arguments]: Likewise. > > * gnu/packages/conky.scm (conky)[arguments]: Likewise. > > * gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Likewise. > > * gnu/packages/debug.scm (delta, c-reduce)[arguments]: Likewise. > > * gnu/packages/display-managers.scm (slim)[arguments]: Likewise. > > * gnu/packages/dns.scm (dnsmasq)[arguments]: Likewise. > > * gnu/packages/emacs.scm (geiser, emacs-wget, bbdb)[arguments]: Likewis= e. > > * gnu/packages/engineering.scm (pcb)[arguments]: Likewise. > > * gnu/packages/firmware.scm (ath9k-htc-firmware)[arguments]: Likewise. > > * gnu/packages/flashing-tools.scm (flashrom)[arguments]: Likewise. > > * gnu/packages/fltk.scm (fltk)[arguments]: Likewise. > > * gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Likewise. > > * gnu/packages/gd.scm (perl-gd)[arguments]: Likewise. > > * gnu/packages/gimp.scm (gegl)[arguments]: Likewise. > > * gnu/packages/gkrellm.scm (gkrellm)[arguments]: Likewise. > > * gnu/packages/glib.scm (glibmm)[arguments]: Likewise. > > * gnu/packages/gl.scm (glew)[arguments]: Likewise. > > * gnu/packages/gnome.scm (icon-naming-utils, orbit2, libbonobo, gnome-v= fs, > > libgnome, libbonoboui, goffice-0.8, dconf)[arguments]: Likewise. > > * gnu/packages/gprolog.scm (gprolog)[arguments]: Likewise. > > * gnu/packages/gps.scm (gpscorrelate)[arguments]: Likewise. > > * gnu/packages/graphics.scm (agg)[arguments]: Likewise. > > * gnu/packages/gtk.scm (ganv, gtksourceview-2, guile-present, python2-p= ycairo) > > [arguments]: Likewise. > > * gnu/packages/guile.scm (guile-1.8)[arguments]: Likewise. > > * gnu/packages/guile-wm.scm (guile-wm)[arguments]: Likewise. > > * gnu/packages/hugs.scm (hugs)[arguments]: Likewise. > > * gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal) > > [arguments]: Likewise. > > * gnu/packages/image-viewers.scm (feh, sxiv)[arguments]: Likewise. > > * gnu/packages/libcanberra.scm (libcanberra)[arguments]: Likewise. > > * gnu/packages/libsigsegv.scm (libsigsegv)[arguments]: Likewise. > > * gnu/packages/linux.scm (zerofree, net-tools, bridge-utils, iw, fuse, > > unionfs-fuse/static, lm-sensors, i2c-tools, xsensors, perf, mdadm, liba= io, > > module-init-tools)[arguments]: Likewise. > > * gnu/packages/lisp.scm (ccl)[arguments]: Likewise. > > * gnu/packages/lout.scm (lout)[arguments]: Likewise. > > * gnu/packages/lua.scm (luajit)[arguments]: Likewise. > > * gnu/packages/machine-learning.scm (shogun)[arguments]: Likewise. > > * gnu/packages/mail.scm (exim)[arguments]: Likewise. > > * gnu/packages/man.scm (man-pages, txt2man)[arguments]: Likewise. > > * gnu/packages/maths.scm (lapack, superlu-dist, openlibm, openspecfun, > > suitesparse)[arguments]: Likewise. > > * gnu/packages/messaging.scm (bitlbee)[arguments]: Likewise. > > * gnu/packages/mp3.scm (libmad, id3lib, mp3info)[arguments]: Likewise. > > * gnu/packages/music.scm (solfege)[arguments]: Likewise. > > * gnu/packages/noweb.scm (noweb)[arguments]: Likewise. > > * gnu/packages/patchutils.scm (patchutils, quilt, colordiff)[arguments]: > > Likewise. > > * gnu/packages/pdf.scm (xpdf, zathura-cb, zathura-ps, zathura-djvu, > > zathura-pdf-poppler, zathura, podofo, fbidag)[arguments]: Likewise. > > * gnu/packages/perl.scm (perl-file-list, perl-test-harness)[arguments]: > > Likewise. > > * gnu/packages/photo.scm (gphoto2)[arguments]: Likewise. > > * gnu/packages/popt.scm (popt)[arguments]: Likewise. > > * gnu/packages/pretty-print.scm (source-highlight, astyle)[arguments]: > > Likewise. > > * gnu/packages/pumpio.scm (pumpa)[arguments]: Likewise. > > * gnu/packages/python.scm (python-passlib, python-pycrypto, python2-emp= y, > > python-sqlalchemy, python-docopt)[arguments]: Likewise. > > * gnu/packages/rdf.scm (lrdf)[arguments]: Likewise. > > * gnu/packages/regex.scm (tre)[arguments]: Likewise. > > * gnu/packages/rrdtool.scm (rrdtool)[arguments]: Likewise. > > * gnu/packages/ruby.scm (ruby-2.1, ruby-1.8)[arguments]: Likewise. > > * gnu/packages/sawfish.scm (sawfish)[arguments]: Likewise. > > * gnu/packages/scheme.scm (racket)[arguments]: Likewise. > > * gnu/packages/sdl.scm (guile-sdl)[arguments]: Likewise. > > * gnu/packages/serveez.scm (serveez)[arguments]: Likewise. > > * gnu/packages/skribilo.scm (skribilo)[arguments]: Likewise. > > * gnu/packages/smalltalk.scm (smalltalk)[arguments]: Likewise. > > * gnu/packages/suckless.scm (dmenu, slock)[arguments]: Likewise. > > * gnu/packages/tcl.scm (expect)[arguments]: Likewise. > > * gnu/packages/telephony.scm (commoncpp)[arguments]: Likewise. > > * gnu/packages/textutils.scm (recode, libgtextutils)[arguments]: > > Likewise. > > * gnu/packages/time.scm (time)[arguments]: Likewise. > > * gnu/packages/tor.scm (privoxy)[arguments]: Likewise. > > * gnu/packages/uucp.scm (uucp)[arguments]: Likewise. > > * gnu/packages/video.scm (libdvdnav-4)[arguments]: Likewise. > > * gnu/packages/web-browsers.scm (lynx)[arguments]: Likewise. > > * gnu/packages/web.scm (tinyproxy)[arguments]: Likewise. > > * gnu/packages/wicd.scm (wicd)[arguments]: Likewise. > > * gnu/packages/wm.scm (bspwm)[arguments]: Likewise. > > * gnu/packages/xdisorg.scm (sxhkd, xcape)[arguments]: Likewise. > > * gnu/packages/xfce.scm (xfconf)[arguments]: Likewise. > > * gnu/packages/xfig.scm (transfig)[arguments]: Likewise. > > * gnu/packages/xorg.scm (imake)[arguments]: Likewise. > > --- > > gnu/packages/admin.scm | 294 ++++++++++++++--------------- > > gnu/packages/algebra.scm | 31 ++-- > > gnu/packages/apr.scm | 25 ++- > > gnu/packages/audio.scm | 193 +++++++++---------- > > gnu/packages/backup.scm | 33 ++-- > > gnu/packages/bioinformatics.scm | 250 +++++++++++++------------ > > gnu/packages/bittorrent.scm | 33 ++-- > > gnu/packages/cdrom.scm | 2 +- > > gnu/packages/compression.scm | 16 +- > > gnu/packages/conky.scm | 31 ++-- > > gnu/packages/databases.scm | 102 +++++----- > > gnu/packages/debug.scm | 70 +++---- > > gnu/packages/display-managers.scm | 22 +-- > > gnu/packages/dns.scm | 2 +- > > gnu/packages/docbook.scm | 26 +-- > > gnu/packages/emacs.scm | 74 ++++---- > > gnu/packages/engineering.scm | 43 +++-- > > gnu/packages/firmware.scm | 48 ++--- > > gnu/packages/flashing-tools.scm | 21 +-- > > gnu/packages/fltk.scm | 42 ++--- > > gnu/packages/freedesktop.scm | 33 ++-- > > gnu/packages/gd.scm | 19 +- > > gnu/packages/gimp.scm | 30 +-- > > gnu/packages/gkrellm.scm | 4 +- > > gnu/packages/gl.scm | 2 +- > > gnu/packages/glib.scm | 33 ++-- > > gnu/packages/gnome.scm | 145 +++++++-------- > > gnu/packages/gprolog.scm | 17 +- > > gnu/packages/gps.scm | 19 +- > > gnu/packages/graphics.scm | 13 +- > > gnu/packages/gtk.scm | 80 ++++---- > > gnu/packages/guile-wm.scm | 81 ++++---- > > gnu/packages/guile.scm | 36 ++-- > > gnu/packages/hugs.scm | 61 +++--- > > gnu/packages/hurd.scm | 60 +++--- > > gnu/packages/image-viewers.scm | 14 +- > > gnu/packages/libcanberra.scm | 18 +- > > gnu/packages/libsigsegv.scm | 13 +- > > gnu/packages/linux.scm | 379 +++++++++++++++++++-----------= -------- > > gnu/packages/lisp.scm | 61 +++--- > > gnu/packages/lout.scm | 142 +++++++------- > > gnu/packages/lua.scm | 2 +- > > gnu/packages/machine-learning.scm | 88 +++++---- > > gnu/packages/mail.scm | 90 ++++----- > > gnu/packages/man.scm | 4 +- > > gnu/packages/maths.scm | 119 ++++++------ > > gnu/packages/messaging.scm | 27 ++- > > gnu/packages/mp3.scm | 87 ++++----- > > gnu/packages/music.scm | 102 +++++----- > > gnu/packages/noweb.scm | 79 ++++---- > > gnu/packages/patchutils.scm | 120 ++++++------ > > gnu/packages/pdf.scm | 69 +++---- > > gnu/packages/perl.scm | 31 ++-- > > gnu/packages/photo.scm | 15 +- > > gnu/packages/popt.scm | 17 +- > > gnu/packages/pretty-print.scm | 65 +++---- > > gnu/packages/pumpio.scm | 32 ++-- > > gnu/packages/python.scm | 47 +++-- > > gnu/packages/rdf.scm | 40 ++-- > > gnu/packages/regex.scm | 20 +- > > gnu/packages/rrdtool.scm | 19 +- > > gnu/packages/ruby.scm | 40 ++-- > > gnu/packages/sawfish.scm | 50 ++--- > > gnu/packages/scheme.scm | 134 +++++++------- > > gnu/packages/sdl.scm | 46 ++--- > > gnu/packages/serveez.scm | 15 +- > > gnu/packages/skribilo.scm | 29 +-- > > gnu/packages/smalltalk.scm | 17 +- > > gnu/packages/suckless.scm | 4 +- > > gnu/packages/tcl.scm | 15 +- > > gnu/packages/telephony.scm | 12 +- > > gnu/packages/textutils.scm | 25 ++- > > gnu/packages/time.scm | 19 +- > > gnu/packages/tor.scm | 14 +- > > gnu/packages/uucp.scm | 24 +-- > > gnu/packages/video.scm | 9 +- > > gnu/packages/web-browsers.scm | 10 +- > > gnu/packages/web.scm | 15 +- > > gnu/packages/wicd.scm | 214 +++++++++++---------- > > gnu/packages/wm.scm | 2 +- > > gnu/packages/xdisorg.scm | 5 +- > > gnu/packages/xfce.scm | 23 +-- > > gnu/packages/xfig.scm | 75 ++++---- > > gnu/packages/xorg.scm | 39 ++-- > > 84 files changed, 2253 insertions(+), 2274 deletions(-) >=20 > Wow! That is a lot of code to review at once. Can you split this into > maybe one patch per file? I guess some can be consolidated, but we > should try to make each patch easily digestible both for current and > future code reviewers. Hopefully we can alternate on the LGTMs. I agree, wow! Thanks for this. It should help new Schemers to feel more comfortable editing packages. This might be annoying but it should wait until after the core-updates branch is done and merged into the master branch. I want to minimize the number of merge conflicts because they are 1) annoying and 2) relatively opaque when reading the Git history. Marius's suggestion is another good one, and would help with issues like that. But if we were to wait until after core-updates and push it as one commit, I wouldn't mind. It's up to the two of you and everyone else :) --TB36FDmn/VVEgNH/ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlmCKvkACgkQJkb6MLrK fwj/ug//aWw/PgctQqH4BV7J1vhi0Loil81wWuI1MVVXpXxfg6Pfx+OiYbz49vxH 3lBOr4SMq5IFJws6SEl+oJjzyPRckMSI3CN584LOWFZ2ygXp5ebmt6eOLODtmV/b Cl9u4zOFeqqcHmsW8JRKAPMo25OXrR/qLEHmOQgd8IM0mzrX01kSs02Nnop9C6T7 3WjDBdKlmNvImuuz0zMdWyr0gfYmZ9ME5WUpLI+YCCz/GVotz+vLGrtDKKvBkrHp ImCMJvsfAmS18OCMsnLNWEyxJ9+YR4/HcRmC36xVlp3JK89NKgjesf0XyyzMD/Dw dUu/zuQ+oTSxle+7ME9VlrVq7N/h/g/BrbiCEvyg7lhfqVKjWGuwj5O99PdA2z9P 3+3mbz9anhQJlBOfIkYRSvjAwO/OhYYvcQZaUjDS1irU+O/DOZJR/bkkqJNjoJDv 8T2miBTZCXqRlmvFf8pcEwUNexiUKeYUgYGIA1IG2cl7SSpt0y7z2JpL8T696ckt QUAOrE9z7SWNnyyy5Pg/8DgPLXErU9BXpc+Vv0jYljWLGFhcIUUeMi4/2GK11JqM Zkw78EWk894f7IQ8AGyoXvy60kgXeY+hO8f/Chf5Ef2DgApj4U3ChKdm45p2dAU1 IwrwTSDY2hUSs3IHxYaAz7BySs/iAUdNt+vynuDREz9Nck9yc1U= =GPnN -----END PGP SIGNATURE----- --TB36FDmn/VVEgNH/-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 02 15:45:20 2017 Received: (at 27898) by debbugs.gnu.org; 2 Aug 2017 19:45:20 +0000 Received: from localhost ([127.0.0.1]:38840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcza3-0007rA-CA for submit@debbugs.gnu.org; Wed, 02 Aug 2017 15:45:20 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:54309) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcza1-0007r2-Am for 27898@debbugs.gnu.org; Wed, 02 Aug 2017 15:45:17 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 2541020B62; Wed, 2 Aug 2017 15:45:17 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Wed, 02 Aug 2017 15:45:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=dXd2xdvK/n6D2O1LsKGxhRJWlqKhrWAbJKwJic p1LBM=; b=kldYydkbgcRKLU+sxcASdz22hwU9uhPfiiXTqHyg1ItRwq9GNRWGmW pQovO4ngiO9DXAiIRDcIUmJb08cd0AF23WGWpMmsy6svpGP0ZvZN+gQxKdAVA8d9 ktRB7Qv6OoV+ywI4KkBgkz32y+FENTlJPOdswzbJq0kR9Hik3b0EQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=dXd2xdvK/n6D2O1LsK GxhRJWlqKhrWAbJKwJicp1LBM=; b=bFY/yvPrmuLuer91CUqGNAbalDb5gNjE0n z/ZvyZeaKMm/9JNJOPMEVX6CfQ8545E/SHdjk3RlVybS3fIXUlesQ2ImlhHhhmvp NcYlJlrlmu8cMOBHzUze7Eoa8X3TPdshuRumZmUn14bdtVhkx+F5xjuL6vRFpvje xfMXrYvSMLM6XOZwQCCcdSqCHGFXpilUZfJ/ilc+2tI1y+ScTX8I2MblXv8CXFbd maT1peocRyVDZLSgVhOXsODEAIj1grzlEp+yZ30+681hSnDhwTtFStBgUtyn7090 KFgjdwyKNxB2wdW7iHi8YVfsqU96PNQ6sDf4kKmfrX/55xNgUDEQ== X-ME-Sender: X-Sasl-enc: 6bz5X9GybrYwr4RGpZBHOhTRF3/SWonlfDBZ1n1AymC0 1501703116 Received: from localhost (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id CE7A8244AA; Wed, 2 Aug 2017 15:45:16 -0400 (EDT) Date: Wed, 2 Aug 2017 15:45:15 -0400 From: Leo Famulari To: Marius Bakke Subject: Re: [bug#27898] [PATCH 2/2] gnu: Put autoconf-related phases immediately after the 'unpack phase. Message-ID: <20170802194515.GC13105@jasmine.lan> References: <20170801072153.19077-1-kei@openmailbox.org> <20170801072153.19077-2-kei@openmailbox.org> <87k22lwys2.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="oC1+HKm2/end4ao3" Content-Disposition: inline In-Reply-To: <87k22lwys2.fsf@fastmail.com> User-Agent: Mutt/1.8.3 (2017-05-23) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 Cc: Kei Kebreau , 27898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --oC1+HKm2/end4ao3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Aug 02, 2017 at 09:33:01PM +0200, Marius Bakke wrote: > Kei Kebreau writes: [... move autoconf phases ...] > Phew! This too will cause a lot of rebuilds, but I guess we could put it > on 'staging'. It would have to be committed just before starting it to > reduce the amount of merge conflicts. Agreed > That said, I'm not sure how necessary this change is, but I don't have a > strong argument against it. Other opinions welcome! I guess there is a correct ordering and an incorrect ordering, depending on whether or not these phases should happen before or after the shebang patching phases. Does it work if it happens before the shebangs are patched? > Maybe we could add an '#:autoreconf?' parameter to gnu-build-system, > which runs `autoreconf -vif` in a phase and automatically pulls in > automake and autoconf (and probably also libtool). Thoughts? Interesting! --oC1+HKm2/end4ao3 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlmCK8sACgkQJkb6MLrK fwihpg//dTXp/80wCpsaM3gjZ39Ak+rFPIKyPe0eC5DhhrH64/Q9pdpfngS6y9Xw bNPR1+vEGmK+NAE0TQb3g4cWfntdi1iTnucPJs1kzZ8YwVG+vb1+BvOLfol+QeVg wtATnNbof1gXL3DsadCp52SYPQBniJSwLEX7+er+u1UpyamZBQG1Ez65wN4fDZmA k2XaXcQ9FB/ZuTJ0HvbqbmUujJ2MBLAOiozShUsCCysjcAJ2eW+dAc9j+2mFlaLz 7HKgHoogqYVXC/EcrH7JMYP7PqYpw3FARY9nJcGhwNiH3tYAKzyG2hwgcd9CgU3T YE7GrHy844dRFOHqyWiYey6DcQO9iupfW1s88hs/0Df03pqMhQILC48drPZCz+m8 rtLHYO3frwCnmRT5K3QZE78lJvqtmsw7UMUBAZnpeuBiGUgLG4AqLVIfTIf08Mbl tKDz6hphaMSe2mIeDJ8JB1dMyhF44L6n08ObmSlGVRDLnuDyCSKjDES8gFq9MCJw IbTY2tmQJY2MRJX0vqTzcmbx+fezG0S1p12jne2LSccUEdnqBr6Qap5l1P9zAXXD oSml4jP72v+4E9MUbU4smk1VsdosddapeiwMbra+yqBfXaOYNtMzDxIm4mXAUoYG pY1Z9BFWjkSTT4c4FZ9QspuZPNO1bCiv5M79GbPFp/6UKxfk/NE= =w0hW -----END PGP SIGNATURE----- --oC1+HKm2/end4ao3-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 02 16:08:22 2017 Received: (at 27898) by debbugs.gnu.org; 2 Aug 2017 20:08:22 +0000 Received: from localhost ([127.0.0.1]:38932 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dczwM-0008Ti-5x for submit@debbugs.gnu.org; Wed, 02 Aug 2017 16:08:22 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:52061) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dczwK-0008Ta-J8 for 27898@debbugs.gnu.org; Wed, 02 Aug 2017 16:08:21 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 87ED8212AD; Wed, 2 Aug 2017 16:08:20 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 02 Aug 2017 16:08:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=HdJxdGcF9TxqLNKDIdDOik3WZMhbtQfHNC17YMb78 1M=; b=Ht75molirjeGnhHDBJCuHUZZjUMq1DQTyPH0KGnCavEB48ZJ1hc7EqL8e 2dtDE6IlXrYlNAoN8M/4jkzeuIOX76Y3YPu6IBULIv3ED0ab/YYCHvHNkyMUabnd QP5quIriYqXBcmUZObSr+tYh42qdi3y1iWYh+SpRVNxuJ05nabN+EwX4+yrVQux7 2K6Qexi1faqyf+dJO2e8h8hUx1X+4NtK56zWM3EMsccIv6ApJFvd8ansb9M4XzOQ AcP3r/iQAmaqbgTjqIHpJtywZAxxceehjLjZ4rXkIpIh4U0bmJjx/QhWx/BeYPZq JPBDmWG/CwCB8lyetUXRLwvJOkt6g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=HdJxdGcF9TxqLNKDId DOik3WZMhbtQfHNC17YMb781M=; b=h8FzJH2MY7CUPuqLoryR6By9cfdxjI7g8x HwCPEY4DDKeDBupMvc4R1L4dbsTKKzl7ctkoVDYvKRezsyqTlTxVY4Yu9fqeTg4P pw1/YfEzoYcXrYTCwwvagrAORzL5Z066jHNeg5V41dNZQVrKjt+IKb87hZKyGBWc NCBsfJFGA2bMeXEt9Ezy8Iwd1EWi37mvEmcKG8CAIdFpC0MI72ENBcs6hWzwmxPi nvP5BVoXgJmPiEpaJPaMiC3jtNh3hU5IZEeR2ThSUJA7D87cM9WD1TxyC99WmBV1 F/XA937ye1NtDZkocCACuj/DBv1Tf4R8tEm2mBVgAINHd7N4k+6g== X-ME-Sender: X-Sasl-enc: tjLZSHaY3RduOPer7Vpd9Yi9Vmx++4fhUapCcO8MfMcw 1501704500 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 0FC4C7E351; Wed, 2 Aug 2017 16:08:19 -0400 (EDT) From: Marius Bakke To: Leo Famulari Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. In-Reply-To: <20170802194148.GB13105@jasmine.lan> References: <871sov69jq.fsf@openmailbox.org> <20170801072153.19077-1-kei@openmailbox.org> <87mv7hwzqu.fsf@fastmail.com> <20170802194148.GB13105@jasmine.lan> User-Agent: Notmuch/0.25 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Wed, 02 Aug 2017 22:08:18 +0200 Message-ID: <87fud9wx59.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 Cc: Kei Kebreau , 27898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Leo Famulari writes: > On Wed, Aug 02, 2017 at 09:12:09PM +0200, Marius Bakke wrote: >> Kei Kebreau writes: >>=20 >> > * gnu/packages/admin.scm (mingetty, clusterssh, sudo, wpa-supplicant-m= inimal, >> > wpa-supplicant, wakelan, acpica, tree, direvent, dstat)[arguments]: Use >> > 'modify-phases' syntax. >> > * gnu/packages/algebra.scm (arb)[arguments]: Likewise. >> > * gnu/packages/apr.scm (apr-util)[arguments]: Likewise. >> > * gnu/packages/audio.scm (clalsadrv, fluidsynth, faad2, lv2-mda-piano, >> > lv2-mda-epiano, timidity++, vamp, soundtouch, portaudio, rsound, >> > zita-convolver, zita-alsa-pcmi)[arguments]: Likewise. >> > * gnu/packages/backup.scm (rdup, btar)[arguments]: Likewise. >> > * gnu/packages/bioinformatics.scm (bedops, bwa, crossmap, express, >> > flexbar, grit, hisat, ngs-sdk, subread)[arguments]: Likewise. >> > * gnu/packages/bittorrent.scm (transmission)[arguments]: Likewise. >> > * gnu/packages/cdrom.scm (cd-discid)[arguments]: Likewise. >> > * gnu/packages/compression.scm (sharutils)[arguments]: Likewise. >> > * gnu/packages/conky.scm (conky)[arguments]: Likewise. >> > * gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Likewise. >> > * gnu/packages/debug.scm (delta, c-reduce)[arguments]: Likewise. >> > * gnu/packages/display-managers.scm (slim)[arguments]: Likewise. >> > * gnu/packages/dns.scm (dnsmasq)[arguments]: Likewise. >> > * gnu/packages/emacs.scm (geiser, emacs-wget, bbdb)[arguments]: Likewi= se. >> > * gnu/packages/engineering.scm (pcb)[arguments]: Likewise. >> > * gnu/packages/firmware.scm (ath9k-htc-firmware)[arguments]: Likewise. >> > * gnu/packages/flashing-tools.scm (flashrom)[arguments]: Likewise. >> > * gnu/packages/fltk.scm (fltk)[arguments]: Likewise. >> > * gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Likewise. >> > * gnu/packages/gd.scm (perl-gd)[arguments]: Likewise. >> > * gnu/packages/gimp.scm (gegl)[arguments]: Likewise. >> > * gnu/packages/gkrellm.scm (gkrellm)[arguments]: Likewise. >> > * gnu/packages/glib.scm (glibmm)[arguments]: Likewise. >> > * gnu/packages/gl.scm (glew)[arguments]: Likewise. >> > * gnu/packages/gnome.scm (icon-naming-utils, orbit2, libbonobo, gnome-= vfs, >> > libgnome, libbonoboui, goffice-0.8, dconf)[arguments]: Likewise. >> > * gnu/packages/gprolog.scm (gprolog)[arguments]: Likewise. >> > * gnu/packages/gps.scm (gpscorrelate)[arguments]: Likewise. >> > * gnu/packages/graphics.scm (agg)[arguments]: Likewise. >> > * gnu/packages/gtk.scm (ganv, gtksourceview-2, guile-present, python2-= pycairo) >> > [arguments]: Likewise. >> > * gnu/packages/guile.scm (guile-1.8)[arguments]: Likewise. >> > * gnu/packages/guile-wm.scm (guile-wm)[arguments]: Likewise. >> > * gnu/packages/hugs.scm (hugs)[arguments]: Likewise. >> > * gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal) >> > [arguments]: Likewise. >> > * gnu/packages/image-viewers.scm (feh, sxiv)[arguments]: Likewise. >> > * gnu/packages/libcanberra.scm (libcanberra)[arguments]: Likewise. >> > * gnu/packages/libsigsegv.scm (libsigsegv)[arguments]: Likewise. >> > * gnu/packages/linux.scm (zerofree, net-tools, bridge-utils, iw, fuse, >> > unionfs-fuse/static, lm-sensors, i2c-tools, xsensors, perf, mdadm, lib= aio, >> > module-init-tools)[arguments]: Likewise. >> > * gnu/packages/lisp.scm (ccl)[arguments]: Likewise. >> > * gnu/packages/lout.scm (lout)[arguments]: Likewise. >> > * gnu/packages/lua.scm (luajit)[arguments]: Likewise. >> > * gnu/packages/machine-learning.scm (shogun)[arguments]: Likewise. >> > * gnu/packages/mail.scm (exim)[arguments]: Likewise. >> > * gnu/packages/man.scm (man-pages, txt2man)[arguments]: Likewise. >> > * gnu/packages/maths.scm (lapack, superlu-dist, openlibm, openspecfun, >> > suitesparse)[arguments]: Likewise. >> > * gnu/packages/messaging.scm (bitlbee)[arguments]: Likewise. >> > * gnu/packages/mp3.scm (libmad, id3lib, mp3info)[arguments]: Likewise. >> > * gnu/packages/music.scm (solfege)[arguments]: Likewise. >> > * gnu/packages/noweb.scm (noweb)[arguments]: Likewise. >> > * gnu/packages/patchutils.scm (patchutils, quilt, colordiff)[arguments= ]: >> > Likewise. >> > * gnu/packages/pdf.scm (xpdf, zathura-cb, zathura-ps, zathura-djvu, >> > zathura-pdf-poppler, zathura, podofo, fbidag)[arguments]: Likewise. >> > * gnu/packages/perl.scm (perl-file-list, perl-test-harness)[arguments]: >> > Likewise. >> > * gnu/packages/photo.scm (gphoto2)[arguments]: Likewise. >> > * gnu/packages/popt.scm (popt)[arguments]: Likewise. >> > * gnu/packages/pretty-print.scm (source-highlight, astyle)[arguments]: >> > Likewise. >> > * gnu/packages/pumpio.scm (pumpa)[arguments]: Likewise. >> > * gnu/packages/python.scm (python-passlib, python-pycrypto, python2-em= py, >> > python-sqlalchemy, python-docopt)[arguments]: Likewise. >> > * gnu/packages/rdf.scm (lrdf)[arguments]: Likewise. >> > * gnu/packages/regex.scm (tre)[arguments]: Likewise. >> > * gnu/packages/rrdtool.scm (rrdtool)[arguments]: Likewise. >> > * gnu/packages/ruby.scm (ruby-2.1, ruby-1.8)[arguments]: Likewise. >> > * gnu/packages/sawfish.scm (sawfish)[arguments]: Likewise. >> > * gnu/packages/scheme.scm (racket)[arguments]: Likewise. >> > * gnu/packages/sdl.scm (guile-sdl)[arguments]: Likewise. >> > * gnu/packages/serveez.scm (serveez)[arguments]: Likewise. >> > * gnu/packages/skribilo.scm (skribilo)[arguments]: Likewise. >> > * gnu/packages/smalltalk.scm (smalltalk)[arguments]: Likewise. >> > * gnu/packages/suckless.scm (dmenu, slock)[arguments]: Likewise. >> > * gnu/packages/tcl.scm (expect)[arguments]: Likewise. >> > * gnu/packages/telephony.scm (commoncpp)[arguments]: Likewise. >> > * gnu/packages/textutils.scm (recode, libgtextutils)[arguments]: >> > Likewise. >> > * gnu/packages/time.scm (time)[arguments]: Likewise. >> > * gnu/packages/tor.scm (privoxy)[arguments]: Likewise. >> > * gnu/packages/uucp.scm (uucp)[arguments]: Likewise. >> > * gnu/packages/video.scm (libdvdnav-4)[arguments]: Likewise. >> > * gnu/packages/web-browsers.scm (lynx)[arguments]: Likewise. >> > * gnu/packages/web.scm (tinyproxy)[arguments]: Likewise. >> > * gnu/packages/wicd.scm (wicd)[arguments]: Likewise. >> > * gnu/packages/wm.scm (bspwm)[arguments]: Likewise. >> > * gnu/packages/xdisorg.scm (sxhkd, xcape)[arguments]: Likewise. >> > * gnu/packages/xfce.scm (xfconf)[arguments]: Likewise. >> > * gnu/packages/xfig.scm (transfig)[arguments]: Likewise. >> > * gnu/packages/xorg.scm (imake)[arguments]: Likewise. >> > --- >> > gnu/packages/admin.scm | 294 ++++++++++++++--------------- >> > gnu/packages/algebra.scm | 31 ++-- >> > gnu/packages/apr.scm | 25 ++- >> > gnu/packages/audio.scm | 193 +++++++++---------- >> > gnu/packages/backup.scm | 33 ++-- >> > gnu/packages/bioinformatics.scm | 250 +++++++++++++------------ >> > gnu/packages/bittorrent.scm | 33 ++-- >> > gnu/packages/cdrom.scm | 2 +- >> > gnu/packages/compression.scm | 16 +- >> > gnu/packages/conky.scm | 31 ++-- >> > gnu/packages/databases.scm | 102 +++++----- >> > gnu/packages/debug.scm | 70 +++---- >> > gnu/packages/display-managers.scm | 22 +-- >> > gnu/packages/dns.scm | 2 +- >> > gnu/packages/docbook.scm | 26 +-- >> > gnu/packages/emacs.scm | 74 ++++---- >> > gnu/packages/engineering.scm | 43 +++-- >> > gnu/packages/firmware.scm | 48 ++--- >> > gnu/packages/flashing-tools.scm | 21 +-- >> > gnu/packages/fltk.scm | 42 ++--- >> > gnu/packages/freedesktop.scm | 33 ++-- >> > gnu/packages/gd.scm | 19 +- >> > gnu/packages/gimp.scm | 30 +-- >> > gnu/packages/gkrellm.scm | 4 +- >> > gnu/packages/gl.scm | 2 +- >> > gnu/packages/glib.scm | 33 ++-- >> > gnu/packages/gnome.scm | 145 +++++++-------- >> > gnu/packages/gprolog.scm | 17 +- >> > gnu/packages/gps.scm | 19 +- >> > gnu/packages/graphics.scm | 13 +- >> > gnu/packages/gtk.scm | 80 ++++---- >> > gnu/packages/guile-wm.scm | 81 ++++---- >> > gnu/packages/guile.scm | 36 ++-- >> > gnu/packages/hugs.scm | 61 +++--- >> > gnu/packages/hurd.scm | 60 +++--- >> > gnu/packages/image-viewers.scm | 14 +- >> > gnu/packages/libcanberra.scm | 18 +- >> > gnu/packages/libsigsegv.scm | 13 +- >> > gnu/packages/linux.scm | 379 +++++++++++++++++++----------= --------- >> > gnu/packages/lisp.scm | 61 +++--- >> > gnu/packages/lout.scm | 142 +++++++------- >> > gnu/packages/lua.scm | 2 +- >> > gnu/packages/machine-learning.scm | 88 +++++---- >> > gnu/packages/mail.scm | 90 ++++----- >> > gnu/packages/man.scm | 4 +- >> > gnu/packages/maths.scm | 119 ++++++------ >> > gnu/packages/messaging.scm | 27 ++- >> > gnu/packages/mp3.scm | 87 ++++----- >> > gnu/packages/music.scm | 102 +++++----- >> > gnu/packages/noweb.scm | 79 ++++---- >> > gnu/packages/patchutils.scm | 120 ++++++------ >> > gnu/packages/pdf.scm | 69 +++---- >> > gnu/packages/perl.scm | 31 ++-- >> > gnu/packages/photo.scm | 15 +- >> > gnu/packages/popt.scm | 17 +- >> > gnu/packages/pretty-print.scm | 65 +++---- >> > gnu/packages/pumpio.scm | 32 ++-- >> > gnu/packages/python.scm | 47 +++-- >> > gnu/packages/rdf.scm | 40 ++-- >> > gnu/packages/regex.scm | 20 +- >> > gnu/packages/rrdtool.scm | 19 +- >> > gnu/packages/ruby.scm | 40 ++-- >> > gnu/packages/sawfish.scm | 50 ++--- >> > gnu/packages/scheme.scm | 134 +++++++------- >> > gnu/packages/sdl.scm | 46 ++--- >> > gnu/packages/serveez.scm | 15 +- >> > gnu/packages/skribilo.scm | 29 +-- >> > gnu/packages/smalltalk.scm | 17 +- >> > gnu/packages/suckless.scm | 4 +- >> > gnu/packages/tcl.scm | 15 +- >> > gnu/packages/telephony.scm | 12 +- >> > gnu/packages/textutils.scm | 25 ++- >> > gnu/packages/time.scm | 19 +- >> > gnu/packages/tor.scm | 14 +- >> > gnu/packages/uucp.scm | 24 +-- >> > gnu/packages/video.scm | 9 +- >> > gnu/packages/web-browsers.scm | 10 +- >> > gnu/packages/web.scm | 15 +- >> > gnu/packages/wicd.scm | 214 +++++++++++---------- >> > gnu/packages/wm.scm | 2 +- >> > gnu/packages/xdisorg.scm | 5 +- >> > gnu/packages/xfce.scm | 23 +-- >> > gnu/packages/xfig.scm | 75 ++++---- >> > gnu/packages/xorg.scm | 39 ++-- >> > 84 files changed, 2253 insertions(+), 2274 deletions(-) >>=20 >> Wow! That is a lot of code to review at once. Can you split this into >> maybe one patch per file? I guess some can be consolidated, but we >> should try to make each patch easily digestible both for current and >> future code reviewers. Hopefully we can alternate on the LGTMs. > > I agree, wow! Thanks for this. It should help new Schemers to feel more > comfortable editing packages. > > This might be annoying but it should wait until after the core-updates > branch is done and merged into the master branch. I want to minimize the > number of merge conflicts because they are 1) annoying and 2) relatively > opaque when reading the Git history. Marius's suggestion is another good > one, and would help with issues like that. > > But if we were to wait until after core-updates and push it as one > commit, I wouldn't mind. It's up to the two of you and everyone else :) Yeah I guess the squashed patch is okay. If we delay the patches until after 'staging' and 'python-updates' as well, no merge will be necessary. But it won't be a pretty cherry-pick either, by then. I don't really have a strong opinion either way. But I'd hate to the one resolving potentially 100s of merge conflicts at once ;-) Cherry-picking at least restricts the set of conflicts to these changes. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlmCMTIACgkQoqBt8qM6 VPqiBQf9HX4C2mgla8D4T/5+qRev8Jdb9VsZiZNoCKPgAt45QmbBP0PENR6pyi5a Atflq3DMlInlfU7LZTjx8fjXqsbb+cszanpaBtFdOjBFziDP8CXU/xeCUD/LGrSv oufPDu4+uAvWkB6pVYXrbyG8PIZOQoJEGFL9iigZv9tISkWIrrewMT+5X3NVV957 6zLMoQlTjcPklHkhxtZr8c3UXEOYsT0OeqXhtzIIqQX5ihqvBPMdAW0FmAi3arQ9 QnTgeLvzSm4zKC9O/hPrO8sVgmmxtL+z5hR+tA78qGLL2DGIswjmxABOpTo3FyHh ZeNQEB9ToXuSqGfDtpP8+z5QIXf9Pw== =RaoE -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 02 16:31:33 2017 Received: (at 27898) by debbugs.gnu.org; 2 Aug 2017 20:31:34 +0000 Received: from localhost ([127.0.0.1]:38946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dd0In-0000az-NX for submit@debbugs.gnu.org; Wed, 02 Aug 2017 16:31:33 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:59134 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dd0Im-0000ar-GI for 27898@debbugs.gnu.org; Wed, 02 Aug 2017 16:31:32 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 458EC4EB926; Wed, 2 Aug 2017 22:31:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1501705891; bh=xhXJHh5C29s0io1Vk/4xXRaHCEF0j7oDT5i/91ChC38=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=z28yPrCvOrRdFM0qB6a3AIkA0LxCgxYGanxfKaGTZjcBiHGJyya8A4F9/WmkH8rs7 78Yez1eaq1C1fVAZn2yQw7E1BLuNqp6w2xMdJEQ4gla8c2qcahJ7z05+VGMX3bc6CD lfp/K3Xq421u7n2hwkbtSqWxcthdVm1ujF/SoqmY= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR002 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1501705890; bh=xhXJHh5C29s0io1Vk/4xXRaHCEF0j7oDT5i/91ChC38=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=YY+lC6r2v3dewAVHbgDh6iaudXyrjfszxRWTDOrE9ZoWoR3++q/lCdjO1UiRuFxgv +Ax96a+1hGvubw5N4ZpJUkKF08mC3jxHQbuXNDDQWwzN7gs1PA/2+ebpk+ab/g1Nyw a4rQ/seQFIwHcFXo7C+JywKmwSX86nrDolC5N3hY= To: Leo Famulari Subject: Re: [bug#27898] [PATCH 2/2] gnu: Put autoconf-related phases immediately after the 'unpack phase. References: <20170801072153.19077-1-kei@openmailbox.org> <20170801072153.19077-2-kei@openmailbox.org> <87k22lwys2.fsf@fastmail.com> <20170802194515.GC13105@jasmine.lan> Date: Wed, 02 Aug 2017 16:31:08 -0400 In-Reply-To: <20170802194515.GC13105@jasmine.lan> (Leo Famulari's message of "Wed, 2 Aug 2017 15:45:15 -0400") Message-ID: <87k22l4sqb.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 Cc: Marius Bakke , 27898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Leo Famulari writes: > On Wed, Aug 02, 2017 at 09:33:01PM +0200, Marius Bakke wrote: >> Kei Kebreau writes: > > [... move autoconf phases ...] > >> Phew! This too will cause a lot of rebuilds, but I guess we could put it >> on 'staging'. It would have to be committed just before starting it to >> reduce the amount of merge conflicts. > > Agreed > >> That said, I'm not sure how necessary this change is, but I don't have a >> strong argument against it. Other opinions welcome! > > I guess there is a correct ordering and an incorrect ordering, depending > on whether or not these phases should happen before or after the shebang > patching phases. Does it work if it happens before the shebangs are > patched? > What does the "it" in "does it work" mean here? If you mean the builds themselves, then no. Success isn't guaranteed because the configure scripts might not be patched, as the patching phases are finished before the "build" phases. This change ensures that the "patch-usr-bin-file" phase can operate on generated configure scripts if necessary: https://lists.gnu.org/archive/html/guix-devel/2017-07/msg00124.html >> Maybe we could add an '#:autoreconf?' parameter to gnu-build-system, >> which runs `autoreconf -vif` in a phase and automatically pulls in >> automake and autoconf (and probably also libtool). Thoughts? > > Interesting! I agree. It would cut down on repetitive, common code and potential for "autoreconf-ing" incorrectly. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlmCNowACgkQ5qXuPBlG eg2QOw/9Hf6PV2ZIZa+r2fzbhx4xFKEyJAPG21/YtL6rEsLze3Mdm+AFFHQ+6Lkr 96mdBi3Xqz68aINITUiCtqwmx4kf428E0ntz4k2U2eAXzDnfswQxLVjKxjRaxJl8 zfG3TAklZdJr4dhm5oatJK6Lp+4SG+/5/T041vPRNWGkHoW4Qek8KARltkILxpAr FfJwHwhikId8749f7Gnz54h1o4W+/waPg1st+AcHf7y9XVI/fHJxccJUcGfWne2S nIFFs08yy7krqE89oWauH3xD0Ya3JHZjFlBCoJs5FOSupyY2eXB7lv4HlSeRMjH+ 3ZxXUIcv4lGqdoP23G7mxVe+cNxWFnimp5GJbwIpWsSF5nuuHrzaAcV2sAPS5m3T YNSvO7r9OCIoezvC4O7ICuWYRnGgsA2C0dHcCEAq12lHEQheItFvDSOemN6EbkzL omjEWKX3da4AzHS4Fy444wvwdcYdkKQm2JVBrmgoc+Rrj25xt2uk8+Q967f3hsd0 2vbh6/HlcH6YkSHrXvw0sAc8SeiC0HHaiJ2BiQ3JzgzsVtvbwTmasoL1i9tlBeR4 Bi7iPpAGb16oe65K196oiEFXL6INvkiEMvtIokGwda67vWoc0WAehcj7acAKx9uh gpjxRe2TJx7Et94Kotb2TdwkQXcRDTm74D02fDe8qWJAjxNL4mE= =tmXp -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 02 16:39:09 2017 Received: (at 27898) by debbugs.gnu.org; 2 Aug 2017 20:39:09 +0000 Received: from localhost ([127.0.0.1]:38952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dd0Q8-0000lG-Ho for submit@debbugs.gnu.org; Wed, 02 Aug 2017 16:39:09 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:44940 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dd0Q6-0000l8-TS for 27898@debbugs.gnu.org; Wed, 02 Aug 2017 16:39:07 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 746D64EBBCE; Wed, 2 Aug 2017 22:38:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1501706324; bh=HtBpYwXkQnR/l9h70zyhABJNc6IexOJicdcX3p+/nm0=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=YAvOYKGIXZ4xHoGzEpsDa1qOsZX0vcJRR4BpR7xGsPaWaAb9LiLHneuUtI9fcD8LE rVYnNG9oXZrR6d101k/3RTrTp+GgTnYhBrYcwPLGjyJdc70+9Te+OuggnV15pZIz0C gkEm0PnxP4vQHMpvuv8pQj/WfFCtWJAtUt36fQ1Y= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR002 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1501706322; bh=HtBpYwXkQnR/l9h70zyhABJNc6IexOJicdcX3p+/nm0=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=PuFGG1TutBmxgjvkzDf9Ohy5x0HV+Vf8gfnmvObVWX+Zig6Ph3jKp9f/WL6MxMjXL EN+ZG2NFmQXuvOyDRFE4ID422Pihs1HA2nG/vlI4Y5Hs/dO1LgmoIeojzW2fwuljw0 NBXMl/ellkukkcLcvy+0a4x76mHkobKSxZK4GPLs= To: Marius Bakke Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. References: <871sov69jq.fsf@openmailbox.org> <20170801072153.19077-1-kei@openmailbox.org> <87mv7hwzqu.fsf@fastmail.com> <20170802194148.GB13105@jasmine.lan> <87fud9wx59.fsf@fastmail.com> Date: Wed, 02 Aug 2017 16:38:36 -0400 In-Reply-To: <87fud9wx59.fsf@fastmail.com> (Marius Bakke's message of "Wed, 02 Aug 2017 22:08:18 +0200") Message-ID: <87h8xp4sdv.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 Cc: 27898@debbugs.gnu.org, Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Marius Bakke writes: > Leo Famulari writes: > >> On Wed, Aug 02, 2017 at 09:12:09PM +0200, Marius Bakke wrote: >>> Kei Kebreau writes: >>>=20 >>> > * gnu/packages/admin.scm (mingetty, clusterssh, sudo, >>> > wpa-supplicant-minimal, >>> > wpa-supplicant, wakelan, acpica, tree, direvent, dstat)[arguments]: U= se >>> > 'modify-phases' syntax. >>> > * gnu/packages/algebra.scm (arb)[arguments]: Likewise. >>> > * gnu/packages/apr.scm (apr-util)[arguments]: Likewise. >>> > * gnu/packages/audio.scm (clalsadrv, fluidsynth, faad2, lv2-mda-piano, >>> > lv2-mda-epiano, timidity++, vamp, soundtouch, portaudio, rsound, >>> > zita-convolver, zita-alsa-pcmi)[arguments]: Likewise. >>> > * gnu/packages/backup.scm (rdup, btar)[arguments]: Likewise. >>> > * gnu/packages/bioinformatics.scm (bedops, bwa, crossmap, express, >>> > flexbar, grit, hisat, ngs-sdk, subread)[arguments]: Likewise. >>> > * gnu/packages/bittorrent.scm (transmission)[arguments]: Likewise. >>> > * gnu/packages/cdrom.scm (cd-discid)[arguments]: Likewise. >>> > * gnu/packages/compression.scm (sharutils)[arguments]: Likewise. >>> > * gnu/packages/conky.scm (conky)[arguments]: Likewise. >>> > * gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Likewise. >>> > * gnu/packages/debug.scm (delta, c-reduce)[arguments]: Likewise. >>> > * gnu/packages/display-managers.scm (slim)[arguments]: Likewise. >>> > * gnu/packages/dns.scm (dnsmasq)[arguments]: Likewise. >>> > * gnu/packages/emacs.scm (geiser, emacs-wget, bbdb)[arguments]: Likew= ise. >>> > * gnu/packages/engineering.scm (pcb)[arguments]: Likewise. >>> > * gnu/packages/firmware.scm (ath9k-htc-firmware)[arguments]: Likewise. >>> > * gnu/packages/flashing-tools.scm (flashrom)[arguments]: Likewise. >>> > * gnu/packages/fltk.scm (fltk)[arguments]: Likewise. >>> > * gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Likewise. >>> > * gnu/packages/gd.scm (perl-gd)[arguments]: Likewise. >>> > * gnu/packages/gimp.scm (gegl)[arguments]: Likewise. >>> > * gnu/packages/gkrellm.scm (gkrellm)[arguments]: Likewise. >>> > * gnu/packages/glib.scm (glibmm)[arguments]: Likewise. >>> > * gnu/packages/gl.scm (glew)[arguments]: Likewise. >>> > * gnu/packages/gnome.scm (icon-naming-utils, orbit2, libbonobo, gnome= -vfs, >>> > libgnome, libbonoboui, goffice-0.8, dconf)[arguments]: Likewise. >>> > * gnu/packages/gprolog.scm (gprolog)[arguments]: Likewise. >>> > * gnu/packages/gps.scm (gpscorrelate)[arguments]: Likewise. >>> > * gnu/packages/graphics.scm (agg)[arguments]: Likewise. >>> > * gnu/packages/gtk.scm (ganv, gtksourceview-2, guile-present, >>> > python2-pycairo) >>> > [arguments]: Likewise. >>> > * gnu/packages/guile.scm (guile-1.8)[arguments]: Likewise. >>> > * gnu/packages/guile-wm.scm (guile-wm)[arguments]: Likewise. >>> > * gnu/packages/hugs.scm (hugs)[arguments]: Likewise. >>> > * gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal) >>> > [arguments]: Likewise. >>> > * gnu/packages/image-viewers.scm (feh, sxiv)[arguments]: Likewise. >>> > * gnu/packages/libcanberra.scm (libcanberra)[arguments]: Likewise. >>> > * gnu/packages/libsigsegv.scm (libsigsegv)[arguments]: Likewise. >>> > * gnu/packages/linux.scm (zerofree, net-tools, bridge-utils, iw, fuse, >>> > unionfs-fuse/static, lm-sensors, i2c-tools, xsensors, perf, mdadm, li= baio, >>> > module-init-tools)[arguments]: Likewise. >>> > * gnu/packages/lisp.scm (ccl)[arguments]: Likewise. >>> > * gnu/packages/lout.scm (lout)[arguments]: Likewise. >>> > * gnu/packages/lua.scm (luajit)[arguments]: Likewise. >>> > * gnu/packages/machine-learning.scm (shogun)[arguments]: Likewise. >>> > * gnu/packages/mail.scm (exim)[arguments]: Likewise. >>> > * gnu/packages/man.scm (man-pages, txt2man)[arguments]: Likewise. >>> > * gnu/packages/maths.scm (lapack, superlu-dist, openlibm, openspecfun, >>> > suitesparse)[arguments]: Likewise. >>> > * gnu/packages/messaging.scm (bitlbee)[arguments]: Likewise. >>> > * gnu/packages/mp3.scm (libmad, id3lib, mp3info)[arguments]: Likewise. >>> > * gnu/packages/music.scm (solfege)[arguments]: Likewise. >>> > * gnu/packages/noweb.scm (noweb)[arguments]: Likewise. >>> > * gnu/packages/patchutils.scm (patchutils, quilt, colordiff)[argument= s]: >>> > Likewise. >>> > * gnu/packages/pdf.scm (xpdf, zathura-cb, zathura-ps, zathura-djvu, >>> > zathura-pdf-poppler, zathura, podofo, fbidag)[arguments]: Likewise. >>> > * gnu/packages/perl.scm (perl-file-list, perl-test-harness)[arguments= ]: >>> > Likewise. >>> > * gnu/packages/photo.scm (gphoto2)[arguments]: Likewise. >>> > * gnu/packages/popt.scm (popt)[arguments]: Likewise. >>> > * gnu/packages/pretty-print.scm (source-highlight, astyle)[arguments]: >>> > Likewise. >>> > * gnu/packages/pumpio.scm (pumpa)[arguments]: Likewise. >>> > * gnu/packages/python.scm (python-passlib, python-pycrypto, python2-e= mpy, >>> > python-sqlalchemy, python-docopt)[arguments]: Likewise. >>> > * gnu/packages/rdf.scm (lrdf)[arguments]: Likewise. >>> > * gnu/packages/regex.scm (tre)[arguments]: Likewise. >>> > * gnu/packages/rrdtool.scm (rrdtool)[arguments]: Likewise. >>> > * gnu/packages/ruby.scm (ruby-2.1, ruby-1.8)[arguments]: Likewise. >>> > * gnu/packages/sawfish.scm (sawfish)[arguments]: Likewise. >>> > * gnu/packages/scheme.scm (racket)[arguments]: Likewise. >>> > * gnu/packages/sdl.scm (guile-sdl)[arguments]: Likewise. >>> > * gnu/packages/serveez.scm (serveez)[arguments]: Likewise. >>> > * gnu/packages/skribilo.scm (skribilo)[arguments]: Likewise. >>> > * gnu/packages/smalltalk.scm (smalltalk)[arguments]: Likewise. >>> > * gnu/packages/suckless.scm (dmenu, slock)[arguments]: Likewise. >>> > * gnu/packages/tcl.scm (expect)[arguments]: Likewise. >>> > * gnu/packages/telephony.scm (commoncpp)[arguments]: Likewise. >>> > * gnu/packages/textutils.scm (recode, libgtextutils)[arguments]: >>> > Likewise. >>> > * gnu/packages/time.scm (time)[arguments]: Likewise. >>> > * gnu/packages/tor.scm (privoxy)[arguments]: Likewise. >>> > * gnu/packages/uucp.scm (uucp)[arguments]: Likewise. >>> > * gnu/packages/video.scm (libdvdnav-4)[arguments]: Likewise. >>> > * gnu/packages/web-browsers.scm (lynx)[arguments]: Likewise. >>> > * gnu/packages/web.scm (tinyproxy)[arguments]: Likewise. >>> > * gnu/packages/wicd.scm (wicd)[arguments]: Likewise. >>> > * gnu/packages/wm.scm (bspwm)[arguments]: Likewise. >>> > * gnu/packages/xdisorg.scm (sxhkd, xcape)[arguments]: Likewise. >>> > * gnu/packages/xfce.scm (xfconf)[arguments]: Likewise. >>> > * gnu/packages/xfig.scm (transfig)[arguments]: Likewise. >>> > * gnu/packages/xorg.scm (imake)[arguments]: Likewise. >>> > --- >>> > gnu/packages/admin.scm | 294 ++++++++++++++--------------- >>> > gnu/packages/algebra.scm | 31 ++-- >>> > gnu/packages/apr.scm | 25 ++- >>> > gnu/packages/audio.scm | 193 +++++++++---------- >>> > gnu/packages/backup.scm | 33 ++-- >>> > gnu/packages/bioinformatics.scm | 250 +++++++++++++------------ >>> > gnu/packages/bittorrent.scm | 33 ++-- >>> > gnu/packages/cdrom.scm | 2 +- >>> > gnu/packages/compression.scm | 16 +- >>> > gnu/packages/conky.scm | 31 ++-- >>> > gnu/packages/databases.scm | 102 +++++----- >>> > gnu/packages/debug.scm | 70 +++---- >>> > gnu/packages/display-managers.scm | 22 +-- >>> > gnu/packages/dns.scm | 2 +- >>> > gnu/packages/docbook.scm | 26 +-- >>> > gnu/packages/emacs.scm | 74 ++++---- >>> > gnu/packages/engineering.scm | 43 +++-- >>> > gnu/packages/firmware.scm | 48 ++--- >>> > gnu/packages/flashing-tools.scm | 21 +-- >>> > gnu/packages/fltk.scm | 42 ++--- >>> > gnu/packages/freedesktop.scm | 33 ++-- >>> > gnu/packages/gd.scm | 19 +- >>> > gnu/packages/gimp.scm | 30 +-- >>> > gnu/packages/gkrellm.scm | 4 +- >>> > gnu/packages/gl.scm | 2 +- >>> > gnu/packages/glib.scm | 33 ++-- >>> > gnu/packages/gnome.scm | 145 +++++++-------- >>> > gnu/packages/gprolog.scm | 17 +- >>> > gnu/packages/gps.scm | 19 +- >>> > gnu/packages/graphics.scm | 13 +- >>> > gnu/packages/gtk.scm | 80 ++++---- >>> > gnu/packages/guile-wm.scm | 81 ++++---- >>> > gnu/packages/guile.scm | 36 ++-- >>> > gnu/packages/hugs.scm | 61 +++--- >>> > gnu/packages/hurd.scm | 60 +++--- >>> > gnu/packages/image-viewers.scm | 14 +- >>> > gnu/packages/libcanberra.scm | 18 +- >>> > gnu/packages/libsigsegv.scm | 13 +- >>> > gnu/packages/linux.scm | 379 >>> > +++++++++++++++++++------------------- >>> > gnu/packages/lisp.scm | 61 +++--- >>> > gnu/packages/lout.scm | 142 +++++++------- >>> > gnu/packages/lua.scm | 2 +- >>> > gnu/packages/machine-learning.scm | 88 +++++---- >>> > gnu/packages/mail.scm | 90 ++++----- >>> > gnu/packages/man.scm | 4 +- >>> > gnu/packages/maths.scm | 119 ++++++------ >>> > gnu/packages/messaging.scm | 27 ++- >>> > gnu/packages/mp3.scm | 87 ++++----- >>> > gnu/packages/music.scm | 102 +++++----- >>> > gnu/packages/noweb.scm | 79 ++++---- >>> > gnu/packages/patchutils.scm | 120 ++++++------ >>> > gnu/packages/pdf.scm | 69 +++---- >>> > gnu/packages/perl.scm | 31 ++-- >>> > gnu/packages/photo.scm | 15 +- >>> > gnu/packages/popt.scm | 17 +- >>> > gnu/packages/pretty-print.scm | 65 +++---- >>> > gnu/packages/pumpio.scm | 32 ++-- >>> > gnu/packages/python.scm | 47 +++-- >>> > gnu/packages/rdf.scm | 40 ++-- >>> > gnu/packages/regex.scm | 20 +- >>> > gnu/packages/rrdtool.scm | 19 +- >>> > gnu/packages/ruby.scm | 40 ++-- >>> > gnu/packages/sawfish.scm | 50 ++--- >>> > gnu/packages/scheme.scm | 134 +++++++------- >>> > gnu/packages/sdl.scm | 46 ++--- >>> > gnu/packages/serveez.scm | 15 +- >>> > gnu/packages/skribilo.scm | 29 +-- >>> > gnu/packages/smalltalk.scm | 17 +- >>> > gnu/packages/suckless.scm | 4 +- >>> > gnu/packages/tcl.scm | 15 +- >>> > gnu/packages/telephony.scm | 12 +- >>> > gnu/packages/textutils.scm | 25 ++- >>> > gnu/packages/time.scm | 19 +- >>> > gnu/packages/tor.scm | 14 +- >>> > gnu/packages/uucp.scm | 24 +-- >>> > gnu/packages/video.scm | 9 +- >>> > gnu/packages/web-browsers.scm | 10 +- >>> > gnu/packages/web.scm | 15 +- >>> > gnu/packages/wicd.scm | 214 +++++++++++---------- >>> > gnu/packages/wm.scm | 2 +- >>> > gnu/packages/xdisorg.scm | 5 +- >>> > gnu/packages/xfce.scm | 23 +-- >>> > gnu/packages/xfig.scm | 75 ++++---- >>> > gnu/packages/xorg.scm | 39 ++-- >>> > 84 files changed, 2253 insertions(+), 2274 deletions(-) >>>=20 >>> Wow! That is a lot of code to review at once. Can you split this into >>> maybe one patch per file? I guess some can be consolidated, but we >>> should try to make each patch easily digestible both for current and >>> future code reviewers. Hopefully we can alternate on the LGTMs. One patch per file seems reasonable. >> >> I agree, wow! Thanks for this. It should help new Schemers to feel more >> comfortable editing packages. >> >> This might be annoying but it should wait until after the core-updates >> branch is done and merged into the master branch. I want to minimize the >> number of merge conflicts because they are 1) annoying and 2) relatively >> opaque when reading the Git history. Marius's suggestion is another good >> one, and would help with issues like that. >> >> But if we were to wait until after core-updates and push it as one >> commit, I wouldn't mind. It's up to the two of you and everyone else :) > > Yeah I guess the squashed patch is okay. If we delay the patches until > after 'staging' and 'python-updates' as well, no merge will be > necessary. But it won't be a pretty cherry-pick either, by then. > > I don't really have a strong opinion either way. But I'd hate to the one > resolving potentially 100s of merge conflicts at once ;-) Cherry-picking > at least restricts the set of conflicts to these changes. Delaying the packages is fine as long as necessary to get bigger and more difficult updates done first. It's a relatively simple change for most packages, so coming back to it after a while shouldn't be too bad (in theory). --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlmCOEwACgkQ5qXuPBlG eg2GOg//YDUE5tCtwvyiym3bC0HI/41b1QTuu/Y2UCc6DafOO5y4tccbb6tVly/u RkEDZ/oQtwRIfNpJZsgfMcXHnMBDTwxnTqWNfBI4zestPfgBZwMA43m+h9frLfe4 PoJa5C7hoxYD6to20kbuddGh4xOql6SiDyroF58xXX4JD2QQe9O+iCi1QZp4cuQV m/KIR7hNwXAN7ZKySB8LLNwSrt6G0/74Kw+jiOHk8xSVaLsnpJoSfW01NMup5O2l 9KakCjT4htavQl8KpdDWAEOt9t194cGYMBEMKrhZfGdfEtYXM8xk0Gud/uI/ZKV1 WF3xsx8o3I/891JqB6F8Vn2dK7fx4BexBxzxJUoU5YRm+QhEMoC25uxRh6xozoiH SzjN1aVqnMqDOegB1dGwmYSvXceCZCuA7yvdjrNHrKA9CXvBadI8md0QLTnhfxuO 2ZX6a6sB6KGkx3NthakBpCzksqNC87BBzg1P6TStdwjr7UHge6IUoKFR7P/qYiBQ zHgUorg1RPiia0eYbZjT1S8/p9mSUxhtQtC/2TrvTw3DziLgSbvsogRNVICUZXBy 2HuILz7vcBALE7BJvAC9Xi5CpNJcxMo4j8RxkP5BihPMgJp4IiVSRuRfbREebpP8 ADsrWyy8MOUGm1reXfEs3zs/x9Qh42PJHY1aKDtsJrofTrYrENY= =+ZOl -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 02 18:44:19 2017 Received: (at 27898) by debbugs.gnu.org; 2 Aug 2017 22:44:19 +0000 Received: from localhost ([127.0.0.1]:39080 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dd2NH-0007Nw-E9 for submit@debbugs.gnu.org; Wed, 02 Aug 2017 18:44:19 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:49233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dd2NF-0007No-Ow for 27898@debbugs.gnu.org; Wed, 02 Aug 2017 18:44:18 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 87C72213F4; Wed, 2 Aug 2017 18:44:17 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Wed, 02 Aug 2017 18:44:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=xHZ/PFkIEEUtqdJ5YfDaPYlgCIfiS+YZGO1RSp CtBdE=; b=wLOdHAc9e+jrleoAqOZCLADSfwZMBGhKKMajiVrSZ23pNljCNMXpdN p8s/mmjWalr7HYXpCRVkKYS4GBlNko2E1NtoMswEpO6b7RRjWYYCOqINCVhdSQBr jBRWhwAYkO3hmivnbGCoABMSKIOFEbIlwwPBytoc/yvgYhhrdE03k= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=xHZ/PFkIEEUtqdJ5Yf DaPYlgCIfiS+YZGO1RSpCtBdE=; b=RV49Morsaa5ypFPv/+c/Zg6sdn3y6H4nLX hgjzjJCERFk6LsDHVJDL56KDNqA2j+2PvFKqmcSWw3XOYPIbuvJIxRVW35Aaa3Id A+mFQggmZVg56h3IY8l8RNHTrv7v/CZd3UIYyZnRL59XzfDW8WX30Rx3SRMUXcfX JugM0AEztt4+iV+JH8gp/kRTrhS6O9wi0oTuIlVkSZIhVEe2gLpsmPRfzL6OiG7g m5HMKk2CB74dPq4cShCpBplWLvrSHWw9THCzrC9OQPDnWiTFRLI3o3/MBWhPtvmn Yd4+QVj74DlKTGK8ilkGEz1UB11zoAbg42IYGkU46vU/7o+ne+vw== X-ME-Sender: X-Sasl-enc: NGQrbjjAgbrGOk9n1nGQYWY+1LESXyUfvsS644/36DPm 1501713857 Received: from localhost (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id 47AA52464E; Wed, 2 Aug 2017 18:44:17 -0400 (EDT) Date: Wed, 2 Aug 2017 18:44:16 -0400 From: Leo Famulari To: Kei Kebreau Subject: Re: [bug#27898] [PATCH 2/2] gnu: Put autoconf-related phases immediately after the 'unpack phase. Message-ID: <20170802224416.GB14798@jasmine.lan> References: <20170801072153.19077-1-kei@openmailbox.org> <20170801072153.19077-2-kei@openmailbox.org> <87k22lwys2.fsf@fastmail.com> <20170802194515.GC13105@jasmine.lan> <87k22l4sqb.fsf@openmailbox.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="0eh6TmSyL6TZE2Uz" Content-Disposition: inline In-Reply-To: <87k22l4sqb.fsf@openmailbox.org> User-Agent: Mutt/1.8.3 (2017-05-23) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 Cc: Marius Bakke , 27898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --0eh6TmSyL6TZE2Uz Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Aug 02, 2017 at 04:31:08PM -0400, Kei Kebreau wrote: > Leo Famulari writes: > > I guess there is a correct ordering and an incorrect ordering, depending > > on whether or not these phases should happen before or after the shebang > > patching phases. Does it work if it happens before the shebangs are > > patched? >=20 > What does the "it" in "does it work" mean here? If you mean the > builds themselves, then no. Success isn't guaranteed because the > configure scripts might not be patched, as the patching phases are > finished before the "build" phases. This change ensures that the > "patch-usr-bin-file" phase can operate on generated configure scripts if > necessary: >=20 > https://lists.gnu.org/archive/html/guix-devel/2017-07/msg00124.html I'm sorry for sending that confusing sentence! You interpreted it correctly. Thank for the clarification! --0eh6TmSyL6TZE2Uz Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlmCVb8ACgkQJkb6MLrK fwgGSxAArHhdae/7yFB1Imz6NlI9iiLh0+9bLzTYwRTSs+bC3JaAN7VVm/uybzlz Uowgi4n7Gz/strtSFVtNc5hKfiW46Xin5nI0BNHYYc/KB8TnA2DgqFoTV/UJN290 j2KUVzYf8SAxhGOTaKNGm8sDJFtOnATNmf9whQEwLrFgmi6x2/alDMQ1O33RyLAw z7AhZnSjkBcnRnNHp677DjafOW5zVR3UJIeYn90IWbEV/BgEvt6DxzexEf1XrFJQ 9IVVKHZefNbwXb9b9g8eXLPE4lSpsrXHN3yqxqeR/RKPqpDAss7W8psmOps3n9oz mhjuIzs0gecV/cwvMZQVWQtgbdLyze4etN4zAgEU4GlWRSqB8/MezJhkE9hgdvsG KwUkOg2n3xx1AUBjMrRbERlR3UDnOoANeA4aH1YskAmDfJEa2jN0/Ju34QTq4JML MMpVFY+UaE07qKFOcPIhshGgIgqALrT6L+0SdClE/NuxeeJWDnPrb2d0dmNeqOrY nhAN9Ad4DpDriNSmEazUnFaSgEfuSgGADOcg6RuwW4pWhMN6E0KqijLDdcjyZHPj 0q+XLku/Pr65NzRPWxbX2z5GyvttNatTsYWfEkWJMRkFCzhf8K664pmO4OVgTWu1 deMZWzo8I/N4HTTjXqJNWmGaKX/HYo+R/+TZDbr3aM/No3eQafM= =2b3u -----END PGP SIGNATURE----- --0eh6TmSyL6TZE2Uz-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 02 18:46:18 2017 Received: (at 27898) by debbugs.gnu.org; 2 Aug 2017 22:46:18 +0000 Received: from localhost ([127.0.0.1]:39090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dd2PC-000051-2t for submit@debbugs.gnu.org; Wed, 02 Aug 2017 18:46:18 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:39501) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dd2PA-0008V2-9L for 27898@debbugs.gnu.org; Wed, 02 Aug 2017 18:46:16 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 295B520993; Wed, 2 Aug 2017 18:46:16 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Wed, 02 Aug 2017 18:46:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=mp6Y5yFFCvhqQNoXEYhzw09/xn7Ta9KacJiq0l NpQGc=; b=HuhjZZ91fmQ8RRejeCc2ghnwqu7FbhhpH0jzrkHsxQMVRklTYHwDIa eOQnkLvT68K6IVN9Q00TRN7ZNbWwOMnTCA+KytXYUtIdHGyxfbsnDcWzGpd35nkE GdHZITTeuCr507QMBa/nhJNuJSWi/j0TAcZiankEmC+FCjgw/JmE0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=mp6Y5yFFCvhqQNoXEY hzw09/xn7Ta9KacJiq0lNpQGc=; b=KGWhUpQA/zlQCHgU2AKW391hvThBysJFz6 iZtUI+czidjbR9e1cr6JpLA7h7tk7Ib+U3dAjkWmzdiiSmwd4s/ZuuHz5ok/8yOc thvpMKJgn3bF6U5OMfO8Cha57QDYIoazet7qpJPw4H57RVUHL0kf8Lgk5EArDhqg jNE7OREU2fchwdduz4uSFiuIxopa4D2DrsTLsXNzHWwwXvXfF8vNgC9ZSUxfQ3UG ylVayOsCbBBPyIW3BSg9j/NBBjuMtm8npuS6AJQB0GkBXANU4166SnevTnri5WSy noqDMQhleu/nWM3h93Us6rxSsw1pdEpjRYMLZVkWX3mstxIzzlvQ== X-ME-Sender: X-Sasl-enc: 9D0aJpqwvP2qCa1fYdoMg7E2yT8XYHDCTLgHvUGlbh58 1501713975 Received: from localhost (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id D41AA7E4F0; Wed, 2 Aug 2017 18:46:15 -0400 (EDT) Date: Wed, 2 Aug 2017 18:46:14 -0400 From: Leo Famulari To: Marius Bakke Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. Message-ID: <20170802224614.GC14798@jasmine.lan> References: <871sov69jq.fsf@openmailbox.org> <20170801072153.19077-1-kei@openmailbox.org> <87mv7hwzqu.fsf@fastmail.com> <20170802194148.GB13105@jasmine.lan> <87fud9wx59.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="s9fJI615cBHmzTOP" Content-Disposition: inline In-Reply-To: <87fud9wx59.fsf@fastmail.com> User-Agent: Mutt/1.8.3 (2017-05-23) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 Cc: Kei Kebreau , 27898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --s9fJI615cBHmzTOP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Aug 02, 2017 at 10:08:18PM +0200, Marius Bakke wrote: > Leo Famulari writes: > > I agree, wow! Thanks for this. It should help new Schemers to feel more > > comfortable editing packages. > > > > This might be annoying but it should wait until after the core-updates > > branch is done and merged into the master branch. I want to minimize the > > number of merge conflicts because they are 1) annoying and 2) relatively > > opaque when reading the Git history. Marius's suggestion is another good > > one, and would help with issues like that. > > > > But if we were to wait until after core-updates and push it as one > > commit, I wouldn't mind. It's up to the two of you and everyone else :) >=20 > Yeah I guess the squashed patch is okay. If we delay the patches until > after 'staging' and 'python-updates' as well, no merge will be > necessary. But it won't be a pretty cherry-pick either, by then. True, we should not wait *too* long. I think that doing it after core-updates and before staging and python-updates could be good compromise, because those branches touch a relatively small number of modules. WDYT? > I don't really have a strong opinion either way. But I'd hate to the one > resolving potentially 100s of merge conflicts at once ;-) Cherry-picking > at least restricts the set of conflicts to these changes. OTOH, if Kei doesn't have an unsquashed version of this patch, it will be annoying to split it up :) --s9fJI615cBHmzTOP Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlmCVjYACgkQJkb6MLrK fwghZA//SJ1poCCy9h0YgxDzAsJbDQJEltUX079JbqwB34EZRRFImAWVVnsaE6OQ L/mZU3ZOTrxaJGqPAmhneVZCp4B8SuPa/ouXTQ1LGdMFK2+Y0IBOJSsLAVUo06/D I5LqQR2A63fVnyhiTNhvigVeBW+aFAs5lNMenBSsk1vorqaD7724UXp9stKH5LWL z9hM2CpDx4A1EQKFr+WbY9ugxfxw9DnpIJCTUUSFvxdzlt4E1SG0ElL4k50yWls3 oYqT4gs5RQgfnOQpCDr090EvnbA03HwRiuU4NwGn5XoToJaeGp0m4RIYqeDOPUjI 8EIjrnr0th9gfYvV/mreo1FvtLH7BmOP719+kVbxb+5l6LvkLF6roKSymAR2x7ON 4AxxDJbTIuBLULSM5V+oFjX7oo7YDh73crQcKRHClCzBEYFE7/CDMOFiVIhW10h9 Ta6dKyY47c6SRo43RKLC13HPj06G73F1+qexRUzYnT7pJuicJmZrlE4nZ1AiI98T B8UlsO+6IEv1Y5aXQAdwwuAMnWr9V9aKKLzx4Q3Qe0+Z4vMCmRA7ZgTtuXr2PPbf xE+t96Pgz/6jE370sjKghyu6MOlJaNw5nChnQN6mHmoEoFI4LnDYjpIuS3GaquRa clPxHN32JaR6ztIg1MZXpGfLAuZkYidw4LiGWCs7nAXK6dcbi1Y= =rICT -----END PGP SIGNATURE----- --s9fJI615cBHmzTOP-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 02 18:54:18 2017 Received: (at 27898) by debbugs.gnu.org; 2 Aug 2017 22:54:18 +0000 Received: from localhost ([127.0.0.1]:39115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dd2Wv-00011X-QT for submit@debbugs.gnu.org; Wed, 02 Aug 2017 18:54:18 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:58995) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dd2Wt-00011O-Nq for 27898@debbugs.gnu.org; Wed, 02 Aug 2017 18:54:16 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 7BE322146D; Wed, 2 Aug 2017 18:54:15 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 02 Aug 2017 18:54:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=8FVRRdyHMTxoHPkVH/5riWwyc4vVsPvFEeOEWnbUA Gc=; b=oToDd44YtyQhd7pBdlT4DDjX3G7OUBnSy1mfPCJ1qWVJ6yIv0cq/mbIQN 7S8qsbI54BG539lhY025Qbnd/31FGArD59xJQpK7at7IktKMGwHroWlLN1IckpNb xKkPAJ55DWz20HRfVg+1op1z8rYQdr5KdC0zyHf28xOXiiBjqAdStZInSGI7rRNt eALIPpHspP9B9uFlTa+S72dY4kr6F3OJ3E4CIFDF/+vkaYuLHIDeLyF6CKryeGiv +VCdEI+NrcsW/sx4y/Ff+nFvGxll/5ZPkfygR8xQzdP68vfnh3Ba0RMY4ZvzGy9Y VSPn8eg4osRggyWIRzX/5kupgJuIw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=8FVRRdyHMTxoHPkVH/ 5riWwyc4vVsPvFEeOEWnbUAGc=; b=cnknEOvhld94xcuXqO1ur4sTxlFjGs6+Eh 5R5xYvroatMTm+Mf0Lx057UKJeuQinFuJjKgqHEQe0GpJTFJ1GWbdL3CTQ4wHngF qRfRDd5b52XcUBHwjEV/8CjFydlE7upYzftrGZ5jrOR5CBfCAWMFu1Vx9drwEaYK 7nS82ChQW5esT8fHi7CqmxTpDunZ5hzhusMh0Uip2W7RFo+Blx07RlJ32cfMl2c6 YiSwelfsxxMula+Zfwzzo61ZL3rE9VV9PaDtCLcE/1YUIxyWKyR3IjYuZn0mAWBO ZPUaKY+QdzLzfrktJ48lTSEQwA0Q+A942w9qKbJlfL4cN8ChXpPg== X-ME-Sender: X-Sasl-enc: e3vUbWi3Z+qlurR7oHq0Eyl5IUl6i/xJeM4KLpnTzQo7 1501714455 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 02EC57E51F; Wed, 2 Aug 2017 18:54:14 -0400 (EDT) From: Marius Bakke To: Leo Famulari Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. In-Reply-To: <20170802224614.GC14798@jasmine.lan> References: <871sov69jq.fsf@openmailbox.org> <20170801072153.19077-1-kei@openmailbox.org> <87mv7hwzqu.fsf@fastmail.com> <20170802194148.GB13105@jasmine.lan> <87fud9wx59.fsf@fastmail.com> <20170802224614.GC14798@jasmine.lan> User-Agent: Notmuch/0.25 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Thu, 03 Aug 2017 00:54:13 +0200 Message-ID: <8760e5wpgq.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 Cc: Kei Kebreau , 27898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Leo Famulari writes: > On Wed, Aug 02, 2017 at 10:08:18PM +0200, Marius Bakke wrote: >> Leo Famulari writes: >> > I agree, wow! Thanks for this. It should help new Schemers to feel more >> > comfortable editing packages. >> > >> > This might be annoying but it should wait until after the core-updates >> > branch is done and merged into the master branch. I want to minimize t= he >> > number of merge conflicts because they are 1) annoying and 2) relative= ly >> > opaque when reading the Git history. Marius's suggestion is another go= od >> > one, and would help with issues like that. >> > >> > But if we were to wait until after core-updates and push it as one >> > commit, I wouldn't mind. It's up to the two of you and everyone else :) >>=20 >> Yeah I guess the squashed patch is okay. If we delay the patches until >> after 'staging' and 'python-updates' as well, no merge will be >> necessary. But it won't be a pretty cherry-pick either, by then. > > True, we should not wait *too* long. I think that doing it after > core-updates and before staging and python-updates could be good > compromise, because those branches touch a relatively small number of > modules. WDYT? I think the least painful path is: * Merge 'core-updates'. * Merge to 'staging'. * * Branch 'python-updates' from staging. * Build staging. Sounds good? :-) >> I don't really have a strong opinion either way. But I'd hate to the one >> resolving potentially 100s of merge conflicts at once ;-) Cherry-picking >> at least restricts the set of conflicts to these changes. > > OTOH, if Kei doesn't have an unsquashed version of this patch, it will > be annoying to split it up :) Yeah. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlmCWBUACgkQoqBt8qM6 VPpWQAgAoTDcY3ShHoN7RuhNz+HFv6zrWo/UlDdU4FhrbHq/RMt3jUWbPOtJhCTg RTAaPOFEtaRkwpvm+seMmpPOOxbsCONDZ1Id3BXB/otXXWYcB9GA7rMCrNOPqbu+ 6BtF8DPT0at9PHd/2afBNMSmWj1uVwteGSwi34PtxNvW3WV5w4SWp7NITOEDPukt c9+ujdIuaQgsZHhmXxIkhzfkwjMCBoRYCAwqV48oHjtOig15k/oyGbqBL1SZ3p2D yWpySyGH2Amw4YCKZsQQffqOCVISIfncRZwP57tai1x3gNuvyI+73NBojKhyFemp cGQiyg/F4CAIiWVfVO6MXsDhCWvnxw== =NrMo -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 02 19:06:10 2017 Received: (at 27898) by debbugs.gnu.org; 2 Aug 2017 23:06:10 +0000 Received: from localhost ([127.0.0.1]:39123 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dd2iP-0001If-WB for submit@debbugs.gnu.org; Wed, 02 Aug 2017 19:06:10 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:48909) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dd2iO-0001IX-5d for 27898@debbugs.gnu.org; Wed, 02 Aug 2017 19:06:08 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id E2B5D209FD; Wed, 2 Aug 2017 19:06:07 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Wed, 02 Aug 2017 19:06:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=TSJamTzz43itGYxqPpoIf+AoBGBp2Ti39QcwYSUUB mA=; b=yeH2cCVKKuipZfkNIRhs+S9OgFdltkJeRG3Rngy9xCBQqp4SCCIo5Sok2 ffML2Y+kKdnpqogdXg92TEJBJaUx7gYO0j2MQeoBuAo33Dj75mcJRJlXWKu2bAy7 1RV7vBqF786kdfSimUJ9apsNWdSTFeLklXWzUuHoZvXpMNN0Hxorf0kQ6LHxeocT 3j3Htx+78fdvnXilhtMLMN7XbMmhv5DcvDFRfqQvJDAmUdulQznyJE5OoPZVEtxg 54bYS1Actj/zCzqIFqIVryzLF8NmBCTXIKkdbVOcIFP+YjmrVQ4nv9gPdN6hTsR5 dLZX4mE0UTMPGaX8wvgsOHm8UNMyw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=TSJamTzz43itGYxqPp oIf+AoBGBp2Ti39QcwYSUUBmA=; b=T03Z6jpezUDFuEhgWcovZK28PlomRUaHLS wyqqhnGEjmCvJ7uPUFYJ668JH7RBZ4IIYwHCBRMAlzrf+b/OaL8araSZLr2hXkc0 Iw4n9bVC5enhGYLlBqXDg2t7t8Ke/60soUzsrssL/7X+SlvN6pcliYI9HfDSp/28 h+oTcz+MhF5dTx6Y2HbnVOGKCj3ukifdBjmmiAgUyLBESn+CJR5TIdubg6YodKhv yT5z2rmWOAQ2kt5FjoklvC71MDiQZB5OidQTQXUjGsgzfgctFP/GpQlB0daK448S lr/SQyULmugiifdbhXLyYLbg0RMvYThGN0A3ShlJrF6S8TlhKaGw== X-ME-Sender: X-Sasl-enc: ZsIrGzcGSQhklYN0oZgWliUQzeD/qmedfcDiYuTk/EM+ 1501715167 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 745627E4F0; Wed, 2 Aug 2017 19:06:07 -0400 (EDT) From: Marius Bakke To: Leo Famulari Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. In-Reply-To: <8760e5wpgq.fsf@fastmail.com> References: <871sov69jq.fsf@openmailbox.org> <20170801072153.19077-1-kei@openmailbox.org> <87mv7hwzqu.fsf@fastmail.com> <20170802194148.GB13105@jasmine.lan> <87fud9wx59.fsf@fastmail.com> <20170802224614.GC14798@jasmine.lan> <8760e5wpgq.fsf@fastmail.com> User-Agent: Notmuch/0.25 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Thu, 03 Aug 2017 01:06:05 +0200 Message-ID: <871sotwowy.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 Cc: Kei Kebreau , 27898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Marius Bakke writes: > Leo Famulari writes: > >> On Wed, Aug 02, 2017 at 10:08:18PM +0200, Marius Bakke wrote: >>> Leo Famulari writes: >>> > I agree, wow! Thanks for this. It should help new Schemers to feel mo= re >>> > comfortable editing packages. >>> > >>> > This might be annoying but it should wait until after the core-updates >>> > branch is done and merged into the master branch. I want to minimize = the >>> > number of merge conflicts because they are 1) annoying and 2) relativ= ely >>> > opaque when reading the Git history. Marius's suggestion is another g= ood >>> > one, and would help with issues like that. >>> > >>> > But if we were to wait until after core-updates and push it as one >>> > commit, I wouldn't mind. It's up to the two of you and everyone else = :) >>>=20 >>> Yeah I guess the squashed patch is okay. If we delay the patches until >>> after 'staging' and 'python-updates' as well, no merge will be >>> necessary. But it won't be a pretty cherry-pick either, by then. >> >> True, we should not wait *too* long. I think that doing it after >> core-updates and before staging and python-updates could be good >> compromise, because those branches touch a relatively small number of >> modules. WDYT? > > I think the least painful path is: > > * Merge 'core-updates'. > * Merge to 'staging'. > * > * Branch 'python-updates' from staging. > * Build staging. > > Sounds good? :-) Actually we probably should swap 2 and 3 if we can take the rebuild hit on 'master'. I don't know how many rebuilds this will cause, but I guess as long as it's in the three-digit range it should not take too long. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlmCWt4ACgkQoqBt8qM6 VPpEaAgAqkCGnipI68l5jyqj4hcn7SLV7qPTH2C+146afi5gEb0zZ+pvEN8WdxLW uTwmR/FY7E2gJkxN4WrPerPQ+0k4MCJuE9ZlMnfXuUt7acI8J9qOzOEctaeA/OIC ngKQcQUZ+9FUwAVvMMCFkZflNpbzMBX811UaV+1e2/Comd3urbmX8obBmEWYIeb5 ld1LJcXY9SVv4b+x8R7mvoIXyxJE16ms8iHqIX7BZYtkSNii9TXN6MTZVth51zhj 4EmcyqUawg6FLmoSE0twgWT52O2vlj3CJ+50EMUOrefwAURKaf+/kDaHfv6lWzMs 7gn358tkQnEjNX+s9QqAmjKDiNk5QQ== =xaqA -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 27 06:44:57 2017 Received: (at 27898) by debbugs.gnu.org; 27 Aug 2017 10:44:57 +0000 Received: from localhost ([127.0.0.1]:57040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dlv3p-0000CD-Dc for submit@debbugs.gnu.org; Sun, 27 Aug 2017 06:44:57 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:35849) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dlv3m-0000C5-R3 for 27898@debbugs.gnu.org; Sun, 27 Aug 2017 06:44:55 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 2074221F41; Sun, 27 Aug 2017 06:44:54 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 27 Aug 2017 06:44:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=VK4rMIgPA8FkoM36RatAt0kA0pCEceL6Mnir+ADnV Jo=; b=hWlA5lb7EbI7u95tjVgDb1kigS0e4ohE9/Gup1XyBrc68dSfFc8GfFpbc scgmVekQr30oNxgHglU7OmTcCnSA//0su87E7RvQqc8qTYhZndL3Z2c/1ikrNdH4 IECZTIbM34AbkCqrSFl7aiFTejVIKByVS6q11OUx3B+6KVDR5SS5R+vsW9vVlmLQ kP3Y4pXbb+i8FcigW/dzPRn/SoBwVfB7WmpbC7oR4OmzbaeYCYTxWgGJBRYNzN3Y 1q/VpQqbwuyUiwoWAuPlmA2Z1cKSySnePoNVHmu/YwAI6azjNpf8rICoqnFcr+v3 t+AQs+kbD4e5p7BzFCoDkCnZUKXog== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=VK4rMIgPA8FkoM36Ra tAt0kA0pCEceL6Mnir+ADnVJo=; b=nSYP4d1rCi0dgUgu6z/FdBtakgzu2dvYRu QZaq3WqbyNH/WAgnL5YHlM7t/w03eamCrRtqx3602v20S5zw/8FJRxonjX2knJt2 dMlK11/Oneugzg7avamiYdbHELyzeK1iAUxAtxGFjc7A6lIE/mj95ozD72lU+bZm AzZRHgY8up96E8HcrfE2wvXewYR8yWhB6udfJp01tq86CG4P86NjqfaxZf0Q6v1x 9xAxNto36Acdg95h9UZXGF6V/i1TnnGmYL9wlPQNbXe2ax3iBad7cRqHycXoEBVu uK7JMt6SZtmJroO87bcB+jt1SbSgq3fxgYPL2eWz0tMWu8lEIfzQ== X-ME-Sender: X-Sasl-enc: 0InnOZCdyEjfMTRM+PeoMUPVa9S7Pm6QiwhaHeGqhEmw 1503830693 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 9F32A7FA5C; Sun, 27 Aug 2017 06:44:53 -0400 (EDT) From: Marius Bakke To: Kei Kebreau , 27898@debbugs.gnu.org Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. In-Reply-To: <20170801072153.19077-1-kei@openmailbox.org> References: <871sov69jq.fsf@openmailbox.org> <20170801072153.19077-1-kei@openmailbox.org> User-Agent: Notmuch/0.25 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sun, 27 Aug 2017 12:44:51 +0200 Message-ID: <87pobhz3vg.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 Cc: Kei Kebreau X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > * gnu/packages/admin.scm (mingetty, clusterssh, sudo, wpa-supplicant-minimal, > wpa-supplicant, wakelan, acpica, tree, direvent, dstat)[arguments]: Use > 'modify-phases' syntax. > * gnu/packages/algebra.scm (arb)[arguments]: Likewise. > * gnu/packages/apr.scm (apr-util)[arguments]: Likewise. > * gnu/packages/audio.scm (clalsadrv, fluidsynth, faad2, lv2-mda-piano, > lv2-mda-epiano, timidity++, vamp, soundtouch, portaudio, rsound, > zita-convolver, zita-alsa-pcmi)[arguments]: Likewise. > * gnu/packages/backup.scm (rdup, btar)[arguments]: Likewise. > * gnu/packages/bioinformatics.scm (bedops, bwa, crossmap, express, > flexbar, grit, hisat, ngs-sdk, subread)[arguments]: Likewise. > * gnu/packages/bittorrent.scm (transmission)[arguments]: Likewise. > * gnu/packages/cdrom.scm (cd-discid)[arguments]: Likewise. > * gnu/packages/compression.scm (sharutils)[arguments]: Likewise. > * gnu/packages/conky.scm (conky)[arguments]: Likewise. > * gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Likewise. > * gnu/packages/debug.scm (delta, c-reduce)[arguments]: Likewise. > * gnu/packages/display-managers.scm (slim)[arguments]: Likewise. > * gnu/packages/dns.scm (dnsmasq)[arguments]: Likewise. > * gnu/packages/emacs.scm (geiser, emacs-wget, bbdb)[arguments]: Likewise. > * gnu/packages/engineering.scm (pcb)[arguments]: Likewise. > * gnu/packages/firmware.scm (ath9k-htc-firmware)[arguments]: Likewise. > * gnu/packages/flashing-tools.scm (flashrom)[arguments]: Likewise. > * gnu/packages/fltk.scm (fltk)[arguments]: Likewise. > * gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Likewise. > * gnu/packages/gd.scm (perl-gd)[arguments]: Likewise. > * gnu/packages/gimp.scm (gegl)[arguments]: Likewise. > * gnu/packages/gkrellm.scm (gkrellm)[arguments]: Likewise. > * gnu/packages/glib.scm (glibmm)[arguments]: Likewise. > * gnu/packages/gl.scm (glew)[arguments]: Likewise. > * gnu/packages/gnome.scm (icon-naming-utils, orbit2, libbonobo, gnome-vfs, > libgnome, libbonoboui, goffice-0.8, dconf)[arguments]: Likewise. > * gnu/packages/gprolog.scm (gprolog)[arguments]: Likewise. > * gnu/packages/gps.scm (gpscorrelate)[arguments]: Likewise. > * gnu/packages/graphics.scm (agg)[arguments]: Likewise. > * gnu/packages/gtk.scm (ganv, gtksourceview-2, guile-present, python2-pycairo) > [arguments]: Likewise. > * gnu/packages/guile.scm (guile-1.8)[arguments]: Likewise. > * gnu/packages/guile-wm.scm (guile-wm)[arguments]: Likewise. > * gnu/packages/hugs.scm (hugs)[arguments]: Likewise. > * gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal) > [arguments]: Likewise. > * gnu/packages/image-viewers.scm (feh, sxiv)[arguments]: Likewise. > * gnu/packages/libcanberra.scm (libcanberra)[arguments]: Likewise. > * gnu/packages/libsigsegv.scm (libsigsegv)[arguments]: Likewise. > * gnu/packages/linux.scm (zerofree, net-tools, bridge-utils, iw, fuse, > unionfs-fuse/static, lm-sensors, i2c-tools, xsensors, perf, mdadm, libaio, > module-init-tools)[arguments]: Likewise. > * gnu/packages/lisp.scm (ccl)[arguments]: Likewise. > * gnu/packages/lout.scm (lout)[arguments]: Likewise. > * gnu/packages/lua.scm (luajit)[arguments]: Likewise. > * gnu/packages/machine-learning.scm (shogun)[arguments]: Likewise. > * gnu/packages/mail.scm (exim)[arguments]: Likewise. > * gnu/packages/man.scm (man-pages, txt2man)[arguments]: Likewise. > * gnu/packages/maths.scm (lapack, superlu-dist, openlibm, openspecfun, > suitesparse)[arguments]: Likewise. > * gnu/packages/messaging.scm (bitlbee)[arguments]: Likewise. > * gnu/packages/mp3.scm (libmad, id3lib, mp3info)[arguments]: Likewise. > * gnu/packages/music.scm (solfege)[arguments]: Likewise. > * gnu/packages/noweb.scm (noweb)[arguments]: Likewise. > * gnu/packages/patchutils.scm (patchutils, quilt, colordiff)[arguments]: > Likewise. > * gnu/packages/pdf.scm (xpdf, zathura-cb, zathura-ps, zathura-djvu, > zathura-pdf-poppler, zathura, podofo, fbidag)[arguments]: Likewise. > * gnu/packages/perl.scm (perl-file-list, perl-test-harness)[arguments]: > Likewise. > * gnu/packages/photo.scm (gphoto2)[arguments]: Likewise. > * gnu/packages/popt.scm (popt)[arguments]: Likewise. > * gnu/packages/pretty-print.scm (source-highlight, astyle)[arguments]: > Likewise. > * gnu/packages/pumpio.scm (pumpa)[arguments]: Likewise. > * gnu/packages/python.scm (python-passlib, python-pycrypto, python2-empy, > python-sqlalchemy, python-docopt)[arguments]: Likewise. > * gnu/packages/rdf.scm (lrdf)[arguments]: Likewise. > * gnu/packages/regex.scm (tre)[arguments]: Likewise. > * gnu/packages/rrdtool.scm (rrdtool)[arguments]: Likewise. > * gnu/packages/ruby.scm (ruby-2.1, ruby-1.8)[arguments]: Likewise. > * gnu/packages/sawfish.scm (sawfish)[arguments]: Likewise. > * gnu/packages/scheme.scm (racket)[arguments]: Likewise. > * gnu/packages/sdl.scm (guile-sdl)[arguments]: Likewise. > * gnu/packages/serveez.scm (serveez)[arguments]: Likewise. > * gnu/packages/skribilo.scm (skribilo)[arguments]: Likewise. > * gnu/packages/smalltalk.scm (smalltalk)[arguments]: Likewise. > * gnu/packages/suckless.scm (dmenu, slock)[arguments]: Likewise. > * gnu/packages/tcl.scm (expect)[arguments]: Likewise. > * gnu/packages/telephony.scm (commoncpp)[arguments]: Likewise. > * gnu/packages/textutils.scm (recode, libgtextutils)[arguments]: > Likewise. > * gnu/packages/time.scm (time)[arguments]: Likewise. > * gnu/packages/tor.scm (privoxy)[arguments]: Likewise. > * gnu/packages/uucp.scm (uucp)[arguments]: Likewise. > * gnu/packages/video.scm (libdvdnav-4)[arguments]: Likewise. > * gnu/packages/web-browsers.scm (lynx)[arguments]: Likewise. > * gnu/packages/web.scm (tinyproxy)[arguments]: Likewise. > * gnu/packages/wicd.scm (wicd)[arguments]: Likewise. > * gnu/packages/wm.scm (bspwm)[arguments]: Likewise. > * gnu/packages/xdisorg.scm (sxhkd, xcape)[arguments]: Likewise. > * gnu/packages/xfce.scm (xfconf)[arguments]: Likewise. > * gnu/packages/xfig.scm (transfig)[arguments]: Likewise. > * gnu/packages/xorg.scm (imake)[arguments]: Likewise. Hello Kei! 'core-updates' is now merged. Let's try to get this patch in. I've read through the changed variables and think we can handle it on 'master', except 'bdb-5.3' which will have to wait until the next 'core-updates' cycle. Can you double check that this won't cause more than a few hundred rebuilds? Thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlmioqQACgkQoqBt8qM6 VPoYWAf/QgA917pJl/wEUenKRy8uloYJ20DvqOJsoQm4PU/wytEdqkem+rm62Cx9 my9bp7XSQffRizObGwQZawesFtGaBX+AR9ZwxoLDEN0nJhP2pNk70//nHLe2g1s1 /hwnsCj2EJBNy9sTzYgbszSm2G1XT47NFF53KRa47zVHNZpHEunIOjBalpsQFN88 PYaCdGtAwZiL3KYrzdu0k6GPFCrcVZGJcgKDQZx9mgN70AV3DoYOoAPk8rEPYt6P wqVS787XcNkTurf3OZC8LkA7t1V7DbLA7hNJg3EDcfXoElN1K+1WtuDMAUpVFL1L tIa8FXr3JE+SC8X4OQyVcAYk1Bhy7w== =Fce7 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 27 06:48:26 2017 Received: (at 27898) by debbugs.gnu.org; 27 Aug 2017 10:48:26 +0000 Received: from localhost ([127.0.0.1]:57046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dlv7C-0000Hk-1o for submit@debbugs.gnu.org; Sun, 27 Aug 2017 06:48:26 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:48971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dlv7B-0000Hd-4G for 27898@debbugs.gnu.org; Sun, 27 Aug 2017 06:48:25 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 031B221B33; Sun, 27 Aug 2017 06:48:25 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 27 Aug 2017 06:48:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=kbpNoOMfquOU3I6iCCR5VM9NI+ywjWTr0sBqNrcJi YM=; b=kpwCS0LEWwXySeA3H/0m8jloOtf9MLMhKndtZnWM/roIgb+93U9a8UZO/ TKVfDfmWUTy72gxH7DwOHdv7U9QaoSoSDPqLWHuV9V3gJEERdvRsVlc7T1bx6lGZ 8H6Dz3RmkIcxE87vMlwfAo/yI06XpIxfOMiKchBjGovWJ66UZDtN6OU4QoyrH/Oz uW1oAkZcAwX/UHEKXDhr9Hrs5+LmyNB2iwi+pfzmkzdpjjw1FQNY8nXlP4M2WN96 fZH+q69nkfwN6qLYwajAsQQZFCFDWQ72oYtmlMur9lXPXVgcv60VI4z1s5oo5jdH 5ATv6876NcccY48JjM7eAaBtSKz7g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=kbpNoOMfquOU3I6iCC R5VM9NI+ywjWTr0sBqNrcJiYM=; b=aKHiMTfoVpiWE7n0cWDnmDA6HZMv+3v9jQ XJwKIixumjHXIhU6FKR+KyM1cnMWFT1mPH6c9x8oSGC6U6BjTRStDxuyeXhhJnoa QXIfmy+DR9hC3XCsy9EAuMVH9DWk5zxk8V9lNtoW1cRMYKOct8tXBUqJlo/TKTOA fOmFUMi90Lz8DtOZ7dPjNlJFr/sQBEueOqRHAXU+kX/LtWcMJbuClBlkpgdPzqIz tfQrOw9N52J6YtXr6TZtp5x1TPNLa3wMB9vOG0wZsYHVKtXHTqsdckpZcyF7BzL7 1jMOV0Sax92M97c6Jb9AeDQmeOuV/1a89E1PxRHbhwTSqHMz0SpQ== X-ME-Sender: X-Sasl-enc: E+npsYebmqTJ1pJIjrfRR0W8ZmwA8fT3ZngxsxHuYSTx 1503830904 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 842E97E271; Sun, 27 Aug 2017 06:48:24 -0400 (EDT) From: Marius Bakke To: Kei Kebreau , 27898@debbugs.gnu.org Subject: Re: [bug#27898] [PATCH 2/2] gnu: Put autoconf-related phases immediately after the 'unpack phase. In-Reply-To: <20170801072153.19077-2-kei@openmailbox.org> References: <20170801072153.19077-1-kei@openmailbox.org> <20170801072153.19077-2-kei@openmailbox.org> User-Agent: Notmuch/0.25 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sun, 27 Aug 2017 12:48:22 +0200 Message-ID: <87mv6lz3pl.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 Cc: Kei Kebreau X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > * gnu/packages/audio.scm (audacity, rtmidi)[arguments]: Correct phases > accordingly. > * gnu/packages/bioinformatics.scm (mash, seek, vsearch, emboss, > htslib-for-sambamba)[arguments]: Likewise. > * gnu/packages/ci.scm (cuirass)[arguments]: Likewise. > * gnu/packages/compression.scm (minizip, xdelta)[arguments]: Likewise. > * gnu/packages/cpp.scm (libzen)[arguments]: Likewise. > * gnu/packages/crypto.scm (opendht)[arguments]: Likewise. > * gnu/packages/databases.scm (4store, mdbtools)[arguments]: Likewise. > * gnu/packages/debug.scm (stress-make)[arguments]: Likewise. > * gnu/packages/dns.scm (dnscrypt-proxy, dnscrypt-wrapper)[arguments]: > Likewise. > * gnu/packages/emacs.scm (emacs-pdf-tools)[arguments]: Likewise. > * gnu/packages/embedded.scm (libjaylink, openocd)[arguments]: Likewise. > * gnu/packages/engineering.scm (gerbv)[arguments]: Likewise. > * gnu/packages/erlang.scm (erlang)[arguments]: Likewise. > * gnu/packages/ftp.scm (weex)[arguments]: Likewise. > * gnu/packages/gnome.scm (dia)[arguments]: Likewise. > * gnu/packages/gnunet.scm (gnurl, guile-gnunet)[arguments]: Likewise. > * gnu/packages/gtk.scm (guile-rsvg, graphene)[arguments]: Likewise. > * gnu/packages/guile.scm (guildhall, guile-ics, guile-sqlite3)[arguments]: > Likewise. > * gnu/packages/ibus.scm (ibus-libpinyin)[arguments]: Likewise. > * gnu/packages/irc.scm (weechat)[arguments]: Likewise. > * gnu/packages/java.scm (classpath-devel)[arguments]: Likewise. > * gnu/packages/libreoffice.scm (libetonyek)[arguments]: Likewise. > * gnu/packages/libusb.scm (hidapi)[arguments]: Likewise. > * gnu/packages/linux.scm (gpm)[arguments]: Likewise. > * gnu/packages/logging.scm (glog)[arguments]: Likewise. > * gnu/packages/machine-learning.scm (ghmm)[arguments]: Likewise. > * gnu/packages/mail.scm (dovecot-trees, dovecot-libsodium-plugin, esmtp) > [arguments]: Likewise. > * gnu/packages/maths.scm (wxmaxima)[arguments]: Likewise. > * gnu/packages/messaging.scm (freetalk, libmesode, libstrophe)[arguments]: > Likewise. > * gnu/packages/microcom.scm (microcom)[arguments]: Likewise. > * gnu/packages/ocaml.scm (ocaml-ssl)[arguments]: Likewise. > * gnu/packages/parallel.scm (slurm)[arguments]: Likewise. > * gnu/packages/pdf.scm (libharu)[arguments]: Likewise. > * gnu/packages/samba.scm (cifs-utils)[arguments]: Likewise. > * gnu/packages/serialization.scm (msgpack)[arguments]: Likewise. > * gnu/packages/shells.scm (scsh)[arguments]: Likewise. > * gnu/packages/telephony.scm (libiax2)[arguments]: Likewise. > * gnu/packages/textutils.scm (dotconf)[arguments]: Likewise. > * gnu/packages/version-control.scm (findnewest)[arguments]: Likewise. > * gnu/packages/video.scm (vlc, libmediainfo, mediainfo)[arguments]: Likewise. Same with this. Looks okay for 'master', but please double check before pushing. TIA! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlmio3cACgkQoqBt8qM6 VPoVhwf/fK+ugNvhbo5A2gZjFhz5ph1YThiBuHK45lKZ4fESgaeuvAxFRbpntlYe ePg3HIC7rXEy5dTbz49vsuphE2yJPmgKs4jfhQoEQztsNGjRIsTS6rmYnCSP4OKf HDjG2pdSkgCLlPVRp/dYVS7PXFX7RWjVe4Vv2r28n/WIi6eSWnkjPYW25Tb3Bt6v /RmmvA4uUgQIYjI0zFeh5YRVX40BHXpzXdHQcxLiKjJEHtHtiZ0FIKDp8EhqgcZb Ee2IeaOhlxuC16xMuGPKLKBEeNKIzUUy7gC5A/zkZ3L/QeSMEyNbJC9bVqMQKss7 BGb7pZK7v0UQb0EOv4Ow2Y/nARY0ZA== =Gi+5 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 28 14:16:19 2017 Received: (at 27898) by debbugs.gnu.org; 28 Aug 2017 18:16:19 +0000 Received: from localhost ([127.0.0.1]:59635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmOaA-0004lY-KL for submit@debbugs.gnu.org; Mon, 28 Aug 2017 14:16:19 -0400 Received: from mout02.posteo.de ([185.67.36.66]:39170) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmOQj-0004X5-Of for 27898@debbugs.gnu.org; Mon, 28 Aug 2017 14:06:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id BB3C420EFF for <27898@debbugs.gnu.org>; Mon, 28 Aug 2017 20:06:27 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3xh0824c0Vz10HS; Mon, 28 Aug 2017 20:06:26 +0200 (CEST) From: Kei Kebreau To: 27898@debbugs.gnu.org Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) Date: Mon, 28 Aug 2017 14:06:23 -0400 Message-ID: <87a82jzhwg.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -5.1 (-----) X-Debbugs-Envelope-To: 27898 X-Mailman-Approved-At: Mon, 28 Aug 2017 14:16:16 -0400 Cc: mbakke@fastmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.1 (-----) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable > Kei Kebreau writes: >=20 >> * gnu/packages/admin.scm (mingetty, clusterssh, sudo, wpa-supplicant-min= imal, >> wpa-supplicant, wakelan, acpica, tree, direvent, dstat)[arguments]: Use >> 'modify-phases' syntax. >> * gnu/packages/algebra.scm (arb)[arguments]: Likewise. >> * gnu/packages/apr.scm (apr-util)[arguments]: Likewise. >> * gnu/packages/audio.scm (clalsadrv, fluidsynth, faad2, lv2-mda-piano, >> lv2-mda-epiano, timidity++, vamp, soundtouch, portaudio, rsound, >> zita-convolver, zita-alsa-pcmi)[arguments]: Likewise. >> * gnu/packages/backup.scm (rdup, btar)[arguments]: Likewise. >> * gnu/packages/bioinformatics.scm (bedops, bwa, crossmap, express, >> flexbar, grit, hisat, ngs-sdk, subread)[arguments]: Likewise. >> * gnu/packages/bittorrent.scm (transmission)[arguments]: Likewise. >> * gnu/packages/cdrom.scm (cd-discid)[arguments]: Likewise. >> * gnu/packages/compression.scm (sharutils)[arguments]: Likewise. >> * gnu/packages/conky.scm (conky)[arguments]: Likewise. >> * gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Likewise. >> * gnu/packages/debug.scm (delta, c-reduce)[arguments]: Likewise. >> * gnu/packages/display-managers.scm (slim)[arguments]: Likewise. >> * gnu/packages/dns.scm (dnsmasq)[arguments]: Likewise. >> * gnu/packages/emacs.scm (geiser, emacs-wget, bbdb)[arguments]: Likewise. >> * gnu/packages/engineering.scm (pcb)[arguments]: Likewise. >> * gnu/packages/firmware.scm (ath9k-htc-firmware)[arguments]: Likewise. >> * gnu/packages/flashing-tools.scm (flashrom)[arguments]: Likewise. >> * gnu/packages/fltk.scm (fltk)[arguments]: Likewise. >> * gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Likewise. >> * gnu/packages/gd.scm (perl-gd)[arguments]: Likewise. >> * gnu/packages/gimp.scm (gegl)[arguments]: Likewise. >> * gnu/packages/gkrellm.scm (gkrellm)[arguments]: Likewise. >> * gnu/packages/glib.scm (glibmm)[arguments]: Likewise. >> * gnu/packages/gl.scm (glew)[arguments]: Likewise. >> * gnu/packages/gnome.scm (icon-naming-utils, orbit2, libbonobo, gnome-vf= s, >> libgnome, libbonoboui, goffice-0.8, dconf)[arguments]: Likewise. >> * gnu/packages/gprolog.scm (gprolog)[arguments]: Likewise. >> * gnu/packages/gps.scm (gpscorrelate)[arguments]: Likewise. >> * gnu/packages/graphics.scm (agg)[arguments]: Likewise. >> * gnu/packages/gtk.scm (ganv, gtksourceview-2, guile-present, python2-py= cairo) >> [arguments]: Likewise. >> * gnu/packages/guile.scm (guile-1.8)[arguments]: Likewise. >> * gnu/packages/guile-wm.scm (guile-wm)[arguments]: Likewise. >> * gnu/packages/hugs.scm (hugs)[arguments]: Likewise. >> * gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal) >> [arguments]: Likewise. >> * gnu/packages/image-viewers.scm (feh, sxiv)[arguments]: Likewise. >> * gnu/packages/libcanberra.scm (libcanberra)[arguments]: Likewise. >> * gnu/packages/libsigsegv.scm (libsigsegv)[arguments]: Likewise. >> * gnu/packages/linux.scm (zerofree, net-tools, bridge-utils, iw, fuse, >> unionfs-fuse/static, lm-sensors, i2c-tools, xsensors, perf, mdadm, libai= o, >> module-init-tools)[arguments]: Likewise. >> * gnu/packages/lisp.scm (ccl)[arguments]: Likewise. >> * gnu/packages/lout.scm (lout)[arguments]: Likewise. >> * gnu/packages/lua.scm (luajit)[arguments]: Likewise. >> * gnu/packages/machine-learning.scm (shogun)[arguments]: Likewise. >> * gnu/packages/mail.scm (exim)[arguments]: Likewise. >> * gnu/packages/man.scm (man-pages, txt2man)[arguments]: Likewise. >> * gnu/packages/maths.scm (lapack, superlu-dist, openlibm, openspecfun, >> suitesparse)[arguments]: Likewise. >> * gnu/packages/messaging.scm (bitlbee)[arguments]: Likewise. >> * gnu/packages/mp3.scm (libmad, id3lib, mp3info)[arguments]: Likewise. >> * gnu/packages/music.scm (solfege)[arguments]: Likewise. >> * gnu/packages/noweb.scm (noweb)[arguments]: Likewise. >> * gnu/packages/patchutils.scm (patchutils, quilt, colordiff)[arguments]: >> Likewise. >> * gnu/packages/pdf.scm (xpdf, zathura-cb, zathura-ps, zathura-djvu, >> zathura-pdf-poppler, zathura, podofo, fbidag)[arguments]: Likewise. >> * gnu/packages/perl.scm (perl-file-list, perl-test-harness)[arguments]: >> Likewise. >> * gnu/packages/photo.scm (gphoto2)[arguments]: Likewise. >> * gnu/packages/popt.scm (popt)[arguments]: Likewise. >> * gnu/packages/pretty-print.scm (source-highlight, astyle)[arguments]: >> Likewise. >> * gnu/packages/pumpio.scm (pumpa)[arguments]: Likewise. >> * gnu/packages/python.scm (python-passlib, python-pycrypto, python2-empy, >> python-sqlalchemy, python-docopt)[arguments]: Likewise. >> * gnu/packages/rdf.scm (lrdf)[arguments]: Likewise. >> * gnu/packages/regex.scm (tre)[arguments]: Likewise. >> * gnu/packages/rrdtool.scm (rrdtool)[arguments]: Likewise. >> * gnu/packages/ruby.scm (ruby-2.1, ruby-1.8)[arguments]: Likewise. >> * gnu/packages/sawfish.scm (sawfish)[arguments]: Likewise. >> * gnu/packages/scheme.scm (racket)[arguments]: Likewise. >> * gnu/packages/sdl.scm (guile-sdl)[arguments]: Likewise. >> * gnu/packages/serveez.scm (serveez)[arguments]: Likewise. >> * gnu/packages/skribilo.scm (skribilo)[arguments]: Likewise. >> * gnu/packages/smalltalk.scm (smalltalk)[arguments]: Likewise. >> * gnu/packages/suckless.scm (dmenu, slock)[arguments]: Likewise. >> * gnu/packages/tcl.scm (expect)[arguments]: Likewise. >> * gnu/packages/telephony.scm (commoncpp)[arguments]: Likewise. >> * gnu/packages/textutils.scm (recode, libgtextutils)[arguments]: >> Likewise. >> * gnu/packages/time.scm (time)[arguments]: Likewise. >> * gnu/packages/tor.scm (privoxy)[arguments]: Likewise. >> * gnu/packages/uucp.scm (uucp)[arguments]: Likewise. >> * gnu/packages/video.scm (libdvdnav-4)[arguments]: Likewise. >> * gnu/packages/web-browsers.scm (lynx)[arguments]: Likewise. >> * gnu/packages/web.scm (tinyproxy)[arguments]: Likewise. >> * gnu/packages/wicd.scm (wicd)[arguments]: Likewise. >> * gnu/packages/wm.scm (bspwm)[arguments]: Likewise. >> * gnu/packages/xdisorg.scm (sxhkd, xcape)[arguments]: Likewise. >> * gnu/packages/xfce.scm (xfconf)[arguments]: Likewise. >> * gnu/packages/xfig.scm (transfig)[arguments]: Likewise. >> * gnu/packages/xorg.scm (imake)[arguments]: Likewise. >=20 > Hello Kei! >=20 > 'core-updates' is now merged. Let's try to get this patch in. >=20 > I've read through the changed variables and think we can handle it on > 'master', except 'bdb-5.3' which will have to wait until the next > 'core-updates' cycle. Can you double check that this won't cause more > than a few hundred rebuilds? >=20 > Thanks! How does 1301 rebuilds sound? P.S. It seems that I have to type the patch a second time, so it may be a while until I am able to push to master. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlmkW6AACgkQ5qXuPBlG eg3a/Q//d1fIkllk/tacLCMEUtDUjHfj2wTybj2LGmu2Mg4Et4zDdSHwqsqBNZWj VQAr8GRLF3Gq+vtlpjZVJVZA0hH4gbCZsmpDLqZ7FzhFXmBn3t8JjxOA6ZFSeKLu 7HM2q7X+09kBRCYhgwifasx2gO320tgHibWUjoeSovxhCiL89xrJW4oVhGXcbp5w 05NjGsfnwwekA6F7BUkPa94QAs3zUtoWznrSnsUy7Vgub0IUVlCR6VKESm/S/KR1 dycB+H87H9RQLkxsOItZKtJcHVaHY5nmThZqP+jFV8AXSu7gKu2jhWI6L/oQ6myl kwzglWZhKbWgLrTiu0O5LqkETIvUCBFc7mCsq8T1Adw0kM+uVXKzRUr9C0abNuCB OA9IAv39bbwydjXwrHZyZMeG7kzLlgpXFXjjAXQbILaFi6SwajwYMEQwxVVP27Tk nr3M8flmtYGE6AJL1vr3TF8T/Ld+K643/SHpLL6BGcFbx1JBIy/m275r2AlxYcB9 rZ8qSorxJpTSJ6Xlpeal+w2JIgHN18pb69tbMmWqdTST/4gH0wF6fT5QStBaLdnJ kif5y1MO+PmfL9bEPJ5qEHVgxqk7t0+mA57DQRDJRI4D6HFxwiv1TcjHMHJDEGnR 6ZWgOjMt+3YrtyuJiqkFmUOhT2Trkee4Dhn1SJMTq5ASwoPI9eU= =0p1l -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 28 16:49:06 2017 Received: (at 27898) by debbugs.gnu.org; 28 Aug 2017 20:49:06 +0000 Received: from localhost ([127.0.0.1]:59740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmQy1-0001ny-U0 for submit@debbugs.gnu.org; Mon, 28 Aug 2017 16:49:06 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:53211) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmQxz-0001np-Mg for 27898@debbugs.gnu.org; Mon, 28 Aug 2017 16:49:04 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 607E020EF3; Mon, 28 Aug 2017 16:49:03 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 28 Aug 2017 16:49:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=N87/qbAIhL6B9Nts73ygzGhcft1wL9xstEyJNALu1 GE=; b=BZJSObRFy81DJq6pJQ7wIcd3nxQsb3DlGj0G2E0UN6CHJr2Qlo2Di/bAT MFecJ11HVFD4jeRd+TCIz+3SFszEDZWCn8kBEFtdb+QSdn6O9f4jPcrPrFmiAjxY nHpCtoTmAp8u5GEeU3F/TaswOdw7/zFsJ01cA+8XWRvF/Tav341M7YDEvSkuxHWT VcGzGPG5qRxsf0H559CLfoPgxMQBkr1uTWg/nBoQ5IeIbyT42TCPj4jL6eMx11Qh XqfoMb93HUwn8Fo73dnxnjy95PPVkLsJdS6i/qdo5zOoUnoIogzD7rc11IWA7AV+ zKkZPVgYZbZLm+a3k/I22KFqY0rRw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=N87/qbAIhL6B9Nts73 ygzGhcft1wL9xstEyJNALu1GE=; b=QQ4z+l28lhGjkzNz+0aJNXJwyMi9Ac/Edj qDWP/SfXIaOMIEAdoHvrBV1hPx4URilAonr6IOimBpdbLqGhKF20ati4ekq1Ymjj Yu8t3C684C/DrK32J0NvS8Dp0Rbg5ItMlquUr5L6k8OrNsOKq9Vy9GAR3XZ+I2yp z/hl/NuvGHQmRdJ+RM5tkABpbLpH8VjPcaARbDWG5eAdzYIq+YKkj4Rxs9g8DJlf xydc9TWuJjnPaxFzpZ0RJW+TbZk+pguCWsAensKzF5BcAJMRZZ7M7TRyRm61x9dF ckM5wq2OMuxkRdQXVMmahWv+911W4PSO3JHFX7ws6udXod8C25ow== X-ME-Sender: X-Sasl-enc: qQ0mD986E2yZ3NHrstGhEF+0OEcWVLVPqkr3t/bxV+ay 1503953342 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id E857A7E271; Mon, 28 Aug 2017 16:49:02 -0400 (EDT) From: Marius Bakke To: Kei Kebreau , 27898@debbugs.gnu.org Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. In-Reply-To: <87a82jzhwg.fsf@posteo.net> References: <87a82jzhwg.fsf@posteo.net> User-Agent: Notmuch/0.25 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Mon, 28 Aug 2017 22:49:01 +0200 Message-ID: <878ti3zade.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Kei Kebreau writes: >> Kei Kebreau writes: >>=20 >>> * gnu/packages/admin.scm (mingetty, clusterssh, sudo, wpa-supplicant-mi= nimal, >>> wpa-supplicant, wakelan, acpica, tree, direvent, dstat)[arguments]: Use >>> 'modify-phases' syntax. >>> * gnu/packages/algebra.scm (arb)[arguments]: Likewise. >>> * gnu/packages/apr.scm (apr-util)[arguments]: Likewise. >>> * gnu/packages/audio.scm (clalsadrv, fluidsynth, faad2, lv2-mda-piano, >>> lv2-mda-epiano, timidity++, vamp, soundtouch, portaudio, rsound, >>> zita-convolver, zita-alsa-pcmi)[arguments]: Likewise. >>> * gnu/packages/backup.scm (rdup, btar)[arguments]: Likewise. >>> * gnu/packages/bioinformatics.scm (bedops, bwa, crossmap, express, >>> flexbar, grit, hisat, ngs-sdk, subread)[arguments]: Likewise. >>> * gnu/packages/bittorrent.scm (transmission)[arguments]: Likewise. >>> * gnu/packages/cdrom.scm (cd-discid)[arguments]: Likewise. >>> * gnu/packages/compression.scm (sharutils)[arguments]: Likewise. >>> * gnu/packages/conky.scm (conky)[arguments]: Likewise. >>> * gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Likewise. >>> * gnu/packages/debug.scm (delta, c-reduce)[arguments]: Likewise. >>> * gnu/packages/display-managers.scm (slim)[arguments]: Likewise. >>> * gnu/packages/dns.scm (dnsmasq)[arguments]: Likewise. >>> * gnu/packages/emacs.scm (geiser, emacs-wget, bbdb)[arguments]: Likewis= e. >>> * gnu/packages/engineering.scm (pcb)[arguments]: Likewise. >>> * gnu/packages/firmware.scm (ath9k-htc-firmware)[arguments]: Likewise. >>> * gnu/packages/flashing-tools.scm (flashrom)[arguments]: Likewise. >>> * gnu/packages/fltk.scm (fltk)[arguments]: Likewise. >>> * gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Likewise. >>> * gnu/packages/gd.scm (perl-gd)[arguments]: Likewise. >>> * gnu/packages/gimp.scm (gegl)[arguments]: Likewise. >>> * gnu/packages/gkrellm.scm (gkrellm)[arguments]: Likewise. >>> * gnu/packages/glib.scm (glibmm)[arguments]: Likewise. >>> * gnu/packages/gl.scm (glew)[arguments]: Likewise. >>> * gnu/packages/gnome.scm (icon-naming-utils, orbit2, libbonobo, gnome-v= fs, >>> libgnome, libbonoboui, goffice-0.8, dconf)[arguments]: Likewise. >>> * gnu/packages/gprolog.scm (gprolog)[arguments]: Likewise. >>> * gnu/packages/gps.scm (gpscorrelate)[arguments]: Likewise. >>> * gnu/packages/graphics.scm (agg)[arguments]: Likewise. >>> * gnu/packages/gtk.scm (ganv, gtksourceview-2, guile-present, python2-p= ycairo) >>> [arguments]: Likewise. >>> * gnu/packages/guile.scm (guile-1.8)[arguments]: Likewise. >>> * gnu/packages/guile-wm.scm (guile-wm)[arguments]: Likewise. >>> * gnu/packages/hugs.scm (hugs)[arguments]: Likewise. >>> * gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal) >>> [arguments]: Likewise. >>> * gnu/packages/image-viewers.scm (feh, sxiv)[arguments]: Likewise. >>> * gnu/packages/libcanberra.scm (libcanberra)[arguments]: Likewise. >>> * gnu/packages/libsigsegv.scm (libsigsegv)[arguments]: Likewise. >>> * gnu/packages/linux.scm (zerofree, net-tools, bridge-utils, iw, fuse, >>> unionfs-fuse/static, lm-sensors, i2c-tools, xsensors, perf, mdadm, liba= io, >>> module-init-tools)[arguments]: Likewise. >>> * gnu/packages/lisp.scm (ccl)[arguments]: Likewise. >>> * gnu/packages/lout.scm (lout)[arguments]: Likewise. >>> * gnu/packages/lua.scm (luajit)[arguments]: Likewise. >>> * gnu/packages/machine-learning.scm (shogun)[arguments]: Likewise. >>> * gnu/packages/mail.scm (exim)[arguments]: Likewise. >>> * gnu/packages/man.scm (man-pages, txt2man)[arguments]: Likewise. >>> * gnu/packages/maths.scm (lapack, superlu-dist, openlibm, openspecfun, >>> suitesparse)[arguments]: Likewise. >>> * gnu/packages/messaging.scm (bitlbee)[arguments]: Likewise. >>> * gnu/packages/mp3.scm (libmad, id3lib, mp3info)[arguments]: Likewise. >>> * gnu/packages/music.scm (solfege)[arguments]: Likewise. >>> * gnu/packages/noweb.scm (noweb)[arguments]: Likewise. >>> * gnu/packages/patchutils.scm (patchutils, quilt, colordiff)[arguments]: >>> Likewise. >>> * gnu/packages/pdf.scm (xpdf, zathura-cb, zathura-ps, zathura-djvu, >>> zathura-pdf-poppler, zathura, podofo, fbidag)[arguments]: Likewise. >>> * gnu/packages/perl.scm (perl-file-list, perl-test-harness)[arguments]: >>> Likewise. >>> * gnu/packages/photo.scm (gphoto2)[arguments]: Likewise. >>> * gnu/packages/popt.scm (popt)[arguments]: Likewise. >>> * gnu/packages/pretty-print.scm (source-highlight, astyle)[arguments]: >>> Likewise. >>> * gnu/packages/pumpio.scm (pumpa)[arguments]: Likewise. >>> * gnu/packages/python.scm (python-passlib, python-pycrypto, python2-emp= y, >>> python-sqlalchemy, python-docopt)[arguments]: Likewise. >>> * gnu/packages/rdf.scm (lrdf)[arguments]: Likewise. >>> * gnu/packages/regex.scm (tre)[arguments]: Likewise. >>> * gnu/packages/rrdtool.scm (rrdtool)[arguments]: Likewise. >>> * gnu/packages/ruby.scm (ruby-2.1, ruby-1.8)[arguments]: Likewise. >>> * gnu/packages/sawfish.scm (sawfish)[arguments]: Likewise. >>> * gnu/packages/scheme.scm (racket)[arguments]: Likewise. >>> * gnu/packages/sdl.scm (guile-sdl)[arguments]: Likewise. >>> * gnu/packages/serveez.scm (serveez)[arguments]: Likewise. >>> * gnu/packages/skribilo.scm (skribilo)[arguments]: Likewise. >>> * gnu/packages/smalltalk.scm (smalltalk)[arguments]: Likewise. >>> * gnu/packages/suckless.scm (dmenu, slock)[arguments]: Likewise. >>> * gnu/packages/tcl.scm (expect)[arguments]: Likewise. >>> * gnu/packages/telephony.scm (commoncpp)[arguments]: Likewise. >>> * gnu/packages/textutils.scm (recode, libgtextutils)[arguments]: >>> Likewise. >>> * gnu/packages/time.scm (time)[arguments]: Likewise. >>> * gnu/packages/tor.scm (privoxy)[arguments]: Likewise. >>> * gnu/packages/uucp.scm (uucp)[arguments]: Likewise. >>> * gnu/packages/video.scm (libdvdnav-4)[arguments]: Likewise. >>> * gnu/packages/web-browsers.scm (lynx)[arguments]: Likewise. >>> * gnu/packages/web.scm (tinyproxy)[arguments]: Likewise. >>> * gnu/packages/wicd.scm (wicd)[arguments]: Likewise. >>> * gnu/packages/wm.scm (bspwm)[arguments]: Likewise. >>> * gnu/packages/xdisorg.scm (sxhkd, xcape)[arguments]: Likewise. >>> * gnu/packages/xfce.scm (xfconf)[arguments]: Likewise. >>> * gnu/packages/xfig.scm (transfig)[arguments]: Likewise. >>> * gnu/packages/xorg.scm (imake)[arguments]: Likewise. >>=20 >> Hello Kei! >>=20 >> 'core-updates' is now merged. Let's try to get this patch in. >>=20 >> I've read through the changed variables and think we can handle it on >> 'master', except 'bdb-5.3' which will have to wait until the next >> 'core-updates' cycle. Can you double check that this won't cause more >> than a few hundred rebuilds? >>=20 >> Thanks! > > How does 1301 rebuilds sound? I think that will take several days (~week?) to complete, so it should be done on 'staging' so that users are not left without binary substitutes for very long. But then, we are probably facing a weeks worth of merge conflicts. > P.S. It seems that I have to type the patch a second time, so it may be > a while until I am able to push to master. I would assume `git cherry-pick` could resolve most hunks, no? Files with many conflicts may be easier to reset to their original state and redo. If you do have to redo large parts of it, maybe we could do it in 3-4 batches and keep an eye on Hydra in between? It would cause some extra rebuilds, but I suspect it's the least painful option. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlmkgb0ACgkQoqBt8qM6 VPrVnAf/Ue/6yBypahZPNtEyxl7MBUWEE3mzT3WWjqGwK9s9Oa+A/aoWFOx8mJTq GRq0StMBxxVsjQiuWeq9NMki8x5MlQu1Un5GCJ0iFibzdUUbsAgNXHyPUJHOExWe j1bHQaAyVWlpJLTNWBNB/7ZlLoDOkr+8MUa0H+fZgYVqTyVMzfq5iWmI1Fku9TAL XVuXZvzklmUCZdaM6QxUdHHuir9gVPuscfe+4Nt066GoiKqNzHk+nonjCoRhbwiV bMoYmpz1UgUf2mhnE12DJKrFs1UmDTg130L2cvsJehQ2c9wD0B4AMUUUDC7+GpxG 4J0DVPX1+TXqm3WLpGpyPz6T5RKNuQ== =7kUw -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 28 19:01:18 2017 Received: (at 27898) by debbugs.gnu.org; 28 Aug 2017 23:01:18 +0000 Received: from localhost ([127.0.0.1]:59816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmT1y-0006mn-9d for submit@debbugs.gnu.org; Mon, 28 Aug 2017 19:01:18 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51154) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmT1w-0006mZ-2E for 27898@debbugs.gnu.org; Mon, 28 Aug 2017 19:01:16 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 1E88B20F47 for <27898@debbugs.gnu.org>; Tue, 29 Aug 2017 01:01:06 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3xh6h12TrQz108s; Tue, 29 Aug 2017 01:01:02 +0200 (CEST) From: Kei Kebreau To: Marius Bakke Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. References: <87a82jzhwg.fsf@posteo.net> <878ti3zade.fsf@fastmail.com> Date: Mon, 28 Aug 2017 19:00:48 -0400 In-Reply-To: <878ti3zade.fsf@fastmail.com> (Marius Bakke's message of "Mon, 28 Aug 2017 22:49:01 +0200") Message-ID: <8760d7z49r.fsf@posteo.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -5.1 (-----) X-Debbugs-Envelope-To: 27898 Cc: 27898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.1 (-----) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Marius Bakke writes: > Kei Kebreau writes: > >>> Kei Kebreau writes: >>>=20 >>>> * gnu/packages/admin.scm (mingetty, clusterssh, sudo, >>>> wpa-supplicant-minimal, >>>> wpa-supplicant, wakelan, acpica, tree, direvent, dstat)[arguments]: Use >>>> 'modify-phases' syntax. >>>> * gnu/packages/algebra.scm (arb)[arguments]: Likewise. >>>> * gnu/packages/apr.scm (apr-util)[arguments]: Likewise. >>>> * gnu/packages/audio.scm (clalsadrv, fluidsynth, faad2, lv2-mda-piano, >>>> lv2-mda-epiano, timidity++, vamp, soundtouch, portaudio, rsound, >>>> zita-convolver, zita-alsa-pcmi)[arguments]: Likewise. >>>> * gnu/packages/backup.scm (rdup, btar)[arguments]: Likewise. >>>> * gnu/packages/bioinformatics.scm (bedops, bwa, crossmap, express, >>>> flexbar, grit, hisat, ngs-sdk, subread)[arguments]: Likewise. >>>> * gnu/packages/bittorrent.scm (transmission)[arguments]: Likewise. >>>> * gnu/packages/cdrom.scm (cd-discid)[arguments]: Likewise. >>>> * gnu/packages/compression.scm (sharutils)[arguments]: Likewise. >>>> * gnu/packages/conky.scm (conky)[arguments]: Likewise. >>>> * gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Likewise. >>>> * gnu/packages/debug.scm (delta, c-reduce)[arguments]: Likewise. >>>> * gnu/packages/display-managers.scm (slim)[arguments]: Likewise. >>>> * gnu/packages/dns.scm (dnsmasq)[arguments]: Likewise. >>>> * gnu/packages/emacs.scm (geiser, emacs-wget, bbdb)[arguments]: Likewi= se. >>>> * gnu/packages/engineering.scm (pcb)[arguments]: Likewise. >>>> * gnu/packages/firmware.scm (ath9k-htc-firmware)[arguments]: Likewise. >>>> * gnu/packages/flashing-tools.scm (flashrom)[arguments]: Likewise. >>>> * gnu/packages/fltk.scm (fltk)[arguments]: Likewise. >>>> * gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Likewise. >>>> * gnu/packages/gd.scm (perl-gd)[arguments]: Likewise. >>>> * gnu/packages/gimp.scm (gegl)[arguments]: Likewise. >>>> * gnu/packages/gkrellm.scm (gkrellm)[arguments]: Likewise. >>>> * gnu/packages/glib.scm (glibmm)[arguments]: Likewise. >>>> * gnu/packages/gl.scm (glew)[arguments]: Likewise. >>>> * gnu/packages/gnome.scm (icon-naming-utils, orbit2, libbonobo, gnome-= vfs, >>>> libgnome, libbonoboui, goffice-0.8, dconf)[arguments]: Likewise. >>>> * gnu/packages/gprolog.scm (gprolog)[arguments]: Likewise. >>>> * gnu/packages/gps.scm (gpscorrelate)[arguments]: Likewise. >>>> * gnu/packages/graphics.scm (agg)[arguments]: Likewise. >>>> * gnu/packages/gtk.scm (ganv, gtksourceview-2, guile-present, >>>> python2-pycairo) >>>> [arguments]: Likewise. >>>> * gnu/packages/guile.scm (guile-1.8)[arguments]: Likewise. >>>> * gnu/packages/guile-wm.scm (guile-wm)[arguments]: Likewise. >>>> * gnu/packages/hugs.scm (hugs)[arguments]: Likewise. >>>> * gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal) >>>> [arguments]: Likewise. >>>> * gnu/packages/image-viewers.scm (feh, sxiv)[arguments]: Likewise. >>>> * gnu/packages/libcanberra.scm (libcanberra)[arguments]: Likewise. >>>> * gnu/packages/libsigsegv.scm (libsigsegv)[arguments]: Likewise. >>>> * gnu/packages/linux.scm (zerofree, net-tools, bridge-utils, iw, fuse, >>>> unionfs-fuse/static, lm-sensors, i2c-tools, xsensors, perf, mdadm, lib= aio, >>>> module-init-tools)[arguments]: Likewise. >>>> * gnu/packages/lisp.scm (ccl)[arguments]: Likewise. >>>> * gnu/packages/lout.scm (lout)[arguments]: Likewise. >>>> * gnu/packages/lua.scm (luajit)[arguments]: Likewise. >>>> * gnu/packages/machine-learning.scm (shogun)[arguments]: Likewise. >>>> * gnu/packages/mail.scm (exim)[arguments]: Likewise. >>>> * gnu/packages/man.scm (man-pages, txt2man)[arguments]: Likewise. >>>> * gnu/packages/maths.scm (lapack, superlu-dist, openlibm, openspecfun, >>>> suitesparse)[arguments]: Likewise. >>>> * gnu/packages/messaging.scm (bitlbee)[arguments]: Likewise. >>>> * gnu/packages/mp3.scm (libmad, id3lib, mp3info)[arguments]: Likewise. >>>> * gnu/packages/music.scm (solfege)[arguments]: Likewise. >>>> * gnu/packages/noweb.scm (noweb)[arguments]: Likewise. >>>> * gnu/packages/patchutils.scm (patchutils, quilt, colordiff)[arguments= ]: >>>> Likewise. >>>> * gnu/packages/pdf.scm (xpdf, zathura-cb, zathura-ps, zathura-djvu, >>>> zathura-pdf-poppler, zathura, podofo, fbidag)[arguments]: Likewise. >>>> * gnu/packages/perl.scm (perl-file-list, perl-test-harness)[arguments]: >>>> Likewise. >>>> * gnu/packages/photo.scm (gphoto2)[arguments]: Likewise. >>>> * gnu/packages/popt.scm (popt)[arguments]: Likewise. >>>> * gnu/packages/pretty-print.scm (source-highlight, astyle)[arguments]: >>>> Likewise. >>>> * gnu/packages/pumpio.scm (pumpa)[arguments]: Likewise. >>>> * gnu/packages/python.scm (python-passlib, python-pycrypto, python2-em= py, >>>> python-sqlalchemy, python-docopt)[arguments]: Likewise. >>>> * gnu/packages/rdf.scm (lrdf)[arguments]: Likewise. >>>> * gnu/packages/regex.scm (tre)[arguments]: Likewise. >>>> * gnu/packages/rrdtool.scm (rrdtool)[arguments]: Likewise. >>>> * gnu/packages/ruby.scm (ruby-2.1, ruby-1.8)[arguments]: Likewise. >>>> * gnu/packages/sawfish.scm (sawfish)[arguments]: Likewise. >>>> * gnu/packages/scheme.scm (racket)[arguments]: Likewise. >>>> * gnu/packages/sdl.scm (guile-sdl)[arguments]: Likewise. >>>> * gnu/packages/serveez.scm (serveez)[arguments]: Likewise. >>>> * gnu/packages/skribilo.scm (skribilo)[arguments]: Likewise. >>>> * gnu/packages/smalltalk.scm (smalltalk)[arguments]: Likewise. >>>> * gnu/packages/suckless.scm (dmenu, slock)[arguments]: Likewise. >>>> * gnu/packages/tcl.scm (expect)[arguments]: Likewise. >>>> * gnu/packages/telephony.scm (commoncpp)[arguments]: Likewise. >>>> * gnu/packages/textutils.scm (recode, libgtextutils)[arguments]: >>>> Likewise. >>>> * gnu/packages/time.scm (time)[arguments]: Likewise. >>>> * gnu/packages/tor.scm (privoxy)[arguments]: Likewise. >>>> * gnu/packages/uucp.scm (uucp)[arguments]: Likewise. >>>> * gnu/packages/video.scm (libdvdnav-4)[arguments]: Likewise. >>>> * gnu/packages/web-browsers.scm (lynx)[arguments]: Likewise. >>>> * gnu/packages/web.scm (tinyproxy)[arguments]: Likewise. >>>> * gnu/packages/wicd.scm (wicd)[arguments]: Likewise. >>>> * gnu/packages/wm.scm (bspwm)[arguments]: Likewise. >>>> * gnu/packages/xdisorg.scm (sxhkd, xcape)[arguments]: Likewise. >>>> * gnu/packages/xfce.scm (xfconf)[arguments]: Likewise. >>>> * gnu/packages/xfig.scm (transfig)[arguments]: Likewise. >>>> * gnu/packages/xorg.scm (imake)[arguments]: Likewise. >>>=20 >>> Hello Kei! >>>=20 >>> 'core-updates' is now merged. Let's try to get this patch in. >>>=20 >>> I've read through the changed variables and think we can handle it on >>> 'master', except 'bdb-5.3' which will have to wait until the next >>> 'core-updates' cycle. Can you double check that this won't cause more >>> than a few hundred rebuilds? >>>=20 >>> Thanks! >> >> How does 1301 rebuilds sound? > > I think that will take several days (~week?) to complete, so it should > be done on 'staging' so that users are not left without binary > substitutes for very long. > > But then, we are probably facing a weeks worth of merge conflicts. > >> P.S. It seems that I have to type the patch a second time, so it may be >> a while until I am able to push to master. > > I would assume `git cherry-pick` could resolve most hunks, no? Files > with many conflicts may be easier to reset to their original state and > redo. > Maybe if my commits were split up? I have to read about `git cherry-pick`. > If you do have to redo large parts of it, maybe we could do it in 3-4 > batches and keep an eye on Hydra in between? It would cause some extra > rebuilds, but I suspect it's the least painful option. That could work. I'll see if I can have things sorted by tomorrow and we'll go from there. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlmkoKAACgkQ5qXuPBlG eg3snQ/9FrocD6E8N8jUoJDQiN+5tgnqvDMBhxXJ/zCzcO6maMyapwE+jJFnj9L+ 9YwFcQsg2KfDyXDFnCVR4V1rDbd2+IRHA+v2PkVocoR3Zy3f0X8vU1fvTDf6bKAz 3sznDmBylDzXBua1XDwdpMlfP3uRDpC/mQJYiPjy1QnNtDys5TJenOWESrdsT66G niJBRhsd6Wen8Hl/ntgug3P2gDKVImY+lKnQHsFzANX40uwud/rVxDR1ZeaCnUVq +Xt2wtUIPNv0zgzjJPjWudX96A0BvibM5dGg+sumANTgMjN+ZzRLwZg7TTe8LRcq gTf5B4Abe894CUnSgwCDhor8QEMy9O9Rv8flLk0Om4So+QmumBmtV5jOb14HVGFR lTPffZKmn+sBhtQBKXGDnavozQb6EIGxCZLfrRm+qBo4Q5WKtG8FgYazdozDuClg iTQ4bK+f0KnFZiM2St+c0wzVlZhnt91erpa80oGaCM+7dchUKjFSB72S+0qapb8I PeT5VP0n7tv4eBBLxfvORG9TM1GkATydn3A+ABu1wx5HMxzyjHlN03aLIowkohuk l0h9XZ0kMH+UXFIZu0gKqd+MSMwIsp2ugF6DY+LdO2ThbPQmaDy5V6mJn+7I/ZCK snJwcnubtd6H6v+Yo1IbhRDgEfPc17W4nEOQz+kCvtiaizNPzpw= =Vkid -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 31 08:59:43 2017 Received: (at 27898) by debbugs.gnu.org; 31 Aug 2017 12:59:43 +0000 Received: from localhost ([127.0.0.1]:36469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnP4R-0006iu-6O for submit@debbugs.gnu.org; Thu, 31 Aug 2017 08:59:43 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52935) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnP4O-0006iV-R4 for 27898@debbugs.gnu.org; Thu, 31 Aug 2017 08:59:41 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 33EAB209D3 for <27898@debbugs.gnu.org>; Thu, 31 Aug 2017 14:59:35 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3xjjBZ0NyHzymk; Thu, 31 Aug 2017 14:59:33 +0200 (CEST) From: Kei Kebreau To: Marius Bakke Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. References: <87a82jzhwg.fsf@posteo.net> <878ti3zade.fsf@fastmail.com> <8760d7z49r.fsf@posteo.net> Date: Thu, 31 Aug 2017 08:59:21 -0400 In-Reply-To: <8760d7z49r.fsf@posteo.net> (Kei Kebreau's message of "Mon, 28 Aug 2017 19:00:48 -0400") Message-ID: <87shg7yjti.fsf@posteo.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -5.1 (-----) X-Debbugs-Envelope-To: 27898 Cc: 27898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.1 (-----) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Kei Kebreau writes: > Marius Bakke writes: > >> Kei Kebreau writes: >> >>>> Kei Kebreau writes: >>>>=20 >>>>> * gnu/packages/admin.scm (mingetty, clusterssh, sudo, >>>>> wpa-supplicant-minimal, >>>>> wpa-supplicant, wakelan, acpica, tree, direvent, dstat)[arguments]: U= se >>>>> 'modify-phases' syntax. >>>>> * gnu/packages/algebra.scm (arb)[arguments]: Likewise. >>>>> * gnu/packages/apr.scm (apr-util)[arguments]: Likewise. >>>>> * gnu/packages/audio.scm (clalsadrv, fluidsynth, faad2, lv2-mda-piano, >>>>> lv2-mda-epiano, timidity++, vamp, soundtouch, portaudio, rsound, >>>>> zita-convolver, zita-alsa-pcmi)[arguments]: Likewise. >>>>> * gnu/packages/backup.scm (rdup, btar)[arguments]: Likewise. >>>>> * gnu/packages/bioinformatics.scm (bedops, bwa, crossmap, express, >>>>> flexbar, grit, hisat, ngs-sdk, subread)[arguments]: Likewise. >>>>> * gnu/packages/bittorrent.scm (transmission)[arguments]: Likewise. >>>>> * gnu/packages/cdrom.scm (cd-discid)[arguments]: Likewise. >>>>> * gnu/packages/compression.scm (sharutils)[arguments]: Likewise. >>>>> * gnu/packages/conky.scm (conky)[arguments]: Likewise. >>>>> * gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Likewise. >>>>> * gnu/packages/debug.scm (delta, c-reduce)[arguments]: Likewise. >>>>> * gnu/packages/display-managers.scm (slim)[arguments]: Likewise. >>>>> * gnu/packages/dns.scm (dnsmasq)[arguments]: Likewise. >>>>> * gnu/packages/emacs.scm (geiser, emacs-wget, bbdb)[arguments]: Likew= ise. >>>>> * gnu/packages/engineering.scm (pcb)[arguments]: Likewise. >>>>> * gnu/packages/firmware.scm (ath9k-htc-firmware)[arguments]: Likewise. >>>>> * gnu/packages/flashing-tools.scm (flashrom)[arguments]: Likewise. >>>>> * gnu/packages/fltk.scm (fltk)[arguments]: Likewise. >>>>> * gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Likewise. >>>>> * gnu/packages/gd.scm (perl-gd)[arguments]: Likewise. >>>>> * gnu/packages/gimp.scm (gegl)[arguments]: Likewise. >>>>> * gnu/packages/gkrellm.scm (gkrellm)[arguments]: Likewise. >>>>> * gnu/packages/glib.scm (glibmm)[arguments]: Likewise. >>>>> * gnu/packages/gl.scm (glew)[arguments]: Likewise. >>>>> * gnu/packages/gnome.scm (icon-naming-utils, orbit2, libbonobo, gnome= -vfs, >>>>> libgnome, libbonoboui, goffice-0.8, dconf)[arguments]: Likewise. >>>>> * gnu/packages/gprolog.scm (gprolog)[arguments]: Likewise. >>>>> * gnu/packages/gps.scm (gpscorrelate)[arguments]: Likewise. >>>>> * gnu/packages/graphics.scm (agg)[arguments]: Likewise. >>>>> * gnu/packages/gtk.scm (ganv, gtksourceview-2, guile-present, >>>>> python2-pycairo) >>>>> [arguments]: Likewise. >>>>> * gnu/packages/guile.scm (guile-1.8)[arguments]: Likewise. >>>>> * gnu/packages/guile-wm.scm (guile-wm)[arguments]: Likewise. >>>>> * gnu/packages/hugs.scm (hugs)[arguments]: Likewise. >>>>> * gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal) >>>>> [arguments]: Likewise. >>>>> * gnu/packages/image-viewers.scm (feh, sxiv)[arguments]: Likewise. >>>>> * gnu/packages/libcanberra.scm (libcanberra)[arguments]: Likewise. >>>>> * gnu/packages/libsigsegv.scm (libsigsegv)[arguments]: Likewise. >>>>> * gnu/packages/linux.scm (zerofree, net-tools, bridge-utils, iw, fuse, >>>>> unionfs-fuse/static, lm-sensors, i2c-tools, xsensors, perf, mdadm, li= baio, >>>>> module-init-tools)[arguments]: Likewise. >>>>> * gnu/packages/lisp.scm (ccl)[arguments]: Likewise. >>>>> * gnu/packages/lout.scm (lout)[arguments]: Likewise. >>>>> * gnu/packages/lua.scm (luajit)[arguments]: Likewise. >>>>> * gnu/packages/machine-learning.scm (shogun)[arguments]: Likewise. >>>>> * gnu/packages/mail.scm (exim)[arguments]: Likewise. >>>>> * gnu/packages/man.scm (man-pages, txt2man)[arguments]: Likewise. >>>>> * gnu/packages/maths.scm (lapack, superlu-dist, openlibm, openspecfun, >>>>> suitesparse)[arguments]: Likewise. >>>>> * gnu/packages/messaging.scm (bitlbee)[arguments]: Likewise. >>>>> * gnu/packages/mp3.scm (libmad, id3lib, mp3info)[arguments]: Likewise. >>>>> * gnu/packages/music.scm (solfege)[arguments]: Likewise. >>>>> * gnu/packages/noweb.scm (noweb)[arguments]: Likewise. >>>>> * gnu/packages/patchutils.scm (patchutils, quilt, colordiff)[argument= s]: >>>>> Likewise. >>>>> * gnu/packages/pdf.scm (xpdf, zathura-cb, zathura-ps, zathura-djvu, >>>>> zathura-pdf-poppler, zathura, podofo, fbidag)[arguments]: Likewise. >>>>> * gnu/packages/perl.scm (perl-file-list, perl-test-harness)[arguments= ]: >>>>> Likewise. >>>>> * gnu/packages/photo.scm (gphoto2)[arguments]: Likewise. >>>>> * gnu/packages/popt.scm (popt)[arguments]: Likewise. >>>>> * gnu/packages/pretty-print.scm (source-highlight, astyle)[arguments]: >>>>> Likewise. >>>>> * gnu/packages/pumpio.scm (pumpa)[arguments]: Likewise. >>>>> * gnu/packages/python.scm (python-passlib, python-pycrypto, python2-e= mpy, >>>>> python-sqlalchemy, python-docopt)[arguments]: Likewise. >>>>> * gnu/packages/rdf.scm (lrdf)[arguments]: Likewise. >>>>> * gnu/packages/regex.scm (tre)[arguments]: Likewise. >>>>> * gnu/packages/rrdtool.scm (rrdtool)[arguments]: Likewise. >>>>> * gnu/packages/ruby.scm (ruby-2.1, ruby-1.8)[arguments]: Likewise. >>>>> * gnu/packages/sawfish.scm (sawfish)[arguments]: Likewise. >>>>> * gnu/packages/scheme.scm (racket)[arguments]: Likewise. >>>>> * gnu/packages/sdl.scm (guile-sdl)[arguments]: Likewise. >>>>> * gnu/packages/serveez.scm (serveez)[arguments]: Likewise. >>>>> * gnu/packages/skribilo.scm (skribilo)[arguments]: Likewise. >>>>> * gnu/packages/smalltalk.scm (smalltalk)[arguments]: Likewise. >>>>> * gnu/packages/suckless.scm (dmenu, slock)[arguments]: Likewise. >>>>> * gnu/packages/tcl.scm (expect)[arguments]: Likewise. >>>>> * gnu/packages/telephony.scm (commoncpp)[arguments]: Likewise. >>>>> * gnu/packages/textutils.scm (recode, libgtextutils)[arguments]: >>>>> Likewise. >>>>> * gnu/packages/time.scm (time)[arguments]: Likewise. >>>>> * gnu/packages/tor.scm (privoxy)[arguments]: Likewise. >>>>> * gnu/packages/uucp.scm (uucp)[arguments]: Likewise. >>>>> * gnu/packages/video.scm (libdvdnav-4)[arguments]: Likewise. >>>>> * gnu/packages/web-browsers.scm (lynx)[arguments]: Likewise. >>>>> * gnu/packages/web.scm (tinyproxy)[arguments]: Likewise. >>>>> * gnu/packages/wicd.scm (wicd)[arguments]: Likewise. >>>>> * gnu/packages/wm.scm (bspwm)[arguments]: Likewise. >>>>> * gnu/packages/xdisorg.scm (sxhkd, xcape)[arguments]: Likewise. >>>>> * gnu/packages/xfce.scm (xfconf)[arguments]: Likewise. >>>>> * gnu/packages/xfig.scm (transfig)[arguments]: Likewise. >>>>> * gnu/packages/xorg.scm (imake)[arguments]: Likewise. >>>>=20 >>>> Hello Kei! >>>>=20 >>>> 'core-updates' is now merged. Let's try to get this patch in. >>>>=20 >>>> I've read through the changed variables and think we can handle it on >>>> 'master', except 'bdb-5.3' which will have to wait until the next >>>> 'core-updates' cycle. Can you double check that this won't cause more >>>> than a few hundred rebuilds? >>>>=20 >>>> Thanks! >>> >>> How does 1301 rebuilds sound? >> >> I think that will take several days (~week?) to complete, so it should >> be done on 'staging' so that users are not left without binary >> substitutes for very long. >> >> But then, we are probably facing a weeks worth of merge conflicts. >> >>> P.S. It seems that I have to type the patch a second time, so it may be >>> a while until I am able to push to master. >> >> I would assume `git cherry-pick` could resolve most hunks, no? Files >> with many conflicts may be easier to reset to their original state and >> redo. >> > > Maybe if my commits were split up? I have to read about > `git cherry-pick`. > >> If you do have to redo large parts of it, maybe we could do it in 3-4 >> batches and keep an eye on Hydra in between? It would cause some extra >> rebuilds, but I suspect it's the least painful option. > > That could work. I'll see if I can have things sorted by tomorrow and > we'll go from there. The patches are in working order. The first patch would cause 1200 rebuilds, but the second would only cause 128 rebuilds. Should I work on splitting up the first patch into pieces that Hydra can handle under its current load? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlmoCCoACgkQ5qXuPBlG eg2jPRAAkhN1JhfNljTSSnOUeOm5DSQ43Fj+JqXyO797JjuK8bRuQt+VWncbABj2 s/jxeX7f4/iv60lw1Yyhw9FksWE3uqB6XMiCrKxw6NGwSGJfXBFCNPjgPtYXXy8l OL0dWPb0HzUY+VW4V8TSc8pvuOhr/87wa+3Pri+i65127WCnPoycpagYxMZBFXpz 4qXyBmLrdo46rb29muhg64EQzc2Fflx5UmEWLNXzXJMPix1Bj6UDndxpSdN6r9Qg Lf9QuslFlkmKhlM/+qd/txCoey6V+MhAwj8DhmwHOKiiyF/DuMVVBfOAG4etCJ0s 0Q3YYW1EmPCb5NvpOCXmQrg6+GbJJq8TsNFS6gehRZwN8Yh0cR8MZTieRcEMOoeo SgmUmZZKYDH3I1mGVfb076ZCa1Nh71/RS67go7Eg/szrdelhw1DehERSlEvTHguj fRgbLyjm+CRC+rUzAtalWPmWVD9rOsgjMvPmBcoac/5p7cX3mq4P1sFjKe+JKATp vUrL93epb1w+uLaw1+qrX7oRP/5rzv19AuTPOXuBskOBc+Tw3zzHjyTrzFst/wrZ fTr5wuhIaFvsW8nkRx0WyMcqS/Nt1myqD9VzsQgRpAiwZwU61avMnGKACpSaAsi3 Hm0oNh14pvZ+ezYAeIOWu4uJvED1ShWhU344gR5xjV0uZl59aI4= =GoXv -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 31 12:59:49 2017 Received: (at 27898) by debbugs.gnu.org; 31 Aug 2017 16:59:49 +0000 Received: from localhost ([127.0.0.1]:37871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnSon-0003GZ-5m for submit@debbugs.gnu.org; Thu, 31 Aug 2017 12:59:49 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:57377) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnSol-0003GR-F2 for 27898@debbugs.gnu.org; Thu, 31 Aug 2017 12:59:48 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id DF2F020D51; Thu, 31 Aug 2017 12:59:46 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Thu, 31 Aug 2017 12:59:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=9DcRzwHonC6mLFlyYepYlNFu7BovoUNhf8bpoJzPu Ho=; b=L8ePJ94A3Yv5SSUQt12+qxHQ/czYwIB6p4lMyanGWDqGThIZnanzXvrg1 FAwJ5Goz899zENDAE1K8zxSC6fSGEtD6VjfbZd+awMN1cVSoYO6QLba6XwnfCiKJ u2GEZV+rUgtV77p6xjZxxRbe+VRkV9KfLrYRw0JzEzoMQprW+SDNHoSPJM0gBl7P XSBRDcnTWfbrkbfuSrTeA2M1utSLVuliSqJCUKJZ2kfZjR4fwouvLlMuw5keIK7n lMkGLY3bc+RrPMhoYK42tYK97L/2/kRHstWhQ5hlQPXJqvUTEH0p3tOqIra9Ha0W /I+CeIFlBWgZYhjm4PrBmPPHOEWaw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=9DcRzwHonC6mLFlyYe pYlNFu7BovoUNhf8bpoJzPuHo=; b=XzS+E77mb32ukVkTHyvUNJfqlBU/s3ZXIY XBzd10xS/HPYmJfXbNATkVm7orQOZji3XQ+ZKR6YkNdUUhs8dxmzXQ3PgqyeFNAf sv25vImTuwOMKAMXQD0yYoNXbRcCYciFtnJA3UrGoBBypFquWWc7w7hqdzHFxeM1 Y7Borc7Ky9Q2UHkUR+75hmAMa2nPq1TcJa4fNDIzwLFrFZfC3MGff1tK3fFwr6zj a1e2+l7iAGcj6MRwls8gX+a5N3ff5ISCsfcyh3cr2+LrZvYxBHxXhXdNQrAlRiuT DxoW22rzw+LHUfsJqOV8V/aUpIG1a6ZeZqHlBPc/tGOyJOlYxORw== X-ME-Sender: X-Sasl-enc: I3PXLzWFoZZZHxO/zozjOEhAfRxlnJaP4lq7HvGlw8d3 1504198786 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 69EA07F9BC; Thu, 31 Aug 2017 12:59:46 -0400 (EDT) From: Marius Bakke To: Kei Kebreau Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. In-Reply-To: <87shg7yjti.fsf@posteo.net> References: <87a82jzhwg.fsf@posteo.net> <878ti3zade.fsf@fastmail.com> <8760d7z49r.fsf@posteo.net> <87shg7yjti.fsf@posteo.net> User-Agent: Notmuch/0.25 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Thu, 31 Aug 2017 18:59:44 +0200 Message-ID: <87r2vrk70f.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 27898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Kei Kebreau writes: > Kei Kebreau writes: > >> Marius Bakke writes: >> >>> Kei Kebreau writes: >>> >>>>> Kei Kebreau writes: >>>>>=20 >>>>>> * gnu/packages/admin.scm (mingetty, clusterssh, sudo, >>>>>> wpa-supplicant-minimal, >>>>>> wpa-supplicant, wakelan, acpica, tree, direvent, dstat)[arguments]: = Use >>>>>> 'modify-phases' syntax. >>>>>> * gnu/packages/algebra.scm (arb)[arguments]: Likewise. >>>>>> * gnu/packages/apr.scm (apr-util)[arguments]: Likewise. >>>>>> * gnu/packages/audio.scm (clalsadrv, fluidsynth, faad2, lv2-mda-pian= o, >>>>>> lv2-mda-epiano, timidity++, vamp, soundtouch, portaudio, rsound, >>>>>> zita-convolver, zita-alsa-pcmi)[arguments]: Likewise. >>>>>> * gnu/packages/backup.scm (rdup, btar)[arguments]: Likewise. >>>>>> * gnu/packages/bioinformatics.scm (bedops, bwa, crossmap, express, >>>>>> flexbar, grit, hisat, ngs-sdk, subread)[arguments]: Likewise. >>>>>> * gnu/packages/bittorrent.scm (transmission)[arguments]: Likewise. >>>>>> * gnu/packages/cdrom.scm (cd-discid)[arguments]: Likewise. >>>>>> * gnu/packages/compression.scm (sharutils)[arguments]: Likewise. >>>>>> * gnu/packages/conky.scm (conky)[arguments]: Likewise. >>>>>> * gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Likewise. >>>>>> * gnu/packages/debug.scm (delta, c-reduce)[arguments]: Likewise. >>>>>> * gnu/packages/display-managers.scm (slim)[arguments]: Likewise. >>>>>> * gnu/packages/dns.scm (dnsmasq)[arguments]: Likewise. >>>>>> * gnu/packages/emacs.scm (geiser, emacs-wget, bbdb)[arguments]: Like= wise. >>>>>> * gnu/packages/engineering.scm (pcb)[arguments]: Likewise. >>>>>> * gnu/packages/firmware.scm (ath9k-htc-firmware)[arguments]: Likewis= e. >>>>>> * gnu/packages/flashing-tools.scm (flashrom)[arguments]: Likewise. >>>>>> * gnu/packages/fltk.scm (fltk)[arguments]: Likewise. >>>>>> * gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Likewise. >>>>>> * gnu/packages/gd.scm (perl-gd)[arguments]: Likewise. >>>>>> * gnu/packages/gimp.scm (gegl)[arguments]: Likewise. >>>>>> * gnu/packages/gkrellm.scm (gkrellm)[arguments]: Likewise. >>>>>> * gnu/packages/glib.scm (glibmm)[arguments]: Likewise. >>>>>> * gnu/packages/gl.scm (glew)[arguments]: Likewise. >>>>>> * gnu/packages/gnome.scm (icon-naming-utils, orbit2, libbonobo, gnom= e-vfs, >>>>>> libgnome, libbonoboui, goffice-0.8, dconf)[arguments]: Likewise. >>>>>> * gnu/packages/gprolog.scm (gprolog)[arguments]: Likewise. >>>>>> * gnu/packages/gps.scm (gpscorrelate)[arguments]: Likewise. >>>>>> * gnu/packages/graphics.scm (agg)[arguments]: Likewise. >>>>>> * gnu/packages/gtk.scm (ganv, gtksourceview-2, guile-present, >>>>>> python2-pycairo) >>>>>> [arguments]: Likewise. >>>>>> * gnu/packages/guile.scm (guile-1.8)[arguments]: Likewise. >>>>>> * gnu/packages/guile-wm.scm (guile-wm)[arguments]: Likewise. >>>>>> * gnu/packages/hugs.scm (hugs)[arguments]: Likewise. >>>>>> * gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal) >>>>>> [arguments]: Likewise. >>>>>> * gnu/packages/image-viewers.scm (feh, sxiv)[arguments]: Likewise. >>>>>> * gnu/packages/libcanberra.scm (libcanberra)[arguments]: Likewise. >>>>>> * gnu/packages/libsigsegv.scm (libsigsegv)[arguments]: Likewise. >>>>>> * gnu/packages/linux.scm (zerofree, net-tools, bridge-utils, iw, fus= e, >>>>>> unionfs-fuse/static, lm-sensors, i2c-tools, xsensors, perf, mdadm, l= ibaio, >>>>>> module-init-tools)[arguments]: Likewise. >>>>>> * gnu/packages/lisp.scm (ccl)[arguments]: Likewise. >>>>>> * gnu/packages/lout.scm (lout)[arguments]: Likewise. >>>>>> * gnu/packages/lua.scm (luajit)[arguments]: Likewise. >>>>>> * gnu/packages/machine-learning.scm (shogun)[arguments]: Likewise. >>>>>> * gnu/packages/mail.scm (exim)[arguments]: Likewise. >>>>>> * gnu/packages/man.scm (man-pages, txt2man)[arguments]: Likewise. >>>>>> * gnu/packages/maths.scm (lapack, superlu-dist, openlibm, openspecfu= n, >>>>>> suitesparse)[arguments]: Likewise. >>>>>> * gnu/packages/messaging.scm (bitlbee)[arguments]: Likewise. >>>>>> * gnu/packages/mp3.scm (libmad, id3lib, mp3info)[arguments]: Likewis= e. >>>>>> * gnu/packages/music.scm (solfege)[arguments]: Likewise. >>>>>> * gnu/packages/noweb.scm (noweb)[arguments]: Likewise. >>>>>> * gnu/packages/patchutils.scm (patchutils, quilt, colordiff)[argumen= ts]: >>>>>> Likewise. >>>>>> * gnu/packages/pdf.scm (xpdf, zathura-cb, zathura-ps, zathura-djvu, >>>>>> zathura-pdf-poppler, zathura, podofo, fbidag)[arguments]: Likewise. >>>>>> * gnu/packages/perl.scm (perl-file-list, perl-test-harness)[argument= s]: >>>>>> Likewise. >>>>>> * gnu/packages/photo.scm (gphoto2)[arguments]: Likewise. >>>>>> * gnu/packages/popt.scm (popt)[arguments]: Likewise. >>>>>> * gnu/packages/pretty-print.scm (source-highlight, astyle)[arguments= ]: >>>>>> Likewise. >>>>>> * gnu/packages/pumpio.scm (pumpa)[arguments]: Likewise. >>>>>> * gnu/packages/python.scm (python-passlib, python-pycrypto, python2-= empy, >>>>>> python-sqlalchemy, python-docopt)[arguments]: Likewise. >>>>>> * gnu/packages/rdf.scm (lrdf)[arguments]: Likewise. >>>>>> * gnu/packages/regex.scm (tre)[arguments]: Likewise. >>>>>> * gnu/packages/rrdtool.scm (rrdtool)[arguments]: Likewise. >>>>>> * gnu/packages/ruby.scm (ruby-2.1, ruby-1.8)[arguments]: Likewise. >>>>>> * gnu/packages/sawfish.scm (sawfish)[arguments]: Likewise. >>>>>> * gnu/packages/scheme.scm (racket)[arguments]: Likewise. >>>>>> * gnu/packages/sdl.scm (guile-sdl)[arguments]: Likewise. >>>>>> * gnu/packages/serveez.scm (serveez)[arguments]: Likewise. >>>>>> * gnu/packages/skribilo.scm (skribilo)[arguments]: Likewise. >>>>>> * gnu/packages/smalltalk.scm (smalltalk)[arguments]: Likewise. >>>>>> * gnu/packages/suckless.scm (dmenu, slock)[arguments]: Likewise. >>>>>> * gnu/packages/tcl.scm (expect)[arguments]: Likewise. >>>>>> * gnu/packages/telephony.scm (commoncpp)[arguments]: Likewise. >>>>>> * gnu/packages/textutils.scm (recode, libgtextutils)[arguments]: >>>>>> Likewise. >>>>>> * gnu/packages/time.scm (time)[arguments]: Likewise. >>>>>> * gnu/packages/tor.scm (privoxy)[arguments]: Likewise. >>>>>> * gnu/packages/uucp.scm (uucp)[arguments]: Likewise. >>>>>> * gnu/packages/video.scm (libdvdnav-4)[arguments]: Likewise. >>>>>> * gnu/packages/web-browsers.scm (lynx)[arguments]: Likewise. >>>>>> * gnu/packages/web.scm (tinyproxy)[arguments]: Likewise. >>>>>> * gnu/packages/wicd.scm (wicd)[arguments]: Likewise. >>>>>> * gnu/packages/wm.scm (bspwm)[arguments]: Likewise. >>>>>> * gnu/packages/xdisorg.scm (sxhkd, xcape)[arguments]: Likewise. >>>>>> * gnu/packages/xfce.scm (xfconf)[arguments]: Likewise. >>>>>> * gnu/packages/xfig.scm (transfig)[arguments]: Likewise. >>>>>> * gnu/packages/xorg.scm (imake)[arguments]: Likewise. >>>>>=20 >>>>> Hello Kei! >>>>>=20 >>>>> 'core-updates' is now merged. Let's try to get this patch in. >>>>>=20 >>>>> I've read through the changed variables and think we can handle it on >>>>> 'master', except 'bdb-5.3' which will have to wait until the next >>>>> 'core-updates' cycle. Can you double check that this won't cause more >>>>> than a few hundred rebuilds? >>>>>=20 >>>>> Thanks! >>>> >>>> How does 1301 rebuilds sound? >>> >>> I think that will take several days (~week?) to complete, so it should >>> be done on 'staging' so that users are not left without binary >>> substitutes for very long. >>> >>> But then, we are probably facing a weeks worth of merge conflicts. >>> >>>> P.S. It seems that I have to type the patch a second time, so it may be >>>> a while until I am able to push to master. >>> >>> I would assume `git cherry-pick` could resolve most hunks, no? Files >>> with many conflicts may be easier to reset to their original state and >>> redo. >>> >> >> Maybe if my commits were split up? I have to read about >> `git cherry-pick`. >> >>> If you do have to redo large parts of it, maybe we could do it in 3-4 >>> batches and keep an eye on Hydra in between? It would cause some extra >>> rebuilds, but I suspect it's the least painful option. >> >> That could work. I'll see if I can have things sorted by tomorrow and >> we'll go from there. > > The patches are in working order. The first patch would cause 1200 > rebuilds, but the second would only cause 128 rebuilds. Should I work on > splitting up the first patch into pieces that Hydra can handle under its > current load? I'm not actually sure what's best here. It may be easiest to just throw them both at 'staging' and accept the (hopefully few) merge conflicts. Ludo, any preference? If we're going staging, let's try to coordinate it so that we can start it shortly after adding them. Maybe midnight tomorrow or Saturday UTC? I have a few other updates in my queue that haven't been pushed yet. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlmoQIAACgkQoqBt8qM6 VPpkJAgA0kNLvNF4wKIeCRtFqWrh/BzDMwKrydVDp7elCSDMuk/UBmw+6GQwgQTM wyw5p6ajs5s+54hS+ZMOMQ+TNnDZzZJYXBMV81HfRvlGTBt4ARvv5+0gc2aiPt7C 6cMVKQGaZNPi+JhRqC4cCa3VjbCzGyfou0GnsYcEVJ+2JxX794aVQ+3llROeiOu2 /BffK90CVOXVEDVm4BICGx5rXhZ5cRfQQSWST9OdQEaaTV8io+lfqsNc/8zd3gzv 64FyqSqm5qCL0x5lV7Hz+2v9Wnr+QxLyQc/D+6i5Rr75bcJDqqT70Pv+fGyvkzAI leJPAlr4IWSt7N8k0qhEJVMRa859ig== =TF8v -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 01 04:18:10 2017 Received: (at 27898) by debbugs.gnu.org; 1 Sep 2017 08:18:10 +0000 Received: from localhost ([127.0.0.1]:38988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnh9W-0003m3-7n for submit@debbugs.gnu.org; Fri, 01 Sep 2017 04:18:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50005) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnh9V-0003lp-Bp for 27898@debbugs.gnu.org; Fri, 01 Sep 2017 04:18:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnh9L-0003F7-DY for 27898@debbugs.gnu.org; Fri, 01 Sep 2017 04:18:04 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:50426) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnh9L-0003F3-9d; Fri, 01 Sep 2017 04:17:59 -0400 Received: from [193.50.110.184] (port=34430 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dnh9K-00021K-Iu; Fri, 01 Sep 2017 04:17:59 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. References: <87a82jzhwg.fsf@posteo.net> <878ti3zade.fsf@fastmail.com> <8760d7z49r.fsf@posteo.net> <87shg7yjti.fsf@posteo.net> <87r2vrk70f.fsf@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 15 Fructidor an 225 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Fri, 01 Sep 2017 10:17:54 +0200 In-Reply-To: <87r2vrk70f.fsf@fastmail.com> (Marius Bakke's message of "Thu, 31 Aug 2017 18:59:44 +0200") Message-ID: <87tw0m7ryl.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 27898 Cc: Kei Kebreau , 27898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hello, Marius Bakke skribis: > Kei Kebreau writes: [...] >> The patches are in working order. The first patch would cause 1200 >> rebuilds, but the second would only cause 128 rebuilds. Should I work on >> splitting up the first patch into pieces that Hydra can handle under its >> current load? > > I'm not actually sure what's best here. It may be easiest to just throw > them both at 'staging' and accept the (hopefully few) merge conflicts. > > Ludo, any preference? The one that causes 128 rebuilds could go to =E2=80=98master=E2=80=99 (whic= h is a good thing: we won=E2=80=99t have conflicts with this part of the changes.) The rest could go to =E2=80=98staging=E2=80=99 I suppose. > If we're going staging, let's try to coordinate it so that we can start > it shortly after adding them. Maybe midnight tomorrow or Saturday UTC? > I have a few other updates in my queue that haven't been pushed yet. Sounds reasonable to me. I=E2=80=99ll let you coordinate. :-) Thanks for taking care of this! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 04 00:13:51 2017 Received: (at 27898) by debbugs.gnu.org; 4 Sep 2017 04:13:51 +0000 Received: from localhost ([127.0.0.1]:47371 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1doilj-0000Ui-Fx for submit@debbugs.gnu.org; Mon, 04 Sep 2017 00:13:51 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41053) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1doilh-0000UV-Lx for 27898@debbugs.gnu.org; Mon, 04 Sep 2017 00:13:50 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id E95882099A for <27898@debbugs.gnu.org>; Mon, 4 Sep 2017 06:13:42 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3xlxKx4jSTzyvF; Mon, 4 Sep 2017 06:13:41 +0200 (CEST) From: Kei Kebreau To: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. References: <87a82jzhwg.fsf@posteo.net> <878ti3zade.fsf@fastmail.com> <8760d7z49r.fsf@posteo.net> <87shg7yjti.fsf@posteo.net> <87r2vrk70f.fsf@fastmail.com> <87tw0m7ryl.fsf@gnu.org> Date: Mon, 04 Sep 2017 00:13:32 -0400 In-Reply-To: <87tw0m7ryl.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Fri, 01 Sep 2017 10:17:54 +0200") Message-ID: <87bmmrdrtf.fsf@posteo.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -5.1 (-----) X-Debbugs-Envelope-To: 27898 Cc: Marius Bakke , 27898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.1 (-----) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Hello, > > Marius Bakke skribis: > >> Kei Kebreau writes: > > [...] > >>> The patches are in working order. The first patch would cause 1200 >>> rebuilds, but the second would only cause 128 rebuilds. Should I work on >>> splitting up the first patch into pieces that Hydra can handle under its >>> current load? >> >> I'm not actually sure what's best here. It may be easiest to just throw >> them both at 'staging' and accept the (hopefully few) merge conflicts. >> >> Ludo, any preference? > > The one that causes 128 rebuilds could go to =E2=80=98master=E2=80=99 (wh= ich is a good > thing: we won=E2=80=99t have conflicts with this part of the changes.) I've committed the 128-rebuild patch to the master branch. > > The rest could go to =E2=80=98staging=E2=80=99 I suppose. > >> If we're going staging, let's try to coordinate it so that we can start >> it shortly after adding them. Maybe midnight tomorrow or Saturday UTC? >> I have a few other updates in my queue that haven't been pushed yet. > > Sounds reasonable to me. I=E2=80=99ll let you coordinate. :-) > Marius, send me an email when you're ready! > Thanks for taking care of this! > :-) > Ludo=E2=80=99. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlms0u0ACgkQ5qXuPBlG eg0olw//fA43pWXY8luJiToFU7szEpjdPocX4kMEBIXs+LnAnb0cLTN0+xzi4TNc KlRvMYS8KC33St2DYKCMhqt2QDQ9ZDjIKkytYxxwn0GoDTcOMlZc4/IdWW8k/uNN Xpk/lh80s5X2AtBJNIx6DTVNn87qBdyFcSWBktNt811dbdW8N8uPWxN8W8Sc+UK4 XbAvcv/AMKsgKKQM16U09HnaEK3tuL78zUA6dkX4nsbpIQjzPb3ZFxtfD9Qji2nX BxGmps5o6uz38+s/GTG/FAkLu/3qFR7SpHXXiAxHQVydhqS9RLNghLFtNzp/PGJi AmE2EIXcTaBa4Uc0SqZWeRuxwwwV9DbI6m7OTlVqYndEvkIs+jUQfJZx5F9Fl/QY 76NxFpvumxdJH+u99pbxaQzkgjAkWvr5OLDkVAYQATtxhej2e1VLdgqMuSBDYYa+ LfLbeTRmIQZrFo9btdwszVAGiH1XbZl4lgWv62Is/dRMbdBSo7C3NANWV5Rhenwz +pACMvVzHOrPyql3VYfiGs91c0kpy2ejYT5MoIXr/L+RXDEpU6dxG1luRFt2+BCO 0EIfvg6EHPFA8sBN+fzFfS2ZTSYnvzLOlvJSIhbhiU0f/YI5g7Ihn2Rz+fyqeoS+ ob9lKRwkSGVwk/tmSZeEWzsVnw9Ar17SROF+OPWN9e8Rr26/Tpc= =Cdaj -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 04 16:37:50 2017 Received: (at 27898) by debbugs.gnu.org; 4 Sep 2017 20:37:50 +0000 Received: from localhost ([127.0.0.1]:49393 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1doy7y-0004Tm-Ao for submit@debbugs.gnu.org; Mon, 04 Sep 2017 16:37:50 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:53029) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1doy7x-0004Tf-1U for 27898@debbugs.gnu.org; Mon, 04 Sep 2017 16:37:49 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 731AA20DC3; Mon, 4 Sep 2017 16:37:48 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 04 Sep 2017 16:37:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=jYsjS7JB2tAG3TRvFCxO/IcpSOrc5QtfcIhZcnfYh Zo=; b=O/Hu+Dh3gTCADjZBDcZ45YnAtTM0xxhEoJlGvhZMJevgiQvlhCcUKcwID OlZECwSA7288dfVoBN8CPAwLMYJrV1mZxNEC5wI3ZbRSqCIwymCeVHEDnsSFSsD3 PNiI71LnYN1VuTsnLB5VFEzEkp/ryYvAhSsURihAHLqTCMDusJZnznv+hFq+uqNc gqMTb+vYFXZaeo3vfxriuu2/PFvzK6M2cFBMPHmF9vk0NUV58XIfZT5oiYnpM33H H8VMck9ykcukJRuK3YZe66TmfAfKMCSfNQnBflrAMOyJHReHQCZ7u/7l6ygLvYeS RxIKgwUD8kKnlWQvStGfXZNSX1JTQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=jYsjS7JB2tAG3TRvFC xO/IcpSOrc5QtfcIhZcnfYhZo=; b=pdtkn6wQptQDRC4wXVSPUN01bl62XE7sea O7d/PWM/qqp6JSZezg9A8Iy3PhrPTCJLpfYKvVvBRFhbkKdKB20Sf4X96FUAyQZi pAWVy5FVI2e5oK0OtuiFATHqL0fbbkVT49wW+W+Qy2YyCGLz2/CbgVU9H07N7x6Z mBFIjGLUWhrM/g6SgBWTm9YSgIKY9SqKBM7lzoIJ2YSoJCkJY/Gyc1SWzXtIaHsy MY6Wv/wfxp5volbKmJhw4qfrnxKU8Glqah0ms8S0gqPFHx4UjnIJVN6ZCFsZT3VU k9AhB/7q4wOaGxHpwoXj7M0KdRo2mhUIg7lcFAtpThgSq9kruJ9A== X-ME-Sender: X-Sasl-enc: 9I8jG8/Zytsj8+lMP/ukJD90nHKOXv4d4ctzAIKN1BsD 1504557468 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 0190A7E755; Mon, 4 Sep 2017 16:37:47 -0400 (EDT) From: Marius Bakke To: Kei Kebreau , Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. In-Reply-To: <87bmmrdrtf.fsf@posteo.net> References: <87a82jzhwg.fsf@posteo.net> <878ti3zade.fsf@fastmail.com> <8760d7z49r.fsf@posteo.net> <87shg7yjti.fsf@posteo.net> <87r2vrk70f.fsf@fastmail.com> <87tw0m7ryl.fsf@gnu.org> <87bmmrdrtf.fsf@posteo.net> User-Agent: Notmuch/0.25 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Mon, 04 Sep 2017 22:37:46 +0200 Message-ID: <87k21ejj39.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27898 Cc: 27898@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Kei Kebreau writes: >> The rest could go to =E2=80=98staging=E2=80=99 I suppose. >> >>> If we're going staging, let's try to coordinate it so that we can start >>> it shortly after adding them. Maybe midnight tomorrow or Saturday UTC? >>> I have a few other updates in my queue that haven't been pushed yet. >> >> Sounds reasonable to me. I=E2=80=99ll let you coordinate. :-) >> > > Marius, send me an email when you're ready! Ready when you are! I just merged in 'master' so it should be good to go. I'll have a look at the rebuild count of the patch and see if there's a lot of overlap with dbus and/or util-linux and possibly revert those before starting Hydra. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlmtuZoACgkQoqBt8qM6 VPrcbgf8DzGVk6+0nXzWtzhdyEtvr9cMOik+BYKM4XDg+00fgDf1fH/r4fXPSKDC VutIk1k2q0IUgGLF5kLuoFQuNLr6Ke8VV6AYLSKxuvhLi3o4PRAjieju9BprmIOg HzjFeAvGub/+eVfi8OVrUHjFxDQ6+gP0yYvRSrCN/U1snn+PJEWO1/g25SPI3sCH 4jTGkgJjSM7ozVY1Ck5f+OIpOBWs2/9XBxL0dpKV5GBtmlL45M7zHQy1+7PvXVBs vuqDXvuLbFQC0wsClUCzrIsB4pX3fTIddKnKyOhraCc6I+CFJtqf/NHDCZ58y3RC 21NOj5U+4IaKHJqzBpQWPf2QkoTuQw== =sdfw -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 18 23:17:13 2017 Received: (at 27898-done) by debbugs.gnu.org; 19 Oct 2017 03:17:13 +0000 Received: from localhost ([127.0.0.1]:48965 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e51Ka-00071G-VQ for submit@debbugs.gnu.org; Wed, 18 Oct 2017 23:17:13 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e51KY-000718-Rf for 27898-done@debbugs.gnu.org; Wed, 18 Oct 2017 23:17:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1508369358; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:In-reply-to:Date:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-ID; l=450; bh=LpCZdJ7EJ9H4EUaE1uzFTzUtlV1+wgbX57yKNUHFZUA=; b=Z2rF6CtcnpKfTneIDBq1nBMfQ0/wAqSEiUc2r9R62S3OA+lxZ+kpXLBB21/2z7iH mp+Uvgg+ft+p5xaf2RK8Ag0d5JKDk0OgztLpGql57j8q5ZQecxnLvhONrKcpPKEqQb0 1ksAKqixzyGqyFwtp1+ig6tev32BCKECv+HDEgf8= Received: from localhost (port-92-200-55-161.dynamic.qsc.de [92.200.55.161]) by mx.zohomail.com with SMTPS id 1508369358171148.56494221952846; Wed, 18 Oct 2017 16:29:18 -0700 (PDT) References: <871sov69jq.fsf@openmailbox.org> User-agent: mu4e 0.9.18; emacs 25.3.1 From: Ricardo Wurmus To: Kei Kebreau Subject: Re: [bug#27898] Clean-up of package phases In-reply-to: <871sov69jq.fsf@openmailbox.org> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Thu, 19 Oct 2017 01:29:15 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Message-ID: <87sheg2fxw.fsf@elephly.net> X-ZohoMailClient: External X-Spam-Score: -2.8 (--) X-Debbugs-Envelope-To: 27898-done Cc: 27898-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) Kei Kebreau writes: > These patches address some issues with our package definitions, as > partially discussed with Mark on guix-devel. I believe I've corrected > all the cases that are fit for Guix's master branch. Looks like this has already been pushed to the repository, so I=E2=80=99m closing this now. Thanks! --=20 Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Fri Sep 05 09:10:26 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 16 Nov 2017 12:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator