From patchwork Thu Dec 7 11:05:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 57352 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 18C5C27BBE9; Thu, 7 Dec 2023 11:07:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C6D2F27BBE2 for ; Thu, 7 Dec 2023 11:07:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBCDU-0001Ou-Bm; Thu, 07 Dec 2023 06:06:52 -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 ) id 1rBCDS-0001Nh-Eq for guix-patches@gnu.org; Thu, 07 Dec 2023 06:06:50 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBCDS-00041M-6B for guix-patches@gnu.org; Thu, 07 Dec 2023 06:06:50 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBCDe-0006hb-EK; Thu, 07 Dec 2023 06:07:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67503] [PATCH v2 1/2] guix: import: Don't include indirect dependencies in go. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 07 Dec 2023 11:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67503 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67503@debbugs.gnu.org Cc: Efraim Flashner , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 67503-submit@debbugs.gnu.org id=B67503.170194716425670 (code B ref 67503); Thu, 07 Dec 2023 11:07:02 +0000 Received: (at 67503) by debbugs.gnu.org; 7 Dec 2023 11:06:04 +0000 Received: from localhost ([127.0.0.1]:41193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBCCi-0006fs-0a for submit@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 ) id 1rBCCd-0006fB-3h for 67503@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@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 Date: Thu, 7 Dec 2023 13:05:25 +0200 Message-ID: <4231413995e058728e28814773ffc7e3c63d5104.1701412758.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2023 Efraim Flashner ;;; ;;; 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)))