From patchwork Mon Feb 12 18:48:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60222 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 F1BCA27BBEA; Mon, 12 Feb 2024 18:50:49 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 D0CD427BBE2 for ; Mon, 12 Feb 2024 18:50:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZbNV-0008GD-9k; Mon, 12 Feb 2024 13:50:05 -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 1rZbNK-0008Bh-9N for guix-patches@gnu.org; Mon, 12 Feb 2024 13:49:57 -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 1rZbNH-0006Ov-SE for guix-patches@gnu.org; Mon, 12 Feb 2024 13:49:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZbNY-0001bt-Nm; Mon, 12 Feb 2024 13:50:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69042] [PATCH v2 17/30] gnu: go-golang-org-x-mod: Move to golang-build. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 12 Feb 2024 18:50:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69042 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69042@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday , Sharlatan Hellseher X-Debbugs-Original-Xcc: Katherine Cox-Buday , Sharlatan Hellseher Received: via spool by 69042-submit@debbugs.gnu.org id=B69042.17077637875989 (code B ref 69042); Mon, 12 Feb 2024 18:50:08 +0000 Received: (at 69042) by debbugs.gnu.org; 12 Feb 2024 18:49:47 +0000 Received: from localhost ([127.0.0.1]:49294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbNC-0001YL-2F for submit@debbugs.gnu.org; Mon, 12 Feb 2024 13:49:46 -0500 Received: from mail-wr1-f50.google.com ([209.85.221.50]:53494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbMy-0001Ub-IJ for 69042@debbugs.gnu.org; Mon, 12 Feb 2024 13:49:34 -0500 Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-33b86bc8974so580310f8f.2 for <69042@debbugs.gnu.org>; Mon, 12 Feb 2024 10:49:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707763749; x=1708368549; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HXns40P3w3lSsv6tKepHbuX36S6PI6dygjsKVBYo58Q=; b=i7RNnLXxZZG6bFqUEBfdmIhqd+AizEEBjZ67UucJk/BtK24ArwU1/UgYQljkL8n/22 k8cpvdyx45qdHYQTm+EqAa94QdvQSjIyJ5K5UvHJv2O+nQizP0WebNgG9EYPe63pfBfz zYTdDUoxng9hqCQfYk5XbDRJVkOkOxk681t4qU7WVlTie+WNJGMi6b1ZHzpPNArB7pk9 2dDFW+SYecffH5BJ2fTJiu6CO++PnoS/JIpcZOqh6CA/L3/O97xt7NUlPaP8ywzRCLLE 7maHOc+S7txyhgklQArH21gWECIDOhzSHCmaXnwvf6iydzz7Lfypc0AFJ1J6/YXFIoOG j8UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707763749; x=1708368549; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HXns40P3w3lSsv6tKepHbuX36S6PI6dygjsKVBYo58Q=; b=DVQfPTSpJM4C0h42YUlr0sTL4HhVkTIRZfAznpApgKZd9tFjVgybzo2rOJeBDY9Q2e 6QYcf/4ziiIvj5p+BeBVMqZJzxLYyxwwUR0Psd51wyYyls6A6l24t2JEGV292DrWrkIZ IH0eXig+c4iXyhlNFfguBdjOov4yx1GGZfuHnleGte1Y054hz0RkoA0nq3FILEkNeESf 8A6fII5DTQ1oAlSWPf6wvO8Im9VG0ociE/HXBcBjCDYlmn29yzJhHN1tLlo3GshBql5N 7Q7mz51Bl5J0ElUA4F7PHl6hCqZwahh6aAt5tngiC+N9KhScMlqTXaRpRNupDVt5a0kD k1pg== X-Gm-Message-State: AOJu0YyNETS4sfidILZcxJYYgXMgaCTYxqx3StiJeDVJvTuDL5VOG2OX 4i3DXphUo+1JsJKxKqhRBr0YzS81GEuaigQ7ZxWfZJxk0ERc8Z6SqNsnuNELNww= X-Google-Smtp-Source: AGHT+IGs2Lb1iHjh8IR0b/wYTzBCCCsZRd3ljTYihNCXPfhRZ2AXlMLG/eQhsOvtS47nDAYBvoNKlw== X-Received: by 2002:a05:6000:2cf:b0:33b:80ab:46c with SMTP id o15-20020a05600002cf00b0033b80ab046cmr4166208wry.63.1707763749658; Mon, 12 Feb 2024 10:49:09 -0800 (PST) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id v5-20020a5d59c5000000b0033b74a3dcf9sm6423510wry.27.2024.02.12.10.49.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 10:49:09 -0800 (PST) From: Sharlatan Hellseher Date: Mon, 12 Feb 2024 18:48:34 +0000 Message-ID: <8db31dfc0651e3ba693ac007ce2e2c90708519ff.1707763691.git.sharlatanus@gmail.com> 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 * gnu/packages/golang.scm (go-golang-org-x-mod): Move from here ... * gnu/packages/golang-build.scm: ... to here. * gnu/packages/shellutils.scm: Add (gnu packages golang-build) module. Change-Id: I88ce7ac1e264cb545a272f9c8a485747e84f7c82 --- gnu/packages/golang-build.scm | 36 +++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 34 --------------------------------- gnu/packages/shellutils.scm | 1 + 3 files changed, 37 insertions(+), 34 deletions(-) diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index ffedc946c2..a8e97e7acb 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -1,5 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Leo Famulari +;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2021 hackeryarn ;;; Copyright © 2023 Artyom V. Poptsov ;;; Copyright © 2023 Felix Lechner ;;; Copyright © 2023 Katherine Cox-Buday @@ -67,6 +69,40 @@ (define-public go-golang-org-x-exp @code{old} directory) packages.") (license license:bsd-3))) +(define-public go-golang-org-x-mod + (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1") + (revision "0")) + (package + (name "go-golang-org-x-mod") + (version (git-version "0.7.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/golang/mod") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14r24fq3kn84k2y2jvvg8hwpy52a3q429pimrdwl5zwknbr2awmh")))) + (build-system go-build-system) + (arguments + '(#:import-path "golang.org/x/mod/" + #:tests? #f + #:phases (modify-phases %standard-phases + ;; Source-only package + (delete 'build)))) + (home-page "https://golang.org/x/mod") + (synopsis "Tools to work directly with Go module mechanics") + (description + "This repository holds packages for writing tools that work directly +with Go module mechanics. That is, it is for direct manipulation of Go +modules themselves. + +The specific case of loading packages should still be done by invoking the +@command{go} command, which remains the single point of truth for package +loading algorithms.") + (license license:bsd-3)))) + (define-public go-golang-org-x-net (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index dd0ac7e3e8..e7b98028a5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3699,40 +3699,6 @@ (define-public go-golang-org-x-xerrors (home-page "https://godoc.org/golang.org/x/xerrors") (license license:bsd-3)))) -(define-public go-golang-org-x-mod - (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1") - (revision "0")) - (package - (name "go-golang-org-x-mod") - (version (git-version "0.7.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/golang/mod") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "14r24fq3kn84k2y2jvvg8hwpy52a3q429pimrdwl5zwknbr2awmh")))) - (build-system go-build-system) - (arguments - '(#:import-path "golang.org/x/mod/" - #:tests? #f - #:phases (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (home-page "https://golang.org/x/mod") - (synopsis "Tools to work directly with Go module mechanics") - (description - "This repository holds packages for writing tools that work directly -with Go module mechanics. That is, it is for direct manipulation of Go modules -themselves. - -The specific case of loading packages should still be done by invoking the -@command{go} command, which remains the single point of truth for package -loading algorithms.") - (license license:bsd-3)))) - (define-public go-github-com-hashicorp-go-uuid (package (name "go-github-com-hashicorp-go-uuid") diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 48c5250c8c..e58e9e61fc 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -51,6 +51,7 @@ (define-module (gnu packages shellutils) #:use-module (gnu packages check) #:use-module (gnu packages flex) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-xyz) #:use-module (gnu packages libunistring) #:use-module (gnu packages ncurses)