From patchwork Mon Feb 12 18:48:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60241 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 0FF2927BBE2; Mon, 12 Feb 2024 18:56:27 +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=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 643EC27BBEA for ; Mon, 12 Feb 2024 18:56:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZbT7-0001Rs-JX; Mon, 12 Feb 2024 13:55:53 -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 1rZbT2-0001Q8-1U for guix-patches@gnu.org; Mon, 12 Feb 2024 13:55:48 -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 1rZbT1-0007rv-Pc for guix-patches@gnu.org; Mon, 12 Feb 2024 13:55:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZbTH-00025C-Kw; Mon, 12 Feb 2024 13:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69042] [PATCH v2 21/30] gnu: go-golang-org-x-term: 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:56: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.17077641317835 (code B ref 69042); Mon, 12 Feb 2024 18:56:03 +0000 Received: (at 69042) by debbugs.gnu.org; 12 Feb 2024 18:55:31 +0000 Received: from localhost ([127.0.0.1]:49728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbSk-00022D-55 for submit@debbugs.gnu.org; Mon, 12 Feb 2024 13:55:31 -0500 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]:57522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbSh-000215-UF for 69042@debbugs.gnu.org; Mon, 12 Feb 2024 13:55:29 -0500 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a36126ee41eso466675266b.2 for <69042@debbugs.gnu.org>; Mon, 12 Feb 2024 10:55:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707764105; x=1708368905; 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=Khzv7XM7xv5cBrpRO0m4qHYh+FRiGks2/T1gl7LouTM=; b=gp30+z4kpHuoKWqdRcaaMnks+2P477HdbPbsI78kNXIiJm8FtUwroh8syeU4Zt4FJ1 XXVm1iRiOnYsp2vNHOYHCG4gSSIsZOPsmP1zErYw4Xvj39vjgilJqfiE8T5Jpc2TJMkc 2srNZpzcQEl3bPKTbTOmtL8i5nGOJDsZnNFc/wDEzFt3EzbWKOGIgVamna/mILGb2z2f xw6RkBXq1eYitPLLngjU3JEfm96wVkZnteJWKeymk6eIB3H6Hw4zjTrqdyofqhoIhxoL kLrjcAa67qaVDHtRzyn2N/uxxhYPhcxls0Rd0IFGGilFTwr7J0UJIPHorv9e3MkYqkcy KSOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707764105; x=1708368905; 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=Khzv7XM7xv5cBrpRO0m4qHYh+FRiGks2/T1gl7LouTM=; b=PM+yJX4UDmOuCZJ3dT+MGsh5Di1MgZHqmHc8a/tuZWUlCtm8I6D+Iulcu6NOQ2/kTo tNZSAGWN3b7rT+WAW3EYlVggT0xjd2c0hUYn1eradrZktIykGJ7Ks03XA3HU1Hkww+9A U7GD6BAY7pEje9WxLGaRuC0LG8QfFT3Mrtq82lugMDASck46rD4tqTE5H/+oH2d63Wms m9LtyQeHbAwK9CRzBk6Qd3ISf2yTdH7KOK8+C9q2i57wlqJ8DuuIHXVMOg1aWn9y01o3 I/32LXwcT/rI/eK5ZUSH3TIN5uHH5DhjD8/fP1EAbJk+qf3srU3qNpBTcx+2ZSUWFGxv RbXg== X-Gm-Message-State: AOJu0Yz+YXc4+3bWrbLpjaXltCPAWUXlszW2Y7e1P5KU6TqQ91c0gNxu DZUmrXge/i/tn/UREM3VzPYsTbOgU597mrkSeItsI14gCZ4gOVdI0iQU9DAlm7s= X-Google-Smtp-Source: AGHT+IFQJ2qdbOwfhpdXdFo3P45E5mkkl98MMGCj0cPNN/xPvHinexxi46aXduOf/sPH1aZA8+iwlg== X-Received: by 2002:a05:6000:dc6:b0:33b:80d7:6442 with SMTP id dw6-20020a0560000dc600b0033b80d76442mr2818968wrb.66.1707763752771; Mon, 12 Feb 2024 10:49:12 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 10:49:12 -0800 (PST) From: Sharlatan Hellseher Date: Mon, 12 Feb 2024 18:48:38 +0000 Message-ID: <9dad8fd76406d479df5acee5f32e447fc9b18779.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-term): Move from here ... * gnu/packages/golang-build.scm: ... to here. * gnu/packages/disk.scm: Add (gnu packages golang-build) module. * gnu/packages/image-viewers.scm: As above. Change-Id: Ibdb637bb129437ef74a0270fd44edc8804bb3055 --- gnu/packages/disk.scm | 1 + gnu/packages/golang-build.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ gnu/packages/image-viewers.scm | 1 + 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 165f0a8a74..b0117d77ce 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -69,6 +69,7 @@ (define-module (gnu packages disk) #: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 graphics) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index 7b8653960d..db94ad2c7b 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -4,11 +4,13 @@ ;;; Copyright © 2020 Leo Famulari ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Vagrant Cascadian +;;; Copyright © 2021 Arun Isaac ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 hackeryarn ;;; Copyright © 2023 Artyom V. Poptsov ;;; Copyright © 2023 Felix Lechner ;;; Copyright © 2023 Katherine Cox-Buday +;;; Copyright © 2023 Nicolas Graves ;;; Copyright © 2023 Timo Wilken ;;; ;;; This file is part of GNU Guix. @@ -267,6 +269,29 @@ (define-public go-golang-org-x-sys support for low-level interaction with the operating system.") (license license:bsd-3)))) +(define-public go-golang-org-x-term + (package + (name "go-golang-org-x-term") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/term") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl")))) + (build-system go-build-system) + (arguments '(#:import-path "golang.org/x/term")) + (propagated-inputs + (list go-golang-org-x-sys)) + (home-page "https://pkg.go.dev/golang.org/x/term") + (synopsis "Go terminal/console support") + (description "@code{term} provides support functions for dealing with +terminals, as commonly found on Unix systems.") + (license license:bsd-3))) + (define-public go-golang-org-x-xerrors (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8bfabb9da9..240c87c3ba 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9659,30 +9659,6 @@ (define-public go-github-com-dustin-go-humanize back.") (license license:expat))) -(define-public go-golang-org-x-term - (package - (name "go-golang-org-x-term") - (version "0.3.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/term") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl")))) - (build-system go-build-system) - (arguments '(#:import-path "golang.org/x/term")) - (propagated-inputs - (list go-golang-org-x-sys)) - (home-page "https://pkg.go.dev/golang.org/x/term") - (synopsis "Go terminal/console support") - (description "@code{term} provides support functions for dealing with -terminals, as commonly found on Unix systems.") - (license license:bsd-3))) - (define-public go-github-com-klauspost-compress (package (name "go-github-com-klauspost-compress") diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 206b91c878..f2b87268f0 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -77,6 +77,7 @@ (define-module (gnu packages image-viewers) #: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 graphics) #:use-module (gnu packages image)