From patchwork Sun Feb 11 10:53:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60022 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 BADC127BBEC; Sun, 11 Feb 2024 10:55:47 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,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 E738827BBE2 for ; Sun, 11 Feb 2024 10:55:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZ7U0-0003pO-7s; Sun, 11 Feb 2024 05:54:48 -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 1rZ7Ty-0003np-Sf for guix-patches@gnu.org; Sun, 11 Feb 2024 05:54:46 -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 1rZ7Ty-0005Ym-Ky for guix-patches@gnu.org; Sun, 11 Feb 2024 05:54:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZ7UE-0005Q6-Ow; Sun, 11 Feb 2024 05:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69042] [PATCH 17/30] gnu: go-golang-org-x-mod: Move to (gnu packages-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: Sun, 11 Feb 2024 10:55:02 +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.170764885120649 (code B ref 69042); Sun, 11 Feb 2024 10:55:02 +0000 Received: (at 69042) by debbugs.gnu.org; 11 Feb 2024 10:54:11 +0000 Received: from localhost ([127.0.0.1]:38359 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ7TO-0005Mn-BR for submit@debbugs.gnu.org; Sun, 11 Feb 2024 05:54:11 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:49258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ7TH-0005Kx-7v for 69042@debbugs.gnu.org; Sun, 11 Feb 2024 05:54:04 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-410cb9315f6so654295e9.2 for <69042@debbugs.gnu.org>; Sun, 11 Feb 2024 02:53:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707648821; x=1708253621; 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=Tv+nBej1EDZ4A4G+NRVMH2WByN6ZdtGqdlPNF7mQ/OKUuH5zBpy+HgRLmt0bs5veAO yR9hvu5v/+8zmrOOdYXYqV8lvmLak1oevlRlWvpSZN4/Cw+TLj0HPeRbjuNanWQk35Jb cOikoEutlkXRoLydwDmT8aniolqJ4/y9/k7kYqr2dziyiTTJzNIcZbphkv0Lz5lBc4ts Ka+s1O/N0MvGW4CEtZQu0LRzPRfVX4r064ndvVQ/ojrJ5mTdtow5GC8wlhG6nDxMx3x8 Y8iAuk8ihi64PbVzwV84P5dAMAcd2i+5PWaPSvv/CPY/ZtUsnEYsUM1FdBh34klMpUwv QkcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707648821; x=1708253621; 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=X8tgOzL9txYRSyaDZzXLSYjlldTxXH09jJgFIAjVUsWOl9FIEiBpUagtPOefJvoyGg syQuySpEgC6MCAXQ6X80J1G9LXl7c1upuBjCPsI7WJB+il4bEspQac8odexOEl0tRR5f b4M4C8U/MfgW192BWFhuTaXh7oaksT+uqXA9ZY2WaMZBCsS+Sniyvo+AWq5Jr5Dkhqcs bIRtDcRAVPAZ7bcKmlMfd42yHDM1p+Ce3mqM5FqT69+6pDkyfxT4y2l/4gxObk1h5oWU AFUvxODAtMKQQcOyZPXoyDN2CxMP/hHloe9tYX2JyU3qusrkTsXespzlCoMAzY+Doya1 KkDg== X-Gm-Message-State: AOJu0Yy8MhlnIVZr2lPphLtJ2WPexbuEwCQOdxqPgHJf1gcIQMKQPJaP YWamiKY2c5AOvEvHfNjIYmrIYP262UwBhzN7Gkh6fhRHcwbQn/HjgNki4C5X0KY= X-Google-Smtp-Source: AGHT+IFzmrWbDIYIWSvK0ucTgv89Tu3wcmSWgBjpbHMdn+bdvfjQvRix1OVKwO2pnhnBjBM+Pzywtw== X-Received: by 2002:a05:600c:3d89:b0:410:6344:8c4f with SMTP id bi9-20020a05600c3d8900b0041063448c4fmr3082284wmb.10.1707648821287; Sun, 11 Feb 2024 02:53:41 -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 i19-20020a05600c355300b0040ff2933959sm5562615wmq.7.2024.02.11.02.53.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 02:53:40 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Feb 2024 10:53:06 +0000 Message-ID: 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)