From patchwork Thu May 25 15:41:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 50318 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 1C34827BBEA; Thu, 25 May 2023 16:42:28 +0100 (BST) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED 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 90D8127BBE2 for ; Thu, 25 May 2023 16:42:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2D6N-0001XO-9a; Thu, 25 May 2023 11:42:07 -0400 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 1q2D6J-0001VW-21 for guix-patches@gnu.org; Thu, 25 May 2023 11:42:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2D6I-0002Wr-Q5 for guix-patches@gnu.org; Thu, 25 May 2023 11:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q2D6I-00018b-Ln for guix-patches@gnu.org; Thu, 25 May 2023 11:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63647] [PATCH v2 1/3] guix: import: go: Sort hint about available versions. References: In-Reply-To: Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 May 2023 15:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63647 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63647@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 63647-submit@debbugs.gnu.org id=B63647.16850292924287 (code B ref 63647); Thu, 25 May 2023 15:42:02 +0000 Received: (at 63647) by debbugs.gnu.org; 25 May 2023 15:41:32 +0000 Received: from localhost ([127.0.0.1]:47885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2D5o-000173-2F for submit@debbugs.gnu.org; Thu, 25 May 2023 11:41:32 -0400 Received: from mail-wr1-f51.google.com ([209.85.221.51]:39214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2D5j-00016M-D1 for 63647@debbugs.gnu.org; Thu, 25 May 2023 11:41:27 -0400 Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-3094ca1df73so351036f8f.1 for <63647@debbugs.gnu.org>; Thu, 25 May 2023 08:41:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685029280; x=1687621280; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=y244qRQORWlQPqsRz2FcEtZrdw2xPx9OOtmkOHi0wPs=; b=i2aAk6pd5PF71VdqgjCnK66LFUaM++tTnsS7HLnAzxl8CChWxl0wrj/5vU5/vDalv6 mqAbeUgYBFU+WXSj/BgrEYS1wMzLcjx8g5uLjpkEHhgg8KnL9bgtkdd73AmttJKpT0t9 efQJP6x0OaiSxMWxiV/j/Yk7apvp3DrR/Dnv00A0WtNzMkdXtmV6CC2xLorliPlgBSne oMd6anZzyau64ECWxtJ2xQZQ5g3HmB970/yP0iYu2agaqS5lM0fsmH/d2jUJKHkmbqtS 3H2qIJHw+Mi5Ao6R9fo/NxG9Lt8NrFXrkuCrR2Bh8wQ1IW4PMomKLWmbz1UVukXdQbqN YQlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685029280; x=1687621280; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=y244qRQORWlQPqsRz2FcEtZrdw2xPx9OOtmkOHi0wPs=; b=N9qOwCulwXljWSIdt3+50QT+lX5C/2Xo0nHXx21LarMLv67mv1Z9z0tvU/qk8SD+I9 oEK5ZH8WrSdmXVMvo9Uu4QetgvxR5cS3GVxKF744odsVbSFGM/yXYHRMhItA2aVtMm9o kDHI6rJNVEqducQODG8HdZWm6g6VoAk4FJGhGeKJh8UbqwVdUvtE+CNgdc1NA/x2t9/g NKCIZOrJAVVd3GC1Hr5BYHMGw8a1IP4WE8deBgqOR/FXE+5PEB9vlqmTdudoxW/9ivF6 8BUhWFFjDOfjynUxT4FTIt8eesw3EMZhD88+S/gAWWD0SCgLTfxDBXJ6dUnB8CLZjZd8 swEg== X-Gm-Message-State: AC+VfDyRKLRx1v/MgZCRx5mpR5UWT7sWcPmE3zMmNivmJhwrhZkXTPGe 3RVMMaFEUtUD7/EALp59zSMHdcXBN0w= X-Google-Smtp-Source: ACHHUZ6wZz8Y7UVCODHV9Z4lEXVzcM4KQFa/PfIZ+N1oIdXDXh5hWxXAtgu+pe0JX8pcU6TkTwJXIQ== X-Received: by 2002:a5d:6208:0:b0:2f9:59a3:eb30 with SMTP id y8-20020a5d6208000000b002f959a3eb30mr13358466wru.0.1685029280025; Thu, 25 May 2023 08:41:20 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id q2-20020adff502000000b003062c0ef959sm2172258wro.69.2023.05.25.08.41.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 08:41:19 -0700 (PDT) From: Simon Tournier Date: Thu, 25 May 2023 17:41:10 +0200 Message-Id: X-Mailer: git-send-email 2.39.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/import/go.scm (validate-version): Sort available versions. --- guix/import/go.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) base-commit: 99fc7e5dd3c9c92f9b6c2e51db9dc5b0481a56b2 diff --git a/guix/import/go.scm b/guix/import/go.scm index 0357e6a1eb..1943869162 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -34,6 +34,7 @@ (define-module (guix import go) #:use-module (guix packages) #:use-module (guix http-client) #:use-module (guix memoization) + #:use-module (guix utils) #:autoload (htmlprag) (html->sxml) ;from Guile-Lib #:autoload (guix base32) (bytevector->nix-base32-string) #:autoload (guix build utils) (mkdir-p) @@ -588,8 +589,9 @@ (define (validate-version version available-versions module-path) (condition (&fix-hint (hint (format #f (G_ "Pick one of the following \ available versions:~{ ~a~}.") - (map strip-v-prefix - available-versions))))))))) + (sort (map strip-v-prefix + available-versions) + version>?))))))))) (define* (go-module->guix-package module-path #:key (goproxy "https://proxy.golang.org")