From patchwork Tue Nov 28 10:18:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 1423 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 30D8127BBEA; Tue, 28 Nov 2023 10:20:14 +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=ham 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 26AC927BBE2 for ; Tue, 28 Nov 2023 10:20:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r7vC9-0001H2-I2; Tue, 28 Nov 2023 05:19:57 -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 1r7vC7-0001Ge-NC for guix-patches@gnu.org; Tue, 28 Nov 2023 05:19:56 -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 1r7vC7-0000lA-FA for guix-patches@gnu.org; Tue, 28 Nov 2023 05:19:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r7vCD-0000wX-TL; Tue, 28 Nov 2023 05:20:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67503] [PATCH 0/2] Improvements to the go importer Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 28 Nov 2023 10:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 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-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by submit@debbugs.gnu.org id=B.17011667773589 (code B ref -1); Tue, 28 Nov 2023 10:20:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Nov 2023 10:19:37 +0000 Received: from localhost ([127.0.0.1]:45443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7vBo-0000vp-Pn for submit@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 ) id 1r7vBn-0000vd-Jb for submit@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 ) id 1r7vBa-0001CK-I9 for guix-patches@gnu.org; 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 ) id 1r7vBX-0000hW-Ct for guix-patches@gnu.org; Tue, 28 Nov 2023 05:19:21 -0500 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-54bbf08aa53so41840a12.0 for ; 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 Date: Tue, 28 Nov 2023 12:18:47 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=efraim.flashner@gmail.com; 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-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 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