From patchwork Sun Feb 11 10:53:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60018 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 9479C27BBE9; Sun, 11 Feb 2024 10:55:10 +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=unavailable 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 9427927BBE2 for ; Sun, 11 Feb 2024 10:55:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZ7U0-0003pb-Lq; 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 1rZ7Tz-0003p1-Rw for guix-patches@gnu.org; Sun, 11 Feb 2024 05:54:47 -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 1rZ7Tz-0005Yz-JE for guix-patches@gnu.org; Sun, 11 Feb 2024 05:54:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZ7UF-0005QN-Mn; Sun, 11 Feb 2024 05:55:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69042] [PATCH 19/30] gnu: go-golang.org-x-sync-errgroup: 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: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.170764885420683 (code B ref 69042); Sun, 11 Feb 2024 10:55:03 +0000 Received: (at 69042) by debbugs.gnu.org; 11 Feb 2024 10:54:14 +0000 Received: from localhost ([127.0.0.1]:38367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ7TQ-0005NA-D6 for submit@debbugs.gnu.org; Sun, 11 Feb 2024 05:54:13 -0500 Received: from mail-wm1-f45.google.com ([209.85.128.45]:45258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ7TI-0005LD-S2 for 69042@debbugs.gnu.org; Sun, 11 Feb 2024 05:54:05 -0500 Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-40efcb37373so18685305e9.2 for <69042@debbugs.gnu.org>; Sun, 11 Feb 2024 02:53:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707648823; x=1708253623; 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=3PLQEyfJDiaGU18s/Tp/bPEhkMhsj6HAEqYV6SOSYYU=; b=ZuO35qk3ynz5KDlXu9TmZ0P+TjfDtGJ3+QwiTl2c0xIVxAt8eTZYTpB578G4gRzIrN l0dJN9iZ/3RCC9MOq77Ye6Ouw+pfuZuO6rixR/HKSUzmZ8YXVhzDYTkU57d1vLH3Kmfe dMRfhdtV+TLf49tpRhhnJZcyQAKKeGWHYkUIioFSLqtabkKH5rkUuppZBZ5qclY3apg9 X3n1XzN5a3yhw1JY030DoFnLKyz+RC8/gM1ooaBImMyYBYfjWq3cvYNkh9xZWtc8YE2r Dt6TuhIbN7qD9ICoLH17CEdFO3sXL2KJLB9nMc5jnnxvqy9febywIvs4WRcWYwtVL8HI on1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707648823; x=1708253623; 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=3PLQEyfJDiaGU18s/Tp/bPEhkMhsj6HAEqYV6SOSYYU=; b=jFu8FbS9cE4uzMrVu3LzzREX2uGmlVunjrzrylHMAShkBIIPawySc8jXif1Xi9MICL tVGRylJdgZ5aIbN6IutWzybrCcokcRtB4Bkj7pa4g7QZqW89FMdfffKmzw5mZVNk4Rj9 9x7vi6xMdjmPEd07C2LgAmosR+R4yauT2Ucj8dMAD5Eba8a8hQQLvKIyJnwozh8cVK9y pkCXuV2bwbhdlAjoVBadl65aEocyZgdhYaZySNSCgqCB7WkONSCW5qdWmiLIiYDPS5VT blL1fYXwfLXcq4izAofpZ5ld27dfSrcyObtaSHboHB18lYDS/d8xlcFnRoIIw/YcJGsM yKow== X-Gm-Message-State: AOJu0Yw3eXOrwPWTtYH/BqlOQAiH0ZN2ZVwq3GHUxiOUgV64qaEF/cfl Zfnx/ZDRJm31mysv2ZgEnJGwMch8Kz4WyO0k7sSsBWDTcS3To9X6Q/YxZtnRPjo= X-Google-Smtp-Source: AGHT+IFgiwD/trqqcHzfu5dK6s0z30LyjOFTkgk72TIpSHUIivJ2eaCa2WPdKfe4Jl3Lv0BO8ti11w== X-Received: by 2002:a05:600c:46c6:b0:410:6efd:3169 with SMTP id q6-20020a05600c46c600b004106efd3169mr3537203wmo.41.1707648822791; Sun, 11 Feb 2024 02:53:42 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 02:53:42 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Feb 2024 10:53:08 +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-sync-errgroup, go-golang.org-x-sync-semaphore): Move from here ... * gnu/packages/golang-build.scm: ... to here. * gnu/packages/check.scm: Add (gnu packages golang-build) module. Change-Id: Ie886c0f44e0a70629e23371b447f5a35006ade21 --- gnu/packages/check.scm | 1 + gnu/packages/golang-build.scm | 41 +++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 38 -------------------------------- gnu/packages/terminals.scm | 1 + 4 files changed, 43 insertions(+), 38 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 4f593cde8d..b520d6c58a 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -77,6 +77,7 @@ (define-module (gnu packages check) #: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 gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index fed606e8fb..8e64571929 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -1,11 +1,14 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2020 Leo Famulari ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2020 Vagrant Cascadian ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 hackeryarn ;;; Copyright © 2023 Artyom V. Poptsov ;;; Copyright © 2023 Felix Lechner ;;; Copyright © 2023 Katherine Cox-Buday +;;; Copyright © 2023 Timo Wilken ;;; ;;; This file is part of GNU Guix. ;;; @@ -165,6 +168,44 @@ (define-public go-golang-org-x-net-html (description "This package provides an HTML5-compliant tokenizer and parser."))) +(define-public go-golang.org-x-sync-errgroup + (let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb") + (revision "0")) + (package + (name "go-golang.org-x-sync-errgroup") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/sync") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds")))) + (build-system go-build-system) + (arguments + '(#:import-path "golang.org/x/sync/errgroup" + #:unpack-path "golang.org/x/sync")) + (home-page "https://godoc.org/golang.org/x/sync/errgroup") + (synopsis "Synchronization, error propagation, and Context cancellation +for groups of goroutines working on subtasks of a common task") + (description "This package provides synchronization, error +propagation, and Context cancellation for groups of goroutines working on +subtasks of a common task.") + (license license:bsd-3)))) + +(define-public go-golang.org-x-sync-semaphore + (package + (inherit go-golang.org-x-sync-errgroup) + (name "go-golang.org-x-sync-semaphore") + (arguments + '(#:import-path "golang.org/x/sync/semaphore" + #:unpack-path "golang.org/x/sync")) + (home-page "https://godoc.org/golang.org/x/sync/semaphore") + (synopsis "Weighted semaphore implementation in Go") + (description "Weighted semaphore implementation in Go."))) + (define-public go-golang-org-x-sys (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 68b905ff8b..7e5626a303 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7023,44 +7023,6 @@ (define-public go-github-com-google-renameio create or replace a file or symbolic link.") (license license:asl2.0))) -(define-public go-golang.org-x-sync-errgroup - (let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb") - (revision "0")) - (package - (name "go-golang.org-x-sync-errgroup") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/sync") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds")))) - (build-system go-build-system) - (arguments - '(#:import-path "golang.org/x/sync/errgroup" - #:unpack-path "golang.org/x/sync")) - (synopsis "Synchronization, error propagation, and Context cancellation -for groups of goroutines working on subtasks of a common task") - (description "This package provides synchronization, error propagation, -and Context cancellation for groups of goroutines working on subtasks of a -common task.") - (home-page "https://godoc.org/golang.org/x/sync/errgroup") - (license license:bsd-3)))) - -(define-public go-golang.org-x-sync-semaphore - (package - (inherit go-golang.org-x-sync-errgroup) - (name "go-golang.org-x-sync-semaphore") - (arguments - '(#:import-path "golang.org/x/sync/semaphore" - #:unpack-path "golang.org/x/sync")) - (synopsis "Weighted semaphore implementation in Go") - (description "Weighted semaphore implementation in Go.") - (home-page "https://godoc.org/golang.org/x/sync/semaphore"))) - (define (go-gotest-tools-source version sha256-base32-hash) (origin (method git-fetch) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index f609de8eff..37223d0d18 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -90,6 +90,7 @@ (define-module (gnu packages terminals) #: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 gtk) #:use-module (gnu packages image) #:use-module (gnu packages libcanberra)