From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnP4p-0004PM-Ct for guix-patches@gnu.org; Thu, 31 Aug 2017 09:00:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnP4k-0001Za-HY for guix-patches@gnu.org; Thu, 31 Aug 2017 09:00:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:56024) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dnP4k-0001ZU-D5 for guix-patches@gnu.org; Thu, 31 Aug 2017 09:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dnP4k-0006k9-68 for guix-patches@gnu.org; Thu, 31 Aug 2017 09:00:02 -0400 Subject: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. Resent-Message-ID: From: Kei Kebreau 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> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Marius Bakke Cc: 27898@debbugs.gnu.org --=-=-= 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----- --=-=-=--