From patchwork Sun Feb 11 10:52:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60026 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 34ADD27BBE9; Sun, 11 Feb 2024 10:56:17 +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 AC48E27BBE2 for ; Sun, 11 Feb 2024 10:56:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZ7Uy-0004YN-18; Sun, 11 Feb 2024 05:55: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 1rZ7Uw-0004X0-LV for guix-patches@gnu.org; Sun, 11 Feb 2024 05:55: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 1rZ7Uw-0005yi-CY for guix-patches@gnu.org; Sun, 11 Feb 2024 05:55:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZ7VC-0005Tp-Gc; Sun, 11 Feb 2024 05:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69042] [PATCH 06/30] gnu: go-golang-org-x-sys: Move to (gnu packages golang-build). Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, leo@famulari.name, sharlatanus@gmail.com, me@tobias.gr, w@wmeyer.eu, guix-patches@gnu.org Resent-Date: Sun, 11 Feb 2024 10:56: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 , Leo Famulari , Sharlatan Hellseher , Tobias Geerinckx-Rice , Wilko Meyer X-Debbugs-Original-Xcc: Katherine Cox-Buday , Leo Famulari , Sharlatan Hellseher , Tobias Geerinckx-Rice , Wilko Meyer Received: via spool by 69042-submit@debbugs.gnu.org id=B69042.170764892420965 (code B ref 69042); Sun, 11 Feb 2024 10:56:02 +0000 Received: (at 69042) by debbugs.gnu.org; 11 Feb 2024 10:55:24 +0000 Received: from localhost ([127.0.0.1]:38459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ7UZ-0005S3-AC for submit@debbugs.gnu.org; Sun, 11 Feb 2024 05:55:24 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:49253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ7T9-0005KG-EY for 69042@debbugs.gnu.org; Sun, 11 Feb 2024 05:53:56 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-410cb9315f6so653705e9.2 for <69042@debbugs.gnu.org>; Sun, 11 Feb 2024 02:53:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707648813; x=1708253613; 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=9pdDZsoMoCazQznKyX2BPfxTfJQrDjg+r27vsVQe1tA=; b=hPtjdQgk3BJGiX/AlKow/7dFliC55KfG9EwxZ9ZP88rYWJE+33fcru3JjttwrfqUAF 0lbnMly/qO41EvlKU4Icp9ZsjZby4C8PIgZx2WE3Q+BQa5I2sZ0WWhsE3eC+FIFKoQoP KRfuZeKwd0mj7qUQwTe9J+4jo8jDIFdvjiiZxDFA4is3/E9+ozLzcfW7PRKm7eJz+QCl r97vebm+HYaZ9Ri6xIqWo/flw7HjUGLgtLJOz88CV9Cv6/CQysIvie1Q9sONCzUgMMdi Y8d03F//0/xSBHZPrKmR/0Tuk034zVKr/ZKCpLkCwETP5TfII5kNvZpJDA8ECyEad8hQ 5M/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707648813; x=1708253613; 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=9pdDZsoMoCazQznKyX2BPfxTfJQrDjg+r27vsVQe1tA=; b=Klop2JBbMHn83RLh9zOstCYUxf00vbgVNzC/wZ05wmmEaBdEA+7y3yDBucgIKxE6SL auzsk4x1Yknho8PglL93R/5Xk/FUljtRU6YTeS3/cZE+46KYKY95voXSEk5TYY4OQvYM EzUlohM4HXju+oE5OEJBZvAVQ1mPE2CzUXNh7L+Qr7xlRTQIUb6zL8ro+tFq/6aUROMN QdzwJJvXul1ftlf3YrvHCb4Dg0BVJPQEcbgwCwtzMJ1y8Wq5Jmd0H4EX3juRnS3pXNTw cj+0/6yOViBXtR3ApiiE5rApQc/aO0afa5CHpT/g92pB5RgNDLLGkrNVq5Alpkx7rBO7 TOqw== X-Gm-Message-State: AOJu0Yxv5ke1qMl/BHgIES2Wh02lJh6JGGu1BtmSQIcg/wuXAgMyimEz INOgZkQ9Vek/3TWcjH0itk5q5n2GUpHCFDcljawlTYTo2D3a7JHatVBtLpyMeQg= X-Google-Smtp-Source: AGHT+IEiop/0aJqZCd3PZiyTNGUXLtdfTs+DU7xvq7b58dI7aew339zwLPzbgx0h56q8AjvoBXS4Uw== X-Received: by 2002:a05:600c:4508:b0:410:9d98:c32a with SMTP id t8-20020a05600c450800b004109d98c32amr2198336wmo.41.1707648813464; Sun, 11 Feb 2024 02:53:33 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 02:53:33 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Feb 2024 10:52:55 +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-sys): Move from here ... * gnu/packages/golang-build.scm: ... to here. * gnu/packages/curl.scm: Add (gnu packages golang-build) module. * gnu/packages/databases.scm: As above. * gnu/packages/docker.scm: As above. * gnu/packages/golang-build.scm: As above. * gnu/packages/golang.scm: As above. * gnu/packages/irc.scm: As above. * gnu/packages/linux.scm: As above. * gnu/packages/password-utils.scm: As above. * gnu/packages/syncthing.scm: As above. * gnu/packages/textutils.scm: As above. * gnu/packages/vpn.scm: As above. * gnu/packages/weather.scm: As above. * gnu/packages/web.scm: As above. Change-Id: I161e89cacb9aa87b4fbb643ecd9ad32cfe49c9d7 --- gnu/packages/curl.scm | 1 + gnu/packages/databases.scm | 1 + gnu/packages/docker.scm | 1 + gnu/packages/golang-build.scm | 31 +++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 31 ------------------------------- gnu/packages/irc.scm | 1 + gnu/packages/linux.scm | 1 + gnu/packages/password-utils.scm | 1 + gnu/packages/syncthing.scm | 1 + gnu/packages/textutils.scm | 1 + gnu/packages/vpn.scm | 1 + gnu/packages/weather.scm | 3 ++- gnu/packages/web.scm | 1 + 13 files changed, 43 insertions(+), 32 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 0fb83a7a12..02a602a66d 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -49,6 +49,7 @@ (define-module (gnu packages curl) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages guile) #:use-module (gnu packages kerberos) #:use-module (gnu packages logging) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 903088ed4b..dc4a91f14d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -107,6 +107,7 @@ (define-module (gnu packages databases) #: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-web) #:use-module (gnu packages gperf) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index fbe8edeef0..0fe1f2c1c7 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -42,6 +42,7 @@ (define-module (gnu packages docker) #:use-module (gnu packages compression) #:use-module (gnu packages glib) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages linux) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index 2601dec27a..eeab951f1e 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -101,6 +101,37 @@ (define-public go-golang-org-x-net-html (description "This package provides an HTML5-compliant tokenizer and parser."))) +(define-public go-golang-org-x-sys + (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78") + (revision "0")) + (package + (name "go-golang-org-x-sys") + (version (git-version "0.8.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/sys") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq")))) + (build-system go-build-system) + (arguments + (list + #:import-path "golang.org/x/sys" + ;; Source-only package + #:tests? #f + #:phases + #~(modify-phases %standard-phases + ;; Source-only package + (delete 'build)))) + (home-page "https://go.googlesource.com/sys") + (synopsis "Go support for low-level system interaction") + (description "This package provides supplemental libraries offering Go +support for low-level interaction with the operating system.") + (license license:bsd-3)))) + ;;; ;;; 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.scm b/gnu/packages/golang.scm index 73e7077eac..373b57c5ad 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3712,37 +3712,6 @@ (define-public go-golang-org-x-sync (home-page "https://go.googlesource.com/sync/") (license license:bsd-3)))) -(define-public go-golang-org-x-sys - (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78") - (revision "0")) - (package - (name "go-golang-org-x-sys") - (version (git-version "0.8.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/sys") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq")))) - (build-system go-build-system) - (arguments - (list - #:import-path "golang.org/x/sys" - ;; Source-only package - #:tests? #f - #:phases - #~(modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (synopsis "Go support for low-level system interaction") - (description "This package provides supplemental libraries offering Go -support for low-level interaction with the operating system.") - (home-page "https://go.googlesource.com/sys") - (license license:bsd-3)))) - (define-public go-golang-org-x-text (package (name "go-golang-org-x-text") diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 3200ccc135..c211fa6595 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -67,6 +67,7 @@ (define-module (gnu packages irc) #: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 gtk) #:use-module (gnu packages guile) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b8b119e474..d798c44a8f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -134,6 +134,7 @@ (define-module (gnu packages linux) #: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/password-utils.scm b/gnu/packages/password-utils.scm index 6dc257dc0e..3a2bb410f2 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -91,6 +91,7 @@ (define-module (gnu packages password-utils) #: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-crypto) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index c0270b87e5..dbca1e5e90 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -38,6 +38,7 @@ (define-module (gnu packages syncthing) #: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-compression) #:use-module (gnu packages gtk) #:use-module (gnu packages linux) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index be5cb15cb8..25de916fcb 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -67,6 +67,7 @@ (define-module (gnu packages textutils) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #: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 java) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 02c1ee1043..5df50280c3 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -70,6 +70,7 @@ (define-module (gnu packages vpn) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages guile) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) diff --git a/gnu/packages/weather.scm b/gnu/packages/weather.scm index 6ba656017f..5a58b97a30 100644 --- a/gnu/packages/weather.scm +++ b/gnu/packages/weather.scm @@ -22,7 +22,8 @@ (define-module (gnu packages weather) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (gnu packages) - #:use-module (gnu packages golang)) + #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build)) (define-public wego (package diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a1039b9e0c..0c67e7d6e4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -143,6 +143,7 @@ (define-module (gnu packages web) #:use-module (gnu packages gnunet) #: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 gperf) #:use-module (gnu packages graphviz)