From patchwork Mon Feb 12 18:48:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60227 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 4DD6527BBEE; Mon, 12 Feb 2024 18:51:18 +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 8AD5E27BBE2 for ; Mon, 12 Feb 2024 18:51:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZbNU-0008G3-37; Mon, 12 Feb 2024 13:50:04 -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-0008BY-72 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 1rZbND-0006Ny-02 for guix-patches@gnu.org; Mon, 12 Feb 2024 13:49:51 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZbNT-0001aj-SM; Mon, 12 Feb 2024 13:50:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69042] [PATCH v2 03/30] gnu: go-golang-org-x-net: 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:03 +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.17077637695765 (code B ref 69042); Mon, 12 Feb 2024 18:50:03 +0000 Received: (at 69042) by debbugs.gnu.org; 12 Feb 2024 18:49:29 +0000 Received: from localhost ([127.0.0.1]:49256 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbMu-0001Uk-55 for submit@debbugs.gnu.org; Mon, 12 Feb 2024 13:49:29 -0500 Received: from mail-wm1-f49.google.com ([209.85.128.49]:44138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbMo-0001Se-3C for 69042@debbugs.gnu.org; Mon, 12 Feb 2024 13:49:23 -0500 Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-411afbbd1c6so992305e9.0 for <69042@debbugs.gnu.org>; Mon, 12 Feb 2024 10:49:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707763739; x=1708368539; 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=GzhlKKACKTq9WwBe2Vhl4HUB9egFpk4eKcP5djdBi28=; b=KSbGCvjPYURMmC6yZZtDlcaOtUIIACQqtilfPJxyP3Dt2BCXgydjC1Xhzk2/EwkW6d JwAZQD1fQrbRaPH0cISRnzmPoxObaDiPcYTQTFHhjR6fBa6nEqN3uQxZs/ew2vm2WGZq QbNLlH6RFUpOrJ8CRhavaS+9gwEk0PEZB16s3rNoHzIK/rmgAHnl/ViNmvQ3ynw0sB7g Lz1dX7mzx1bNeHO1Wbt8Gubdf1MKeIk3WmrdfACuaUjSS5CdRBkaa4uaXCsIlv9WR4Pn ZbrGBBL9cdCQLFIUHaaqjrjpRQEUIIN1lbKLC4Qa2PXCasb1ZXlL4bT8BOrafIRPg2PT IeDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707763739; x=1708368539; 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=GzhlKKACKTq9WwBe2Vhl4HUB9egFpk4eKcP5djdBi28=; b=lOiWzbBOjmNjWa3/fXR09+Azq1GPbiCfKnIjt9KVx9O0e2yo7TKYX4bN/+IKva0Qd3 haG6fB6oNKrvCD2gnsA2U1JdCJXViDZX2vOXDE1sCK4BRlOthorvkFN7iLfiU7/FGkOz mosUeKpLOiAcqf508JCiIIAKFI4eFls73Qi+i43TIxpDEEMJk+//532XJuIVHb3IjDAC adxODNEmoTdQB9ezj/+fAV62xLifTdSRzF6xBkPCa6DRam56dEy8xGLBzqWBf0pYSJZu jrMnTpuUCB/Cxa3rhs5Klh9zLF1RLoUxbJW67keR5PvXHlQfQI2XqqSfoxKX+fsfz0XW txZw== X-Gm-Message-State: AOJu0YzA0YvhIrwzY4GBPbaK7PYaM5BkAMgk2tYHuAXjZ3l6BWywA3Cd oMRHV+fnxWtlc6VSxA6AdMaNjYhHjniBK2Nsx55v0QRM74RN4dp3rIdjDLOOXLQ= X-Google-Smtp-Source: AGHT+IF6y0gZmJ0Wv57v9lSQGf4dlb7tjef+5PdbKroDYB2n6GQ71SxMRPL137Gd9wQfJE3pUSLc4A== X-Received: by 2002:a05:600c:a386:b0:410:be25:12b5 with SMTP id hn6-20020a05600ca38600b00410be2512b5mr4038309wmb.9.1707763738624; Mon, 12 Feb 2024 10:48:58 -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.48.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 10:48:58 -0800 (PST) From: Sharlatan Hellseher Date: Mon, 12 Feb 2024 18:48:20 +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-net, go-golang-org-x-net-0.17, go-golang-org-x-net-html): Move from here ... * gnu/packages/golang-build.scm: ... to here. * gnu/packages/configuration-management.scm: Add (gnu packages golang-build) module. * gnu/packages/education.scm: As above ... * gnu/packages/file-systems.scm: As above ... * gnu/packages/golang-check.scm: As above ... * gnu/packages/golang-crypto.scm: As above ... * gnu/packages/golang-web.scm: As above ... * gnu/packages/golang-xyz.scm: As above ... * gnu/packages/golang.scm: As above ... * gnu/packages/ipfs.scm: As above ... * gnu/packages/messaging.scm: As above ... * gnu/packages/networking.scm: As above ... * gnu/packages/uucp.scm: As above ... * gnu/packages/version-control.scm: As above ... Change-Id: If009e62555ada293f17cf0f42fde82c21ef4615e --- gnu/packages/configuration-management.scm | 1 + gnu/packages/education.scm | 1 + gnu/packages/file-systems.scm | 1 + gnu/packages/golang-build.scm | 64 +++++++++++++++++++++++ gnu/packages/golang-check.scm | 3 +- gnu/packages/golang-crypto.scm | 1 + gnu/packages/golang-web.scm | 1 + gnu/packages/golang-xyz.scm | 1 + gnu/packages/golang.scm | 60 +-------------------- gnu/packages/ipfs.scm | 1 + gnu/packages/messaging.scm | 1 + gnu/packages/networking.scm | 1 + gnu/packages/uucp.scm | 1 + gnu/packages/version-control.scm | 1 + 14 files changed, 78 insertions(+), 60 deletions(-) diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 296f48dcd5..6632f429e2 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -21,6 +21,7 @@ (define-module (gnu packages configuration-management) #:use-module (guix build-system go) #:use-module (guix git-download) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-web) #:use-module (gnu packages version-control) #:use-module (gnu packages textutils) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 7b72ed0349..0f4a251bcc 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -47,6 +47,7 @@ (define-module (gnu packages education) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) #:use-module (gnu packages gtk) #:use-module (gnu packages gstreamer) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 61db3086c8..af6d1ee871 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -72,6 +72,7 @@ (define-module (gnu packages file-systems) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages guile) diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index 03fcdede80..2601dec27a 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -1,4 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Leo Famulari +;;; Copyright © 2023 Artyom V. Poptsov +;;; Copyright © 2023 Felix Lechner ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,6 +40,67 @@ (define-module (gnu packages golang-build) ;;; ;;; Code: +(define-public go-golang-org-x-net + (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d") + (revision "0")) + (package + (name "go-golang-org-x-net") + (version (git-version "0.5.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/net") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fidlcn3vcz42v2lc0rpmqh3bz08bcklj6jvnmz2vvgc481ci5hy")))) + (build-system go-build-system) + (arguments + (list + #:import-path "golang.org/x/net" + ;; Source-only package + #:tests? #f + #:phases + #~(modify-phases %standard-phases + ;; Source-only package + (delete 'build)))) + (home-page "https://go.googlesource.com/net") + (synopsis "Go supplemental networking libraries") + (description "This package provides supplemental Go networking libraries.") + (license license:bsd-3)))) + +;; XXX: Not in use by any other packages, consider to remove or merge with +;; go-golang-org-x-net. +(define-public go-golang-org-x-net-0.17 + (let ((commit "b225e7ca6dde1ef5a5ae5ce922861bda011cfabd") + (revision "0")) + (package + (inherit go-golang-org-x-net) + (name "go-golang-org-x-net") + (version (git-version "0.17.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/net") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9"))))))) + +(define-public go-golang-org-x-net-html + (package + (inherit go-golang-org-x-net) + (name "go-golang-org-x-net-html") + (arguments + '(#:import-path "golang.org/x/net/html" + #:unpack-path "golang.org/x/net")) + (home-page "https://godoc.org/golang.org/x/net/html") + (synopsis "HTML5-compliant tokenizer and parser") + (description + "This package provides an HTML5-compliant tokenizer and parser."))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 912444bc8e..2decd1f664 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -41,7 +41,8 @@ (define-module (gnu packages golang-check) #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (gnu packages) - #:use-module (gnu packages golang)) + #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build)) ;;; Commentary: ;;; diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index bf2fc11e17..39e7412558 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -44,6 +44,7 @@ (define-module (gnu packages golang-crypto) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check)) ;;; Commentary: diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 719cb5dfeb..d7fb7dd366 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -48,6 +48,7 @@ (define-module (gnu packages golang-web) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-xyz) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 8823ae21c6..33aa43357f 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -27,6 +27,7 @@ (define-module (gnu packages golang-xyz) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) #:use-module (gnu packages golang-crypto)) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 163691a1e6..3997f4057d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -81,6 +81,7 @@ (define-module (gnu packages golang) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) @@ -3650,65 +3651,6 @@ (define-public gopls editor.") (license license:bsd-3))) -(define-public go-golang-org-x-net - (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d") - (revision "0")) - (package - (name "go-golang-org-x-net") - (version (git-version "0.5.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/net") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1fidlcn3vcz42v2lc0rpmqh3bz08bcklj6jvnmz2vvgc481ci5hy")))) - (build-system go-build-system) - (arguments - (list - #:import-path "golang.org/x/net" - ;; Source-only package - #:tests? #f - #:phases - #~(modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (synopsis "Go supplemental networking libraries") - (description "This package provides supplemental Go networking libraries.") - (home-page "https://go.googlesource.com/net") - (license license:bsd-3)))) - -(define-public go-golang-org-x-net-0.17 - (let ((commit "b225e7ca6dde1ef5a5ae5ce922861bda011cfabd") - (revision "0")) - (package - (inherit go-golang-org-x-net) - (name "go-golang-org-x-net") - (version (git-version "0.17.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/net") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9"))))))) - -(define-public go-golang-org-x-net-html - (package - (inherit go-golang-org-x-net) - (name "go-golang.org-x-net-html") - (arguments - '(#:import-path "golang.org/x/net/html" - #:unpack-path "golang.org/x/net")) - (synopsis "HTML5-compliant tokenizer and parser") - (description - "This package provides an HTML5-compliant tokenizer and parser.") - (home-page "https://godoc.org/golang.org/x/net/html"))) - (define-public go-golang-org-x-image (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d") (revision "1")) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index a1b9333066..ae514cd93b 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -29,6 +29,7 @@ (define-module (gnu packages ipfs) #:use-module (guix download) #:use-module (guix build-system go) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index bb33be4872..98c1c9bf67 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -86,6 +86,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages gperf) #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 8d358961a1..dc21b2fbd0 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -125,6 +125,7 @@ (define-module (gnu packages networking) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-web) #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm index 37dc27625a..8f1759556e 100644 --- a/gnu/packages/uucp.scm +++ b/gnu/packages/uucp.scm @@ -19,6 +19,7 @@ (define-module (gnu packages uucp) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages texinfo) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 8f9fae5ce2..51754245d3 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -106,6 +106,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web)