Received: (at 67503) by debbugs.gnu.org; 8 Dec 2024 18:01:17 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Dec 08 13:01:17 2024 Received: from localhost ([127.0.0.1]:51638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tKLan-0006VS-AV for submit <at> debbugs.gnu.org; Sun, 08 Dec 2024 13:01:17 -0500 Received: from mail-lj1-f180.google.com ([209.85.208.180]:52311) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <sharlatanus@HIDDEN>) id 1tKLak-0006VE-GL for 67503 <at> debbugs.gnu.org; Sun, 08 Dec 2024 13:01:15 -0500 Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2ffc76368c6so34322111fa.0 for <67503 <at> debbugs.gnu.org>; Sun, 08 Dec 2024 10:01:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733680813; x=1734285613; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=fE8Vhlc6qH9NUUUOr5WOt8vu/btwliLq0Qgp85TOYo4=; b=IsUC5Rb5yjp+1ArVMslxogqt4QAhZNUsWRg5cVhlRuu4nHBMvtpquSWg6CgzBYUZSJ b4gzjakBO4dUJPxRvN8KtGXYyzwg1C1Qjq1oO4CdUvuH+u2TJy4fP4qm1/e3DO7v2veV vW+DqjFv9ISQqT/SQMtlldJ227O9TZZVoG9sYBYF4kEVX76eqXzeaKwZdfv5BoXFGzz1 NMGIKv/Fq3gjHpzx2SmjzxKt1RpxHoza3Fn35CQzndlguSuazJ1T6gaR0qVybkI4cXRs E1ovUJ7zqwrWk3e74wx1uetFPuCtG6Xoxn06XE7bwMBFxjigR4GnFbgjUF2hpYjrtoE5 /yuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733680813; x=1734285613; h=cc:to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=fE8Vhlc6qH9NUUUOr5WOt8vu/btwliLq0Qgp85TOYo4=; b=InpUDsNLJPGlGbBrjTj1T7BCA1NS/JcX0ARXTQwov8N80AI55vTsOScUywKVyhM35M vAUTugqbl5yKKBa2R1/JswPAsgS8MeR2WCR1NneDlmL42mlKcZwkyuS19bgkK/J/BxHA a1q1D4cqQY7lNCMANXky3XuT4Kx12KCVZ3OvckKC23NzoDhepsR0lWph5MznjNtLCf0a OBJBZGv34/Y67x3r8ss9ZjW3nxcJbF1tljHAjK35zH3lSUSdthM4tAnU1qQgPqXLMPYX QUWNHrKQ4DDASkgcybDXM+encBdt9XOfmpp/Vi26QuWP6KzEVWTbM/fNB4ew3khrWehU DyCQ== X-Gm-Message-State: AOJu0YynEeiuPrd7mlDihqFR/D/9citlTBzLRwMzCwRwSuu2NhLLwYui isuWWrUfwSLU3pmSdD5bIYPr/pTPJP+GdL8Fek4xHx2KTlxG8uFKAYCVXeXjmugGKbFe31s/A0g 92UqNjzh21HtgbFLTfJkOxZFhYT072A== X-Gm-Gg: ASbGncstZ8mcQK6x3ytltTZpE/Qfgww1R08+kiycEwGG0YoDNU725lQsvjZn1J614Ln U8HAxGkEjMGPJkNNY2yNwEZxRFi45Tpc= X-Google-Smtp-Source: AGHT+IE6NmKSypo47VKw6ERt6AtrxMnpdzEu9vceiBTm9pP0UEhR0nV4kLXTFiaUcxTmvMhgsnCv1lWTIwkmAakno9s= X-Received: by 2002:a05:651c:88d:b0:300:3de4:ff72 with SMTP id 38308e7fff4ca-3003de50b17mr26144011fa.27.1733680813084; Sun, 08 Dec 2024 10:00:13 -0800 (PST) MIME-Version: 1.0 From: Sharlatan Hellseher <sharlatanus@HIDDEN> Date: Sun, 8 Dec 2024 18:00:03 +0000 Message-ID: <CAO+9K5rDQTY2J+4n6XnmO6LLxE8STri75rfCALEG1waL4qjQPQ@HIDDEN> Subject: [PATCH 0/2] Improvements to the go importer To: 67503 <at> debbugs.gnu.org Content-Type: multipart/alternative; boundary="0000000000000497590628c60516" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 67503 Cc: Efraim Flashner <efraim@HIDDEN>, Steve George <steve@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --0000000000000497590628c60516 Content-Type: text/plain; charset="UTF-8" Hi, It looks like current go importer has that implementation. What's missing is updater which is awere about pseudo golang version and workspace specific tag (subdirs/v1.2.3). -- Thanks, Oleg --0000000000000497590628c60516 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"auto">Hi,<div dir=3D"auto"><br></div><div dir=3D"auto">It looks= like current go importer has that implementation.</div><div dir=3D"auto">W= hat's missing is updater which is awere about pseudo</div><div dir=3D"a= uto">golang version and workspace specific tag (subdirs/v1.2.3).</div><div = dir=3D"auto"><br></div><div dir=3D"auto">--</div><div dir=3D"auto">Thanks,<= /div><div dir=3D"auto">Oleg</div></div> --0000000000000497590628c60516--
guix-patches@HIDDEN
:bug#67503
; Package guix-patches
.
Full text available.Received: (at 67503) by debbugs.gnu.org; 31 Oct 2024 13:41:47 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Oct 31 09:41:47 2024 Received: from localhost ([127.0.0.1]:42046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1t6VQo-0001G2-Nm for submit <at> debbugs.gnu.org; Thu, 31 Oct 2024 09:41:46 -0400 Received: from mailtransmit05.runbox.com ([185.226.149.38]:39034) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <steve@HIDDEN>) id 1t6VQk-0001Fs-AV for 67503 <at> debbugs.gnu.org; Thu, 31 Oct 2024 09:41:45 -0400 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from <steve@HIDDEN>) id 1t6VOX-00DxYI-Ly; Thu, 31 Oct 2024 14:39:25 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=Content-Type:MIME-Version:Message-ID:Subject: Cc:To:From:Date; bh=Xdg4Q3IPI0lX8AS2QvT/zfdQQxEhRl6yK0sqql5vbb0=; b=D3ITldBJI FKhi2XD/YuEYeTzjL67nd7bJ7SX3DCum5Dm49UPUzpjmHKOpmwSNxodjFd61K6Ub8xEr7OQmo1l8a BUnOdSu9bmMZHINr/PcrNP2eQ6BTo9Q0+TDHHDoVtyIL1hTjkDdFvXbOBYjEVpnBm6Pmvp83f8Nys apXYbQJhGswORhFyMuR44zIx+sBET0QXtmAETmO0RfXYL5Uoe2QgtDhIolWIKjoJ/gl64PNp3MpSG MAQljNgJEiPocp7zZpxaUqswRibCCzhcUUONid5pj3EzquNoxpXnwSDs2nh0g8+q9Y2y04WnGIN+1 WWF6hMJnwuZW5lJZWbZAid/Lg==; Received: from [10.9.9.72] (helo=submission01.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from <steve@HIDDEN>) id 1t6VOX-00052S-A0; Thu, 31 Oct 2024 14:39:25 +0100 Received: by submission01.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1t6VOP-00G18i-BX; Thu, 31 Oct 2024 14:39:17 +0100 Date: Thu, 31 Oct 2024 13:39:16 +0000 From: Steve George <steve@HIDDEN> To: 67503 <at> debbugs.gnu.org Subject: RE: Improvements to the go importer (bumping) Message-ID: <ZyOIhG2SlSFMtIZg@dragon2> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 67503 Cc: Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, Bumping this as a reminder ... Unsure if go-team was on the original submission. Futurile / Steve
guix-patches@HIDDEN
:bug#67503
; Package guix-patches
.
Full text available.Received: (at 67503) by debbugs.gnu.org; 7 Dec 2023 11:06:04 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 07 06:06:04 2023 Received: from localhost ([127.0.0.1]:41193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rBCCi-0006fs-0a for submit <at> debbugs.gnu.org; Thu, 07 Dec 2023 06:06:04 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:56442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1rBCCd-0006fB-3h for 67503 <at> debbugs.gnu.org; Thu, 07 Dec 2023 06:06:02 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40c09f5a7cfso9409075e9.0 for <67503 <at> debbugs.gnu.org>; Thu, 07 Dec 2023 03:05:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701947141; x=1702551941; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=RO4QuTdxoijjMYBvBpPsgtqeQ4qyjSY1LKLgSpYJizE=; b=YusMQoZf414YldF7Z+pOEKx4vjt9nGgab8RM731e+9gt4C39YdDKEP4FW4Sie3qq1p gDCyCZNyzB7WdW8G8dBwLre9JqH6/cbdyOc9ycOIZnemJP2wpk4LF1RDBT5l+sYLnJXU jE0Rp9vp1wMEbpv08OepuxH16IlJycyuVb3FDCHlbFjq0M6WFPMQFegeGjtOzrucrBvw jDDEVf/xKvy/wTO/1FLoE36YTRwbxAdI9SMhK+qzEF/XSnzbZBPFH6FIi6f5AM9ORyCO 4sSZvdPYDlPEJkrfytnfghLdkkuNft4vxC05ob/fgIiJQurfncGfXpGIcRT+8n9zk+xl W5Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701947141; x=1702551941; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=RO4QuTdxoijjMYBvBpPsgtqeQ4qyjSY1LKLgSpYJizE=; b=jWoIS2ylzw2118QCy2pL66tLHMsWNJ/s6KhAlsvxO/l9OvKXnBdkhKX9j8zZ57lS+U 3dUZ7x1wXwbHG59xdOG1EfjII6sMb48PtOyzk5po3lmivsjUCaOrsdY3w9Gv4Vmf3sfO FM6WfVSOo/bqm7EbG8OUN5NWJqJ5zHuFVF1kbR4y/GjCbrinwEy5ellEaoqPHEyZTWBa 0AYisjkHjxaVpdk+mnP2qMiDCL/m9BX3c4OQwe6n5+M8AjkH/iVidRvFpu1InKyOslkT H8mc206jU5Nid9PdNHthBufin5WjVWF7v8muKw5bMctdXaKIiuI0atymZICecoitEtei 50tw== X-Gm-Message-State: AOJu0Yxz7des/qW+EfLs3O86aDYMl/SHxT3srJAnpUcFO8MpJnHEBcSy Jvo0IzInnGo+NFmNYMCd4pNIiKnyF2uMEQ== X-Google-Smtp-Source: AGHT+IEWoZE56Tn4Kl//bBmzgoukE9iMBo7ODilawk1rD2kb1Yp7sk801AmqLCEpOfnh934yRqPikw== X-Received: by 2002:a05:600c:1c8f:b0:40b:5e59:e9fc with SMTP id k15-20020a05600c1c8f00b0040b5e59e9fcmr1259765wms.155.1701947140518; Thu, 07 Dec 2023 03:05:40 -0800 (PST) Received: from localhost ([188.120.129.233]) by smtp.gmail.com with ESMTPSA id n8-20020a05600c500800b0040b34720206sm1543696wmr.12.2023.12.07.03.05.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 03:05:38 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> To: 67503 <at> debbugs.gnu.org Subject: [PATCH v2 1/2] guix: import: Don't include indirect dependencies in go. Date: Thu, 7 Dec 2023 13:05:25 +0200 Message-ID: <4231413995e058728e28814773ffc7e3c63d5104.1701412758.git.efraim@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1701412758.git.efraim@HIDDEN> References: <cover.1701412758.git.efraim@HIDDEN> MIME-Version: 1.0 X-Debbugs-Cc: Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 67503 Cc: Efraim Flashner <efraim@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.5 (/) * guix/import/go.scm (parse-go.mod)[define-peg-patern require]: Adjust the peg pattern to reject lines with the 'indirect' comment in them. Change-Id: I9618bbaa1cb8c6549ced875e3c8d32afc72c3b9b --- guix/import/go.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/import/go.scm b/guix/import/go.scm index 0357e6a1eb..940cdac4b0 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021 Xinglu Chen <public@HIDDEN> ;;; Copyright © 2021 Sarah Morgensen <iskarian@HIDDEN> ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@HIDDEN> +;;; Copyright © 2023 Efraim Flashner <efraim@HIDDEN> ;;; ;;; This file is part of GNU Guix. ;;; @@ -293,7 +294,10 @@ (define (parse-go.mod content) ;; The following directives may all be used solo or in a block ;; RequireSpec = ModulePath Version newline . - (define-peg-pattern require all (and module-path version EOL)) + (define-peg-pattern require all + (and module-path version + ;; We don't want the transitive dependencies. + (not-followed-by (and (* WS) "//" (* WS) "indirect")) EOL)) (define-peg-pattern require-top body (and (ignore "require") (or (and block-start (* (or require block-line)) block-end) require))) -- Efraim Flashner <efraim@HIDDEN> רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
cox.katherine.e+guix@HIDDEN, guix-patches@HIDDEN
:bug#67503
; Package guix-patches
.
Full text available.Received: (at 67503) by debbugs.gnu.org; 7 Dec 2023 11:06:04 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 07 06:06:04 2023 Received: from localhost ([127.0.0.1]:41191 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rBCCh-0006fq-FR for submit <at> debbugs.gnu.org; Thu, 07 Dec 2023 06:06:03 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:45278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1rBCCe-0006fE-JQ for 67503 <at> debbugs.gnu.org; Thu, 07 Dec 2023 06:06:02 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40c2c65e6aaso2099875e9.2 for <67503 <at> debbugs.gnu.org>; Thu, 07 Dec 2023 03:05:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701947142; x=1702551942; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=dI+e32aqtj6wR5xXJcetv6e2EF+4GqCniYcw+BDtkMo=; b=iN7QF+0CycHuz7k2t9SlbEIOr1RtAxhvBtEaJoaGK12Euj/ALmcIZNgkPLOedBPUK+ 5JB6tD3cYvkv0CIvEZC/3vAey+v9ZZbd3QJO+x0hacU2oimrJPaVw8lx9a7Vj3P9d/J3 g2A33juzIPuv9dohTWQUmEs3Id7/QEUarelO3GXhT0mUF7d6G81ZzyMDtJbxTMIACSdX ZC1MFKvHWL7ndZraGRYo+4fUlQNLOoxgSTblhTCbdB3rVGDpJqJL89uTjwbnLAzjewZ3 Cd/42IO4ynvt0Bu76Qi82wXxTeDRnXtwqw0zG1UfpbBgswh+c4/0Dkhz0z7zeT3YzG+B 5FLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701947142; x=1702551942; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=dI+e32aqtj6wR5xXJcetv6e2EF+4GqCniYcw+BDtkMo=; b=Xw8MMSYPtzKu6LA6arkJ9mKIyKvxtCmyBqfH+HPMYh1RCqxTmWhDst5DswtsjdrcGd HeCFt4eKkhsFz+psiOKYnnEAWqR2ltS+7AWEKS8ViQiLuR9MZHRlfCRYjtzoc13vr6tD WTHfCyEInbXiohoNAoRIdiwENlhqtAn81to6cFtS70mXtNSoRYJ6iS10GWFOiKKpUezY Dreo5CwchnOdskqmDTlz6VsmINL2uYrDdHdqltXe13QSfDBQFzGlvOdvdo7ku79GPjIl G5uy7m4Zc0eBadz+ZKx0V4K2ttiIQ+KQVVNEOqd1hc8p/HePjM0XiAY9iaoUil6T0gUF WWSA== X-Gm-Message-State: AOJu0Yx+8XGEIVS2+gnkHNEPSqVphd0RikapIhpXw23AZkQoUyXGeGVG SQUsJ2i6fKbTv/1iBYoKPJH5LXADWo3m7g== X-Google-Smtp-Source: AGHT+IHlnVbjO4OEBCNtv1c/oZeI6XHw3SC3fz+8Y9STu4QjhrmoM6bU7e8QZQD9D11Bbs+jq9EKrQ== X-Received: by 2002:a05:600c:1f16:b0:40c:1e66:4dd5 with SMTP id bd22-20020a05600c1f1600b0040c1e664dd5mr1186957wmb.216.1701947142451; Thu, 07 Dec 2023 03:05:42 -0800 (PST) Received: from localhost ([188.120.129.233]) by smtp.gmail.com with ESMTPSA id k18-20020a5d5252000000b0033330846e76sm1140401wrc.86.2023.12.07.03.05.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 03:05:42 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> To: 67503 <at> debbugs.gnu.org Subject: [PATCH v2 2/2] guix: import: Report go version for go importer. Date: Thu, 7 Dec 2023 13:05:26 +0200 Message-ID: <2c3f8637eea1edd83116fc055a873b827266f977.1701412758.git.efraim@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1701412758.git.efraim@HIDDEN> References: <cover.1701412758.git.efraim@HIDDEN> MIME-Version: 1.0 X-Debbugs-Cc: Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 67503 Cc: Efraim Flashner <efraim@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.5 (/) * guix/import/go.scm (go-package, go.mod-go-version): New procedures. (go-module->guix-package): Add the #:go keyword in the generated package definition if the required go is newer than the default go. * tests/go.scm (mock-http-get): Use gexps for package arguments. Change-Id: I8d005740a442330ac307a40a53764c803ceffc4f --- guix/import/go.scm | 31 ++++++++++++++++++++++++++----- tests/go.scm | 6 +++--- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/guix/import/go.scm b/guix/import/go.scm index 940cdac4b0..dd9298808d 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -29,6 +29,7 @@ (define-module (guix import go) #:use-module (guix git) #:use-module (guix hash) #:use-module (guix i18n) + #:use-module ((guix utils) #:select (version>?)) #:use-module (guix diagnostics) #:use-module (guix import utils) #:use-module (guix import json) @@ -93,6 +94,11 @@ (define-module (guix import go) ;;; Code: +(define (go-package) + "Return the 'go' package. This is a lazy reference so that we don't +depend on (gnu packages golang)." + (module-ref (resolve-interface '(gnu packages golang)) 'go)) + (define http-fetch* ;; Like http-fetch, but memoized and returning the body as a string. (memoize (lambda args @@ -314,7 +320,7 @@ (define (parse-go.mod content) (define-peg-pattern with all (or (and module-path version) file-path)) (define-peg-pattern replace all (and original => with EOL)) (define-peg-pattern replace-top body - (and (ignore "replace") + (and (ignore "replace") (or (and block-start (* (or replace block-line)) block-end) replace))) ;; RetractSpec = ( Version | "[" Version "," Version "]" ) newline . @@ -378,6 +384,17 @@ (define (go.mod-requirements go.mod) ;; Prevent inlining of this procedure, which is accessed by unit tests. (set! go.mod-requirements go.mod-requirements) +(define (go.mod-go-version go.mod) + "Return the minimum version of go required to specified by GO.MOD." + (let ((go-version (go.mod-directives go.mod 'go))) + (if (null? go-version) + ;; If the go directive is missing, go 1.16 is assumed. + '(version "1.16") + (flatten go-version)))) + +;; Prevent inlining of this procedure, which is accessed by unit tests. +(set! go.mod-go-version go.mod-go-version) + (define-record-type <vcs> (%make-vcs url-prefix root-regex type) vcs? @@ -610,6 +627,7 @@ (define* (go-module->guix-package module-path #:key available-versions module-path)) (content (fetch-go.mod goproxy module-path version*)) + (min-go-version (second (go.mod-go-version (parse-go.mod content)))) (dependencies+versions (go.mod-requirements (parse-go.mod content))) (dependencies (if pin-versions? dependencies+versions @@ -634,10 +652,13 @@ (define* (go-module->guix-package module-path #:key ,(vcs->origin vcs-type vcs-repo-url version*)) (build-system go-build-system) (arguments - '(#:import-path ,module-path - ,@(if (string=? module-path-sans-suffix root-module-path) - '() - `(#:unpack-path ,root-module-path)))) + (list ,@(if (version>? min-go-version (package-version (go-package))) + `(#:go ,(string->number min-go-version)) + '()) + #:import-path ,module-path + ,@(if (string=? module-path-sans-suffix root-module-path) + '() + `(#:unpack-path ,root-module-path)))) ,@(maybe-propagated-inputs (map (match-lambda ((name version) diff --git a/tests/go.scm b/tests/go.scm index a70a0ddbf5..d2e8846b30 100644 --- a/tests/go.scm +++ b/tests/go.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright � 2021 Fran�ois Joulaud <francois.joulaud@HIDDEN> -;;; Copyright � 2021 Sarah Morgensen <iskarian@HIDDEN> +;;; Copyright © 2021 François Joulaud <francois.joulaud@HIDDEN> +;;; Copyright © 2021 Sarah Morgensen <iskarian@HIDDEN> ;;; ;;; This file is part of GNU Guix. ;;; @@ -387,7 +387,7 @@ (define (mock-http-get testcase) "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/go-check/check")) + (list #:import-path "github.com/go-check/check")) (propagated-inputs `(("go-github-com-kr-pretty" ,go-github-com-kr-pretty))) (home-page "https://github.com/go-check/check") -- Efraim Flashner <efraim@HIDDEN> רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
cox.katherine.e+guix@HIDDEN, guix-patches@HIDDEN
:bug#67503
; Package guix-patches
.
Full text available.Received: (at 67503) by debbugs.gnu.org; 28 Nov 2023 10:21:39 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Nov 28 05:21:39 2023 Received: from localhost ([127.0.0.1]:45453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1r7vDm-0000zi-QE for submit <at> debbugs.gnu.org; Tue, 28 Nov 2023 05:21:39 -0500 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:56552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1r7vDk-0000zI-0s for 67503 <at> debbugs.gnu.org; Tue, 28 Nov 2023 05:21:36 -0500 Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-9ffb5a4f622so728716766b.0 for <67503 <at> debbugs.gnu.org>; Tue, 28 Nov 2023 02:21:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701166883; x=1701771683; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=lOsB2sq/0kvDrDWtRknL6S3lwkQr5dwUBp6JeDLmsa4=; b=aFPGvL/S+tWfvBPHYIYKrie2IHwbTxWvOgO+cC2iDDaK7IasL8B8dBK7iXEqZK9v2S hkMcG2bG6k3oEceqWwmTMB38+ZqGAE9pUCvhXISrcEVtrXIkk2wKcUwFzMRleVDXDLBp udnDdsaKOGhwt4uHDbzrQn65pKLpPuSHRb3MBp9UKx4XTQHSJYZlk8PWH8kcUreiwXTP gU9XrEElqAJnOeZ+BpHvhWpA0AYx6cDmWBZoMwjbDH0rRAemlhYtlkVFU6b4rOakk9t/ DZlbXnfYVvGBK3fUqQh7KWuhBhGe6KMjnYcgf5Svx/qrsfRXNXmShHnUtjGCCsQH826k wbzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701166883; x=1701771683; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=lOsB2sq/0kvDrDWtRknL6S3lwkQr5dwUBp6JeDLmsa4=; b=GVaaklKhU61CClRr9ev5r1IZs3BGzFtxAcZB1sY1aEYurL1SHh308AbCEOansF0gFB O4Rz+aF+YhG19yTTX0SVqcBHiR0MqXk64RsEtOKUZxbacPjDjdPFoP145eOoImsKEgf3 3XNn4yo6enGCqimIhaHa5++GH2ACZ/JM6yy+owUx5DYQ1fZP6EZSRqol8+m0tNmz/9aI hkhdhZCgNjoK1w1A8jzL0ADsBDr6zVyRi9IWpYuT2JCKm9IMUzh1WEAVgMdB2/EuuOQt jHtnqBbBj0wycjwjekN+MSxTHlvdoniaobyDl+kOXxRE8bVW/ANEk6RuS/pIhtJ26G/i f5XA== X-Gm-Message-State: AOJu0YzIeDeir7lrUHV1wEJU39ENiiMWOSN6RLNm/S/N/jA90Jkevcg1 PVxIEyY4MAtbY/nzJMAedQAGsvBDXbJoiA== X-Google-Smtp-Source: AGHT+IHqMzKwfFLeOvqe6nqrrTwhcryic205MdmHuuPl3MDQUlhv2vO+ZF6rLS33C4hf8i+cEnTv4Q== X-Received: by 2002:a17:906:750:b0:a00:570c:54fb with SMTP id z16-20020a170906075000b00a00570c54fbmr10693062ejb.35.1701166883185; Tue, 28 Nov 2023 02:21:23 -0800 (PST) Received: from localhost ([176.12.138.93]) by smtp.gmail.com with ESMTPSA id bu8-20020a170906a14800b009e505954becsm6659440ejb.107.2023.11.28.02.21.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 02:21:22 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> To: 67503 <at> debbugs.gnu.org Subject: [PATCH 2/2] guix: import: Report go version for go importer. Date: Tue, 28 Nov 2023 12:21:07 +0200 Message-ID: <7a558e7d4aef26af09a8050b29c591f03a514494.1701166089.git.efraim@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1701166089.git.efraim@HIDDEN> References: <cover.1701166089.git.efraim@HIDDEN> MIME-Version: 1.0 X-Debbugs-Cc: Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 67503 Cc: Efraim Flashner <efraim@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.5 (/) * guix/import/go.scm (go-package, go.mod-go-version): New procedures. (go-module->guix-package): Add the #:go keyword in the generated package definition if the required go is newer than the default go. Change-Id: I8d005740a442330ac307a40a53764c803ceffc4f --- guix/import/go.scm | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/guix/import/go.scm b/guix/import/go.scm index 940cdac4b0..dd9298808d 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -29,6 +29,7 @@ (define-module (guix import go) #:use-module (guix git) #:use-module (guix hash) #:use-module (guix i18n) + #:use-module ((guix utils) #:select (version>?)) #:use-module (guix diagnostics) #:use-module (guix import utils) #:use-module (guix import json) @@ -93,6 +94,11 @@ (define-module (guix import go) ;;; Code: +(define (go-package) + "Return the 'go' package. This is a lazy reference so that we don't +depend on (gnu packages golang)." + (module-ref (resolve-interface '(gnu packages golang)) 'go)) + (define http-fetch* ;; Like http-fetch, but memoized and returning the body as a string. (memoize (lambda args @@ -314,7 +320,7 @@ (define (parse-go.mod content) (define-peg-pattern with all (or (and module-path version) file-path)) (define-peg-pattern replace all (and original => with EOL)) (define-peg-pattern replace-top body - (and (ignore "replace") + (and (ignore "replace") (or (and block-start (* (or replace block-line)) block-end) replace))) ;; RetractSpec = ( Version | "[" Version "," Version "]" ) newline . @@ -378,6 +384,17 @@ (define (go.mod-requirements go.mod) ;; Prevent inlining of this procedure, which is accessed by unit tests. (set! go.mod-requirements go.mod-requirements) +(define (go.mod-go-version go.mod) + "Return the minimum version of go required to specified by GO.MOD." + (let ((go-version (go.mod-directives go.mod 'go))) + (if (null? go-version) + ;; If the go directive is missing, go 1.16 is assumed. + '(version "1.16") + (flatten go-version)))) + +;; Prevent inlining of this procedure, which is accessed by unit tests. +(set! go.mod-go-version go.mod-go-version) + (define-record-type <vcs> (%make-vcs url-prefix root-regex type) vcs? @@ -610,6 +627,7 @@ (define* (go-module->guix-package module-path #:key available-versions module-path)) (content (fetch-go.mod goproxy module-path version*)) + (min-go-version (second (go.mod-go-version (parse-go.mod content)))) (dependencies+versions (go.mod-requirements (parse-go.mod content))) (dependencies (if pin-versions? dependencies+versions @@ -634,10 +652,13 @@ (define* (go-module->guix-package module-path #:key ,(vcs->origin vcs-type vcs-repo-url version*)) (build-system go-build-system) (arguments - '(#:import-path ,module-path - ,@(if (string=? module-path-sans-suffix root-module-path) - '() - `(#:unpack-path ,root-module-path)))) + (list ,@(if (version>? min-go-version (package-version (go-package))) + `(#:go ,(string->number min-go-version)) + '()) + #:import-path ,module-path + ,@(if (string=? module-path-sans-suffix root-module-path) + '() + `(#:unpack-path ,root-module-path)))) ,@(maybe-propagated-inputs (map (match-lambda ((name version) -- Efraim Flashner <efraim@HIDDEN> רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
cox.katherine.e+guix@HIDDEN, guix-patches@HIDDEN
:bug#67503
; Package guix-patches
.
Full text available.Received: (at 67503) by debbugs.gnu.org; 28 Nov 2023 10:21:35 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Nov 28 05:21:35 2023 Received: from localhost ([127.0.0.1]:45450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1r7vDj-0000zT-Ce for submit <at> debbugs.gnu.org; Tue, 28 Nov 2023 05:21:35 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:60675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1r7vDh-0000zF-G0 for 67503 <at> debbugs.gnu.org; Tue, 28 Nov 2023 05:21:34 -0500 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-a0b65cbf096so396144666b.1 for <67503 <at> debbugs.gnu.org>; Tue, 28 Nov 2023 02:21:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701166881; x=1701771681; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=RO4QuTdxoijjMYBvBpPsgtqeQ4qyjSY1LKLgSpYJizE=; b=f4FGVv3HDBp2wOBJkBdSWhJBLMBKDEQ1Pey2RFFrOu6G81jAYr0n2/zIOV67H5P0Su 1aciuZWqwzJRSddvyJ4v6QU//sYemcY4Bc31sbeOwVEBjerGyMXwYJPZxipwH1UJ8znh WY3FPV5ylRgf9QsM7h+tmMTmHB5je0ArP9LX0KEJO4NbHgBgrpjEiW7Sfb5T1VVAmBEX Y842bybIU8gdwrkoMsVBfxBYmJPYvPpVIeVVaLbchx6j4Dal2T9QPGDsnM2ufcCvj+Cu 5U3UyeqdObmbv+EVYST4vY3/eQY2Tdog/hGTD6y6gCrK4PfFisSqZitHKT3P+AIgNxCV UQpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701166881; x=1701771681; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=RO4QuTdxoijjMYBvBpPsgtqeQ4qyjSY1LKLgSpYJizE=; b=T8YJxnKhqUwboJZyc0ebR5nsOl2uhGWsdIlXAGKOrLelkkhqEMpV1lxjND3pxyr2Uq /8dSRW6Zojggcf1lCwVhBmiY+IDm35ok0UePPpkGa/XpE5CC3UmKAeg9hexxC/ZuM/kV akMxq7T9atV1wcj5paP1b+q5uAE+yQFGRjktYBog9DdH7BNXkqUTem7pJNlWk50P2d8a cDfu/HLYznDKEXjY7u19oqP5nCAMJVdVcWMxwDN1r40KIFKzA3fchz60aD9q2v9gzLYr 5Nqy4jZgJlI/IJO2Iqy+YVmJF+Y0Vk/sn2tbxMhLsRZR925sHtpRR4lhYWY5T8ez1dxe vKYg== X-Gm-Message-State: AOJu0YwpinyIDfYnXg+Z1Md5HzSP2IpyGKkTB+X0O5FLOuWf0jECHDGk NwIHPhR512SeU8fWT23WHPMDgkV0Sd8fLg== X-Google-Smtp-Source: AGHT+IGe2VaHrIam7q88o5YDiPdoRL/5UydHJ+As2LFe2UcuhhSxbcY0e63eGj/iCefmjrNuCy52LA== X-Received: by 2002:a17:907:29c8:b0:a03:d3ff:1e14 with SMTP id ev8-20020a17090729c800b00a03d3ff1e14mr9126764ejc.28.1701166880676; Tue, 28 Nov 2023 02:21:20 -0800 (PST) Received: from localhost ([176.12.138.93]) by smtp.gmail.com with ESMTPSA id lv23-20020a170906bc9700b009f28db2b702sm6617090ejb.209.2023.11.28.02.21.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 02:21:19 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> To: 67503 <at> debbugs.gnu.org Subject: [PATCH 1/2] guix: import: Don't include indirect dependencies in go. Date: Tue, 28 Nov 2023 12:21:06 +0200 Message-ID: <6314f6d57fcfd7f449af3b4b6ad7c425fd14936a.1701166089.git.efraim@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1701166089.git.efraim@HIDDEN> References: <cover.1701166089.git.efraim@HIDDEN> MIME-Version: 1.0 X-Debbugs-Cc: Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 67503 Cc: Efraim Flashner <efraim@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.5 (/) * guix/import/go.scm (parse-go.mod)[define-peg-patern require]: Adjust the peg pattern to reject lines with the 'indirect' comment in them. Change-Id: I9618bbaa1cb8c6549ced875e3c8d32afc72c3b9b --- guix/import/go.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/import/go.scm b/guix/import/go.scm index 0357e6a1eb..940cdac4b0 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021 Xinglu Chen <public@HIDDEN> ;;; Copyright © 2021 Sarah Morgensen <iskarian@HIDDEN> ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@HIDDEN> +;;; Copyright © 2023 Efraim Flashner <efraim@HIDDEN> ;;; ;;; This file is part of GNU Guix. ;;; @@ -293,7 +294,10 @@ (define (parse-go.mod content) ;; The following directives may all be used solo or in a block ;; RequireSpec = ModulePath Version newline . - (define-peg-pattern require all (and module-path version EOL)) + (define-peg-pattern require all + (and module-path version + ;; We don't want the transitive dependencies. + (not-followed-by (and (* WS) "//" (* WS) "indirect")) EOL)) (define-peg-pattern require-top body (and (ignore "require") (or (and block-start (* (or require block-line)) block-end) require))) -- Efraim Flashner <efraim@HIDDEN> רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
cox.katherine.e+guix@HIDDEN, guix-patches@HIDDEN
:bug#67503
; Package guix-patches
.
Full text available.Received: (at submit) by debbugs.gnu.org; 28 Nov 2023 10:19:37 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Nov 28 05:19:37 2023 Received: from localhost ([127.0.0.1]:45443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1r7vBo-0000vp-Pn for submit <at> debbugs.gnu.org; Tue, 28 Nov 2023 05:19:37 -0500 Received: from lists.gnu.org ([2001:470:142::17]:55840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1r7vBn-0000vd-Jb for submit <at> debbugs.gnu.org; Tue, 28 Nov 2023 05:19:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <efraim.flashner@HIDDEN>) id 1r7vBa-0001CK-I9 for guix-patches@HIDDEN; Tue, 28 Nov 2023 05:19:22 -0500 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <efraim.flashner@HIDDEN>) id 1r7vBX-0000hW-Ct for guix-patches@HIDDEN; Tue, 28 Nov 2023 05:19:21 -0500 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-54bbf08aa53so41840a12.0 for <guix-patches@HIDDEN>; Tue, 28 Nov 2023 02:19:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701166758; x=1701771558; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=YMoKJqQpCt+xnBZbCOo9PXLpYHnDhpoM5JS/i4rQAog=; b=YlkSJ2wIria4Cb5HlT7X2t05bk4PypdibUrDq5j9chOWqJo9GgbsVvqvc+V6XSCu60 YWll/jhwJT0PXz0dY+/i5iXvp1ptlyP8FdkORAP6M+lhFNLyN4pg/1iyFDu+YFtkjB50 6P3nq7sjir/If0yPpKxHjzNVY3aq+lTI3CR3HX3saOIWPmSYlvULi14X+WC9NC3EZZ2Z kVtgwl5DW3sfBOQCBN4fq2Q8lz8Cn7wjaCFH3dl8KDsqa/XTFxjE/FtUM3LvALal3g/F 6BvGlvrMUb2NyLaKlD+6FXdQWq6AWhwLUq2TwQVisUG+hiAsEzhxqwMtR24SGD+xVpcy N/2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701166758; x=1701771558; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=YMoKJqQpCt+xnBZbCOo9PXLpYHnDhpoM5JS/i4rQAog=; b=YgQh599MgFdvOyRrkOPod3SKEv87IhHIMqPziWlHyelkEQOh8qFWg9cq3m09YdmAOL QTtNFDobW6ucv/YsjMVsCYBF+ywXhNTpbMEzqbuGcCHBO7B+9Qm5ykPhTp/Bp9NZk+yQ HP0YhH16VwnYBvlpfUqI8BEz32mNlbSEdMn9xlFxtx0p3clW2MbHDtXV+3XhhVGR1LKs xPtCTMU/eYgiwvPHi6lH1XhAfDQGTS92gVWyqUk3oceeNg4VVhD74Yq+FJDuScEAxgYM NtavPlA7Kl4azZN4eHlzzn2nKXqeRc9y7YEVIMBtu3CL4cn27SXGpZz4ExK/PdHZ7M52 Bv5Q== X-Gm-Message-State: AOJu0Yz3itsKyXjnSnjD1j9U43JYUE4ocTde3W41ZMUtkuVMC52cUnWc BRZUczPd9jqbIqSaXpJdk8OBfbdWQ4d1Rg== X-Google-Smtp-Source: AGHT+IE1qkG4T5JUSbRTmgVNHFwdgjlmfdSaQP7wkyox/vjgi17T9traOB6381DFejgKuZLDT4fucA== X-Received: by 2002:a17:906:b80a:b0:9e5:df25:4b57 with SMTP id dv10-20020a170906b80a00b009e5df254b57mr10819323ejb.23.1701166757435; Tue, 28 Nov 2023 02:19:17 -0800 (PST) Received: from localhost ([176.12.138.93]) by smtp.gmail.com with ESMTPSA id i3-20020a170906a28300b00a0f770ae91bsm2159435ejz.89.2023.11.28.02.19.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 02:19:16 -0800 (PST) From: Efraim Flashner <efraim@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH 0/2] Improvements to the go importer Date: Tue, 28 Nov 2023 12:18:47 +0200 Message-ID: <cover.1701166089.git.efraim@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=efraim.flashner@HIDDEN; helo=mail-ed1-x52a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: I had intended to do some go packaging but found myself working on the go importer instead. According to the upstream go documentation, go.mod IS supposed to list the indirect dependencies so that when someone runs 'go build' or 'go install' all the dependencies are already listed. For us, t [...] Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (efraim.flashner[at]gmail.com) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: submit Cc: Efraim Flashner <efraim@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.5 (/) I had intended to do some go packaging but found myself working on the go importer instead. According to the upstream go documentation, go.mod IS supposed to list the indirect dependencies so that when someone runs 'go build' or 'go install' all the dependencies are already listed. For us, the indirect dependencies are already listed as propagated-inputs for the packages which actually use them. For the second patch I'm not super happy about using 'second' (yes, (flatten (go.mod-directives go.mod 'go)) does return (version "1.18")) but I couldn't find a nice way to return just the version string, and it seemed better than cadr. Using version>? was the simplest way to do the version compare, but I can copy the logic over if we'd rather not import (guix utils). Efraim Flashner (2): guix: import: Don't include indirect dependencies in go. guix: import: Report go version for go importer. guix/import/go.scm | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) base-commit: 62376e3eb67644454bc655bed56be4be965bd13e -- Efraim Flashner <efraim@HIDDEN> רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
Efraim Flashner <efraim@HIDDEN>
:cox.katherine.e+guix@HIDDEN, guix-patches@HIDDEN
.
Full text available.cox.katherine.e+guix@HIDDEN, guix-patches@HIDDEN
:bug#67503
; Package guix-patches
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.