From patchwork Mon Feb 12 18:48:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60248 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 A2D7827BBEA; Mon, 12 Feb 2024 19:21:00 +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 D522F27BBE2 for ; Mon, 12 Feb 2024 19:20:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZbrD-0008Ru-Fg; Mon, 12 Feb 2024 14:20:47 -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 1rZbrB-0008Rg-FU for guix-patches@gnu.org; Mon, 12 Feb 2024 14:20:45 -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 1rZbrB-0004b1-70 for guix-patches@gnu.org; Mon, 12 Feb 2024 14:20:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZbrS-0003yU-3P; Mon, 12 Feb 2024 14:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69042] [PATCH v2 19/30] gnu: go-golang.org-x-sync-errgroup: 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 19:21: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.170776563415146 (code B ref 69042); Mon, 12 Feb 2024 19:21:02 +0000 Received: (at 69042) by debbugs.gnu.org; 12 Feb 2024 19:20:34 +0000 Received: from localhost ([127.0.0.1]:51529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbqz-0003w9-Oi for submit@debbugs.gnu.org; Mon, 12 Feb 2024 14:20:34 -0500 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]:59537) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbqw-0003vU-Bj for 69042@debbugs.gnu.org; Mon, 12 Feb 2024 14:20:32 -0500 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-558f523c072so5498987a12.2 for <69042@debbugs.gnu.org>; Mon, 12 Feb 2024 11:20:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707765607; x=1708370407; 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=EqwM9HQtf2E+f3nxjixYnY+OLERdzB6Pkn1JA8VRjKKSTJJsMuCC6dfF8fV/SwiZ0V E/p+Tw4pYy/dx7P0kQ2BvyF5m6JAWqYIzI4qHy45yZ01bzkdmTiVwiL81kMX9FOpgU40 CGdMe0tqWAp1JiI5JCIOV/ihkPLOj2ndM8SGTnpKDdRmClbpVyBfp9EOb4JZJjIEHcdY kmwUwSjzjZv/LxQKPj3yz1asyuqnIfHgm3W/x07VziXKSIMDhoAUxjpxfzEc3SYBHguo Rx3SEq16wYIpa2Qj8iUJ2MiQDpfuvmtw0Sww+dvU0bKRdaPFRhoeIKO1DODPpxrLP/zg 8QYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707765607; x=1708370407; 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=wqRMljdNnLIFkYAG47MTFqoui6NtCHOuI56l8fQEMRUBNG/8yPRoldeabATvC23oGg BEMqXdwFFiFvc2wL/nmf0QnsJzTq3MvkKEe7ExZmthpSACkcKI1lv8dOO65wMQINcLqX 1/5nhoIRXtOleC56b+CJrIfGo8MvUJYvI9TUm4idz78efiLEyNohBqxn8b//jkDyyFKA gzYvHm6a0w8hbsIwIe2ZFeX4XCjRNZ8WpIPpGM9TiabLJEzMsR3J7HtifM/q0/IYzW9y cYxqJf4EWWn8GgxLoKJ08pjRvU4gbIC5iJvCO7asO6gFerbsig0y16Jl3/vgZJHQUy7R PMyA== X-Gm-Message-State: AOJu0Yx9aDMcxqk8YyetPf1brjl384GY4/XqwqgrTNTyUbGt4aQov5UM KwSZ2AQfY62Jy2LokWtWrPD1yAomQiuAqtuqgVvhGWetL6nTNArKm/cukTn/Z0k= X-Google-Smtp-Source: AGHT+IEXttmPSY/zuHx6UUBteuq4c6/rWeEzL2XujiV8yD+2ygS/UBaoJRDmO0vEje6wFwPWMoRCiQ== X-Received: by 2002:a5d:46c7:0:b0:33b:2ec3:426 with SMTP id g7-20020a5d46c7000000b0033b2ec30426mr5254619wrs.65.1707763751322; Mon, 12 Feb 2024 10:49:11 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 10:49:11 -0800 (PST) From: Sharlatan Hellseher Date: Mon, 12 Feb 2024 18:48:36 +0000 Message-ID: <722456bf1a229679af5a3cb8349b5db375f2fc54.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-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)