From patchwork Wed Apr 15 23:02:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike Rosset X-Patchwork-Id: 21280 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3E50327BBEA; Thu, 16 Apr 2020 00:03:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7173727BBE4 for ; Thu, 16 Apr 2020 00:03:10 +0100 (BST) Received: from localhost ([::1]:55836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOr3l-0007YA-TZ for patchwork@mira.cbaines.net; Wed, 15 Apr 2020 19:03:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53636) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOr3f-0007Wm-Je for guix-patches@gnu.org; Wed, 15 Apr 2020 19:03:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOr3e-0007YZ-IP for guix-patches@gnu.org; Wed, 15 Apr 2020 19:03:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53973) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOr3e-0007YV-Ey for guix-patches@gnu.org; Wed, 15 Apr 2020 19:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jOr3e-0001Dc-Ah for guix-patches@gnu.org; Wed, 15 Apr 2020 19:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40426] [PATCH] Add g-golf Resent-From: Mike Rosset Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Apr 2020 23:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40426 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: me@tobias.gr, 40426@debbugs.gnu.org Cc: D0dyBo0D0dyBo0@protonmail.com X-Debbugs-Original-To: Tobias Geerinckx-Rice , Tobias Geerinckx-Rice via Guix-patches X-Debbugs-Original-Cc: Vitaliy Shatrov , 40426@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15869917624647 (code B ref -1); Wed, 15 Apr 2020 23:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Apr 2020 23:02:42 +0000 Received: from localhost ([127.0.0.1]:37283 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jOr3J-0001Ct-PA for submit@debbugs.gnu.org; Wed, 15 Apr 2020 19:02:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:50599) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jOr3I-0001Cl-1J for submit@debbugs.gnu.org; Wed, 15 Apr 2020 19:02:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53576) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOr3G-0007WB-Nh for guix-patches@gnu.org; Wed, 15 Apr 2020 19:02:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOr3F-0007W7-MM for guix-patches@gnu.org; Wed, 15 Apr 2020 19:02:38 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:42163) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOr3F-0007Vt-Dt for guix-patches@gnu.org; Wed, 15 Apr 2020 19:02:37 -0400 Received: by mail-pf1-x443.google.com with SMTP id r20so719642pfh.9 for ; Wed, 15 Apr 2020 16:02:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=DTxpe9od5IO/6iD5Osf76IJWMg7kt0U6QZkA2lpVwxg=; b=DpBaEuyfXGndZCZIZ8aGfXdLIwL5HdP/WSv2VyZhU01HIpe0CBo7n2L+h4kyu/pBwF Ph4QSfa6vh14vDT3wnbB2z8qBg3dFEzln7hKcJ9eiUWlZ5Vgli1eAhMm3ApRyb6RXQgb JUIuLhnYCHd9xFZnAmd2HjocIFBEyBCMkkKD69PUiehsAnotFCYN/Vz9o9o8CdHyHSc/ iR95r0RXDag3s+x88WS6cYWhCC4LnqPd5NF6fj0gOcGMAsXqFF4ejgI+MZkeFnWPWATi TtgwrCFHlpFfJYi1WxNNkgO8LQ8JAHZGrAbpmjxPkDsjlwvA8pmcTOd8nAEyK7ks4zwN Va1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=DTxpe9od5IO/6iD5Osf76IJWMg7kt0U6QZkA2lpVwxg=; b=SVz/fu4EuCit2mr3cjiz3xgcT0KD8oPFfu8oLTlN01Rz4uySLEtLH9IuVRKyA6NfSx 0TeMiS/QWjcixPVzp22k2K74MpD4baWGrRoAio8wA2tKowBWo5qnhBPNtNxzGRm5t+qh MnYffxFU3xdY5WWzxsMwR4y3xy63H6KvBg/YBz7i/G1i7ldS5jSIyYx6CEzywwT4HgqL To7BBhpgashtT28Eav9oJvZoCQ+qWVaywmG/Ab/wUhVbgk6LPq/GT9G+ljyCe6B+3kud kiWk+FYI6IcBIWgerorr3hTsO0vi0bNklfe6ePaQEPHHbzNOPpU4u5NEbLqX0Hiag36v tBgw== X-Gm-Message-State: AGi0Pua860groIchfMJfZq5ESxsJ7m7GfdB76YzKvIqfmDNe3kSqOSJC uW2/i2vi9+ldIZw2pKCEIBI= X-Google-Smtp-Source: APiQypLnjawwWGt5soSzMYfTr2BpQoMp3N6hCx+iVHMVMeddaKpJTA7cH0632c8SVMht7lDIo3Kokg== X-Received: by 2002:aa7:8a9a:: with SMTP id a26mr17185280pfc.77.1586991755901; Wed, 15 Apr 2020 16:02:35 -0700 (PDT) Received: from neutron (S010664777da04f43.vf.shawcable.net. [70.68.94.152]) by smtp.gmail.com with ESMTPSA id b2sm13502328pgg.77.2020.04.15.16.02.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 16:02:35 -0700 (PDT) References: <6xX3P5wtqPLaHAJcG08vvndO5ruSKavzCs0khwcdJmF2CYVGjPLz_J-2HZXM7vCKOcAiSqWHMFPG1-rQA04EWZ9YPqh6KA090K1BOwlAhpY=@protonmail.com> <87ftd426p6.fsf@nckx> User-agent: mu4e 1.2.0; emacs 26.3 From: Mike Rosset In-reply-to: <87ftd426p6.fsf@nckx> Date: Wed, 15 Apr 2020 16:02:33 -0700 Message-ID: <87d088z71y.fsf@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Tobias Geerinckx-Rice via Guix-patches via writes: > > …‘1’ means the project has released version 1 prior to this commit, or > at least regards this commit as part of the ‘1’ series. I didn't spot > any version number on the home page, NEWS file, git tags, … > > If there is no ‘1’ release, use ‘0.0.0’. > > The second field (REVISION) should be ‘0’, 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 ‘guix package -u’ properly. > > Since the 2 should be updated together, bind them together: > > (let ((commit "f00") > (revision "0")) … Slight change to my follow up patch, version should be 0.1.0. From 31947bce363b87b2f82e98f69704296b22a1be47 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.1.0-0.4a4edf2 * gnu/packages/guile-xyz.scm (g-golf): Fix version to 0.1.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..f725280ce1 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.1.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