From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:37933) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOlCl-0004TD-Km for guix-patches@gnu.org; Wed, 15 Apr 2020 12:48:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOlCk-0007cE-Cb for guix-patches@gnu.org; Wed, 15 Apr 2020 12:48:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53687) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOlCk-0007cA-7p for guix-patches@gnu.org; Wed, 15 Apr 2020 12:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jOlCk-00086p-6V for guix-patches@gnu.org; Wed, 15 Apr 2020 12:48:02 -0400 Subject: [bug#40426] [PATCH] Add g-golf Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:37752) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOlBp-0004Iq-QT for guix-patches@gnu.org; Wed, 15 Apr 2020 12:47:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOlBo-00072Q-DQ for guix-patches@gnu.org; Wed, 15 Apr 2020 12:47:05 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]:36317) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOlBo-00071V-5A for guix-patches@gnu.org; Wed, 15 Apr 2020 12:47:04 -0400 Received: by mail-pg1-x52f.google.com with SMTP id c23so179123pgj.3 for ; Wed, 15 Apr 2020 09:47:04 -0700 (PDT) References: <6xX3P5wtqPLaHAJcG08vvndO5ruSKavzCs0khwcdJmF2CYVGjPLz_J-2HZXM7vCKOcAiSqWHMFPG1-rQA04EWZ9YPqh6KA090K1BOwlAhpY=@protonmail.com> <87ftd426p6.fsf@nckx> From: Mike Rosset In-reply-to: <87ftd426p6.fsf@nckx> Date: Wed, 15 Apr 2020 09:47:01 -0700 Message-ID: <87eesozofu.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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: me@tobias.gr, 40426@debbugs.gnu.org Cc: D0dyBo0D0dyBo0@protonmail.com --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Tobias Geerinckx-Rice via Guix-patches via writes: > Vitaliy, > > Vitaliy Shatrov via Guix-patches via =E5=86=99=E9=81=93=EF=BC=9A >> str1ngs and nly want it to be submitted to guix, and i was proudly >> take this task. Package was copied "as-is", and tested as per Guix >> manual. > > Thank you! Tobias, this has already been merged with dfe277a5ce60d487fe44840506206fea8507bc69. I will though address your comments with this attached patch. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-g-golf-Fix-version-to-0.0.0-0.4a4edf2.patch Content-Description: 0001-gnu-g-golf-Fix-version-to-0.0.0-0.4a4edf2.patch >From 1b230e6e000b57bfa3d2b4ef63a894e5e02195d5 Mon Sep 17 00:00:00 2001 From: Mike Rosset Date: Wed, 15 Apr 2020 09:41:10 -0700 Subject: [PATCH] gnu: g-golf: Fix version to 0.0.0-0.4a4edf2 * gnu/packages/guile-xyz.scm (g-golf): Fix version to 0.0.0-0.4a4edf2. --- gnu/packages/guile-xyz.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index ebd7d89dec..58938268e4 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1652,10 +1652,13 @@ capabilities.") (license license:gpl3+))) (define-public g-golf - (let ((commit "4a4edf25e4877df9182c77843bdd98ab59e13ef7")) + (let ((commit "4a4edf25e4877df9182c77843bdd98ab59e13ef7") + (revision "0")) (package (name "g-golf") - (version (git-version "1" "683" commit)) + (version (git-version "0.0.0" revision commit)) + ;; g-golf is still work in progress. Since there are no release + ;; tarballs we use git for sources. (source (origin (method git-fetch) (uri (git-reference @@ -1684,13 +1687,13 @@ capabilities.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'tests-work-arounds + (add-before 'configure 'substitue-tty-test (lambda* (#:key inputs #:allow-other-keys) ;; In build environment, There is no /dev/tty - (substitute* - "test-suite/tests/gobject.scm" - (("/dev/tty") "/dev/null")))) - (add-before 'configure 'substitute-libs + (substitute* "test-suite/tests/gobject.scm" + (("/dev/tty") "/dev/null") + #t))) + (add-before 'configure 'substitute-libriaries (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((get (lambda (key lib) (string-append (assoc-ref inputs key) "/lib/" lib))) -- 2.26.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable > Too clever for me :-) It's a Guile library; hence the correct Guix > name (and variable) is =E2=80=98guile-g-golf=E2=80=99. We have plenty of > =E2=80=98python-pyfoo=E2=80=99 packages to keep it company. > No. I can't change this to guile-g-golf. The author of g-golf has explicated stated they would like the package name to be g-golf. > Could you add a comment here explaining why we use a git commit, > instead of a release tarball or tag? I assume there are none; that > would do as comment. However=E2=80=A6 I've added a comment for why git sources are used. > =E2=80=A6=E2=80=981=E2=80=99 means the project has released version 1 pri= or to this commit, or > at least regards this commit as part of the =E2=80=981=E2=80=99 series. I= didn't spot > any version number on the home page, NEWS file, git tags, =E2=80=A6 > > If there is no =E2=80=981=E2=80=99 release, use =E2=80=980.0.0=E2=80=99. > > The second field (REVISION) should be =E2=80=980=E2=80=99, since this is = the first > *Guix* revision of this package. The idea is that you increment the > revision each time you change COMMIT, so Guix knows which commit is > newer and can =E2=80=98guix package -u=E2=80=99 properly. > > Since the 2 should be updated together, bind them together: > > (let ((commit "f00") > (revision "0")) =E2=80=A6 > > You obviously got =E2=80=98683=E2=80=99 from somewhere though. Where? > This is fixed now, this got carried over from me tracking upstream revisions. I've reset it to version 0.0.0 and revision 0. This is probably the most important fix. > Prefer =E2=80=98verb-thing=E2=80=99; makes it much easier to skim unfamil= iar packages. > done > > For now, all phases must return #t. SUBSTITUTE* doesn't, so we need > > (lambda =E2=80=A6 > =E2=80=A6 > (substitute* "test-suite/tests/gobject.scm" > (("/dev/tty") "/dev/null")) > #t) done > No need to put the file name on its own line here. > > + (add-before 'configure 'substitute-libs done --=-=-=--