From patchwork Thu Dec 10 02:42:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dftxbs3e X-Patchwork-Id: 25680 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 D125927BC02; Thu, 10 Dec 2020 02:43:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, URIBL_BLOCKED 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 ESMTPS id 4E58D27BC03 for ; Thu, 10 Dec 2020 02:43:08 +0000 (GMT) Received: from localhost ([::1]:47448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knBv9-00042h-Bl for patchwork@mira.cbaines.net; Wed, 09 Dec 2020 21:43:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knBv4-00042b-8u for guix-patches@gnu.org; Wed, 09 Dec 2020 21:43:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53297) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1knBv4-0005nC-1q for guix-patches@gnu.org; Wed, 09 Dec 2020 21:43:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1knBv3-0002CI-Vj for guix-patches@gnu.org; Wed, 09 Dec 2020 21:43:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44178] Resent-From: dftxbs3e Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Dec 2020 02:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44178 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 44178@debbugs.gnu.org Received: via spool by 44178-submit@debbugs.gnu.org id=B44178.16075681398396 (code B ref 44178); Thu, 10 Dec 2020 02:43:01 +0000 Received: (at 44178) by debbugs.gnu.org; 10 Dec 2020 02:42:19 +0000 Received: from localhost ([127.0.0.1]:36609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knBuN-0002BM-CH for submit@debbugs.gnu.org; Wed, 09 Dec 2020 21:42:19 -0500 Received: from smtp2-g21.free.fr ([212.27.42.2]:63520) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knBuL-0002BD-AM for 44178@debbugs.gnu.org; Wed, 09 Dec 2020 21:42:18 -0500 Received: from [IPv6:2a01:e0a:2a2:1350:cd10:777c:7b57:3bb6] (unknown [IPv6:2a01:e0a:2a2:1350:cd10:777c:7b57:3bb6]) (Authenticated sender: dftxbs3e) by smtp2-g21.free.fr (Postfix) with ESMTPSA id E352A20039E for <44178@debbugs.gnu.org>; Thu, 10 Dec 2020 03:42:14 +0100 (CET) Message-ID: From: dftxbs3e Date: Thu, 10 Dec 2020 03:42:14 +0100 In-Reply-To: <9395ba7c7499d6c4423982486a0a0fb31cb76e93.camel@free.fr> References: <9395ba7c7499d6c4423982486a0a0fb31cb76e93.camel@free.fr> User-Agent: Evolution 3.34.2 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" X-getmail-retrieved-from-mailbox: Patches On Wed, 2020-12-09 at 15:22 +0100, dftxbs3e wrote: > Thanks a lot for this! > > I'm getting some error trying to use it (patching on top of > 8e2aad26ae9b7365db83d4f6c74e9e79c57766a6), maybe that's fixed in your > local changes? > > $ ./pre-inst-env guix import go -r github.com/syncthing/syncthing > WARNING: (guix import go): `url-fetch' imported from both (guix > import > utils) and (guix build download) > Backtrace: > In ice-9/boot-9.scm: > 1736:10 7 (with-exception-handler _ _ #:unwind? _ # _) > In unknown file: > 6 (apply-smob/0 #) > In ice-9/boot-9.scm: > 718:2 5 (call-with-prompt _ _ # handle…>) > In ice-9/eval.scm: > 619:8 4 (_ #(#(#))) > In guix/ui.scm: > 2127:12 3 (run-guix-command _ . _) > In guix/scripts/import.scm: > 120:11 2 (guix-import . _) > In ice-9/eval.scm: > 159:9 1 (_ #(#(#(#(#(#(#(#(#(#) …) …) …) …) …) …) …) > …)) > In guix/import/utils.scm: > 429:0 0 (recursive-import _ #:repo->guix-package _ #:guix-name _ > …) > > guix/import/utils.scm:429:0: In procedure recursive-import: > Invalid keyword: #f I could fix it using the attached patch! However, I noticed it doesnt pin versions in GNU Guix to what they are in go.mod file, is that expected? It always takes the latest. It might work but I am thinking it might cause breakage at some point? Thank you! diff --git a/guix/import/go.scm b/guix/import/go.scm index 61009f3565..c7a1b1a5d4 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -23,7 +23,7 @@ #:use-module (ice-9 regex) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) - #:use-module (guix json) + #:use-module (json) #:use-module ((guix download) #:prefix download:) #:use-module (guix import utils) #:use-module (guix import json) @@ -268,9 +268,9 @@ control system is being used." (define* (go-module-recursive-import package-name #:key (goproxy-url "https://proxy.golang.org")) - (recursive-import package-name #f + (recursive-import package-name #:repo->guix-package - (lambda (name _) + (lambda* (name #:key repo version) (go-module->guix-package name #:goproxy-url goproxy-url)) #:guix-name to-guix-package-name))