From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oleg Pykhalov Subject: Re: 01/01: gnu: cmake: Delete Emacs library. Date: Wed, 23 May 2018 19:10:49 +0300 Message-ID: <87y3ga9wty.fsf@gmail.com> References: <20180522141738.8231.26687@vcs0.savannah.gnu.org> <20180522141741.641D120711@vcs0.savannah.gnu.org> <87d0xn7cqt.fsf@netris.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLWLq-0008IS-Ju for guix-devel@gnu.org; Wed, 23 May 2018 12:11:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLWLn-0007VD-C9 for guix-devel@gnu.org; Wed, 23 May 2018 12:10:58 -0400 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:51769) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fLWLn-0007U7-5N for guix-devel@gnu.org; Wed, 23 May 2018 12:10:55 -0400 Received: by mail-wm0-x22e.google.com with SMTP id j4-v6so10573274wme.1 for ; Wed, 23 May 2018 09:10:54 -0700 (PDT) In-Reply-To: <87d0xn7cqt.fsf@netris.org> (Mark H. Weaver's message of "Tue, 22 May 2018 14:43:06 -0400") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Mark H Weaver Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello Mark, Mark H Weaver writes: [=E2=80=A6] > go.wigust@gmail.com (Oleg Pykhalov) writes: > >> wigust pushed a commit to branch core-updates >> in repository guix. >> >> commit f037673c3133ae7453794f1f62eecebf9d06b092 >> Author: Oleg Pykhalov >> Date: Tue May 22 07:41:45 2018 +0300 >> >> gnu: cmake: Delete Emacs library. >>=20=20=20=20=20 >> * gnu/packages/finance.scm (cmake)[arguments]: Delete Emacs library. [=E2=80=A6] > Also, the commit log is wrong (it says that the changes were in > finance.scm), and: Ouch, I'm sorry. >> @@ -85,6 +85,12 @@ >> " --exclude-regex ^\\(" (string-join skipped-tests "\\|") "\= \)$"))) >> #:phases >> (modify-phases %standard-phases >> + (add-after 'unpack 'split-package >> + ;; Remove files that have been packaged in other package rec= ipes. >> + (lambda _ >> + (delete-file "Auxiliary/cmake-mode.el") >> + (substitute* "Auxiliary/CMakeLists.txt" >> + ((".*cmake-mode.el.*") "")))) > > this new phase that you've added returns an unspecified value, although > it is supposed to return a boolean to indicate success or failure. substitute* returns #t if it finds a file and error otherwise. Do I miss understand something? =2D-8<---------------cut here---------------start------------->8--- scheme@(guile-user)> (substitute* "/tmp/test.txt" (("Hello") "foo")) $3 =3D #t scheme@(guile-user)> (substitute* "/tmp/test.txt" (("bla") "foo")) $4 =3D #t scheme@(guile-user)> (substitute* "/tmp/test.txtf" (("bla") "foo")) ERROR: In procedure stat: In procedure stat: No such file or directory: "/tmp/test.txtf" Entering a new prompt. Type `,bt' for a backtrace or `,q' to continue. =2D-8<---------------cut here---------------end--------------->8--- /tmp/test.txt =2D-8<---------------cut here---------------start------------->8--- Hello =2D-8<---------------cut here---------------end--------------->8--- [=E2=80=A6] > After fixing the commit log and return value of the new phase, how > about pushing this to 'core-updates-next' instead? OK, I'll do it later. > What do you think? core-updates-next branch should be mentioned in Guix documentation https://www.gnu.org/software/guix/manual/html_node/Submitting-Patches.html Oleg. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEc+OyAXw1EaDPCmAPckbhHGm3lWkFAlsFkokACgkQckbhHGm3 lWnUTw//TNfKOlpcfnfq5BWukXhXn6PXa2vPHFez1dKwTbbuxq0lrqw/Oy4JR02/ 3pJm6p760NBOpD6bTSjzn7ERfHjpwoC5+35OqYcbnYVSFhVK845e/q4UkZVLaGJ7 qGykx4BNAw6pSigh1EsWc+NIZ47xXRcmhSVCODz2tnGV39o33ficWZIzaioEp0hc aAJ2rSJS1JN7fhM3zpsgwlBMkKv+aqS98ZxTjEqZILAmTzNdYytimELoXTiAaLbA nBwAaeTTRQ9uTi3N4zR0Q74gwaH/2G2rrtBfIh7eWZct12wNc1PSfN/5QQ3Rtv0K R9yB5p2JTp1jbFk66y/oP0CfqrNvtNMmgjBWrRFWX6zA43XULYfcu2yq+QkjUsvV x8JO2dEvETNoQZKWodkAnc5wkKGyJQqLqMUxTE+nrntPfXQbM0RRwOzrvntfNzye ZGvk+sxMmJisdf7iEWxvvythwwoCHSRhI3/JCrjNdHwGxWNpxX4Mpr3yBJqcGosE cWAU0+6OmEgRrdFh2fXGGw9aQFdmmudT9nDGtvOIFsD/N1difqdPzoggL+9fUP6Q kKe5ZPXI+mrR+NJzjT+wau925n0mJgryz48A7unT8Lw5sErQz9bBq8K2+7sfAPIm mneYnFYZOz3HS09WV4Cxf4er8ecyJ+82XFDtBcoXoOhX7v2gYxo= =bsuH -----END PGP SIGNATURE----- --=-=-=--