From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIZyP-0000Zz-88 for guix-patches@gnu.org; Wed, 07 Jun 2017 08:22:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIZyM-0000zk-2i for guix-patches@gnu.org; Wed, 07 Jun 2017 08:22:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:57791) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIZyL-0000ze-Uu for guix-patches@gnu.org; Wed, 07 Jun 2017 08:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dIZyL-0000A4-ML for guix-patches@gnu.org; Wed, 07 Jun 2017 08:22:01 -0400 Subject: bug#27275: [PATCH 1/2] pull: Add a dependency to guile-git. Resent-Message-ID: From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170607120405.7156-1-m.othacehe@gmail.com> <20170607120553.7382-1-m.othacehe@gmail.com> Date: Wed, 07 Jun 2017 14:21:07 +0200 In-Reply-To: <20170607120553.7382-1-m.othacehe@gmail.com> (Mathieu Othacehe's message of "Wed, 7 Jun 2017 14:05:52 +0200") Message-ID: <87r2yw56q4.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: Mathieu Othacehe Cc: 27275@debbugs.gnu.org Hi Mathieu! Mathieu Othacehe skribis: > * build-aux/build-self.scm (guile-git, guile-bytestructures): New > variables. > (build): Add guile-git and guile-bytestructures to %load-path and > %load-compiled-path. > * gnu/packages/guile.scm (guile2.2-bytestructures, guile2.2-git): New > variables. > * gnu/packages/package-management.scm (guix)[propagated-inputs]: Add > guile-git. > [wrap-program]: Add guile-git to path. [...] > +(define guile-git > + ;; TODO: Add guile2.0-git. > + (package-for-current-guile "guile-git" > + "guile2.2-git")) > + > +(define guile-bytestructures > + ;; TODO: Add guile2.0-bytestructures. > + (package-for-current-guile "guile-bytestructures" > + "guile2.2-bytestructures")) You can add the =E2=80=9Cguile2.0-=E2=80=9D names too in the arguments to =E2=80=98package-for-current-guile=E2=80=99. It doesn=E2=80=99t hurt, and = if/when we add them, they=E2=80=99ll automatically be picked up. You can also remove the TODOs. > (set! %load-path > (cons* json > + (string-append #$guile-git "/share/guile/site/" > + #$(effective-version)) > + (string-append #$guile-bytestructures "/share/guile/s= ite/" > + #$(effective-version)) > (string-append #$guile-ssh "/share/guile/site/" > #$(effective-version)) > %load-path)) > (set! %load-compiled-path > (cons* json > + (string-append #$guile-git "/lib/guile/" > + #$(effective-version)- > + "/site-ccache") =E2=80=98guile-git=E2=80=99 can be #f so you have to account for that. > --- a/gnu/packages/guile.scm > +++ b/gnu/packages/guile.scm > @@ -1593,6 +1593,10 @@ an abstraction over raw memory. It's also more po= werful than the C > type system, elevating types to first-class status.") > (license license:gpl3+))) >=20=20 > +;; TODO: Add guile2.0-bytestructures. > +(define-public guile2.2-bytestructures > + (deprecated-package "guile2.2-bytestructures" guile-bytestructures)) > + > (define-public guile-aspell > (package > (name "guile-aspell") > @@ -1803,6 +1807,10 @@ is not available for Guile 2.0.") > manipulate repositories of the Git version control system.") > (license license:gpl3+)))) >=20=20 > +;; TODO: Add guile2.0-git. > +(define-public guile2.2-git > + (deprecated-package "guile2.2-git" guile-git)) These aliases are unneeded: we=E2=80=99ll just use the names without =E2=80= =9C2.2=E2=80=9D by default, no problem. > --- a/gnu/packages/package-management.scm > +++ b/gnu/packages/package-management.scm > @@ -185,6 +185,7 @@ > (let* ((out (assoc-ref outputs "out")) > (guile (assoc-ref inputs "guile")) > (json (assoc-ref inputs "guile-json")) > + (git (assoc-ref inputs "guile-git")) > (ssh (assoc-ref inputs "guile-ssh")) > (gnutls (assoc-ref inputs "gnutls")) > (effective > @@ -195,6 +196,7 @@ > (path (string-append > json "/share/guile/site/" effect= ive ":" > ssh "/share/guile/site/" effecti= ve ":" > + git "/share/guile/site/" effecti= ve ":" > gnutls "/share/guile/site/" effe= ctive))) >=20=20 > (wrap-program (string-append out "/bin/guix") > @@ -250,6 +252,7 @@ > (propagated-inputs > `(("gnutls" ,gnutls/guile-2.2) ;for 'guix download' &= co. > ("guile-json" ,guile-json) > + ("guile-git" ,guile-git) I think this breaks the =E2=80=98guile2.0-guix=E2=80=99 package. I hope to= remove it soonish (when the guile-ssh bug is fixed), but for now, we have to live with it. So I would suggest simply leaving this file unchanged. We can always add the =E2=80=98guile-git=E2=80=99 dependency there later on. WDYT? With these changes it looks good to me! Thanks, Ludo=E2=80=99.