From patchwork Sun Feb 11 10:53:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60029 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 BACAB27BBE2; Sun, 11 Feb 2024 11:00:11 +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 A3DF327BBE9 for ; Sun, 11 Feb 2024 11:00:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZ7Ys-0005Gf-GC; Sun, 11 Feb 2024 05:59:50 -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 1rZ7Yq-0005Fg-HH for guix-patches@gnu.org; Sun, 11 Feb 2024 05:59: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 1rZ7Yq-0006YV-9T for guix-patches@gnu.org; Sun, 11 Feb 2024 05:59:48 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZ7Z6-0005fA-Co; Sun, 11 Feb 2024 06:00:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69042] [PATCH 21/30] gnu: go-golang-org-x-term: 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 11:00:04 +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.170764915821581 (code B ref 69042); Sun, 11 Feb 2024 11:00:04 +0000 Received: (at 69042) by debbugs.gnu.org; 11 Feb 2024 10:59:18 +0000 Received: from localhost ([127.0.0.1]:38672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ7YL-0005c0-7M for submit@debbugs.gnu.org; Sun, 11 Feb 2024 05:59:18 -0500 Received: from mail-lj1-x232.google.com ([2a00:1450:4864:20::232]:49281) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ7YH-0005bP-EA for 69042@debbugs.gnu.org; Sun, 11 Feb 2024 05:59:14 -0500 Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2d0a4e8444dso25888451fa.2 for <69042@debbugs.gnu.org>; Sun, 11 Feb 2024 02:58:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707649131; x=1708253931; 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=nEQRm/YPGgMXRX1TW5RPPSGxiyklf5sAzEC8qLh4hrcmo8nWfIctsZ9SQX+4Bz5trV BJ2vZzuXDY8DJozvXphTeJcIrRy6OUcrjyUaS64xwUo3DwzJa8GwiysPmZmGvUBGACgU dqcV8oxHynrxSnCpfaP2NQ5mBzlASFn2HecjtcWajG83H7KVgMJxavp/zFpRBTGsr1S8 EDAM+MGqPMWIfpvXoewzrdP2T8uqGNkEKRH+pb3JU8O0J7IbLibkf6Z942rTAZ+CFYZb uCdnPIxhYHT/uGV5SGMBsddjhYVCiJIHPWEMUOpGVEUTqc3fst3ZF9q9XzlEBmiDmzSc lIzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707649131; x=1708253931; 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=UAwXL43aYY/zHPcalsCU+i3RS6Nfd3n4bWJFQQKpJco0hx9bHt1e9aD2s3Tra8Q4ur 0nUis7modabZde02k7fsedtVD2vAxVdYCuSYpjaAcOFYbfQQ2+jQbh5c47BHevXvaiOL HXpaDZYgruZGsNbS7QyiALN5ZeO0bVoMvoU3SIDJGLwVQNxtky00PPXjNYrqddk8ikzd 3UWDde7XV9dNVG8Z7hI4nhgjXMZEn8Fuj242VDJanvxIrlLpF+eGxUp2s/p3uMcfJrgg oOMgkR/vR3CDBkOzSUlowmyc2c+Dxv1mjLOxvY0tTzam7oWi5WjhkXRkwUNnxq6hs//g w9Ww== X-Gm-Message-State: AOJu0YwgqfhUz4jV/v+iyuwI/kN1y+saixvGHfKt1GT8VNy9LF+uyjre kszMrg+cL1W9Nz/CV1/u4GipzFbSLHeccR+K5lMOVEujTJ2tpAjsurms7b/Jn3M= X-Google-Smtp-Source: AGHT+IGYZBvcAcke2wZXVq/IC27kzCx3ii7sXEsn/h8i3eH0GfiQ5peqX9k25pMuvNYfg4B63FZ+Kg== X-Received: by 2002:a05:600c:5011:b0:410:c740:e771 with SMTP id n17-20020a05600c501100b00410c740e771mr569721wmr.7.1707648824193; Sun, 11 Feb 2024 02:53:44 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 02:53:43 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Feb 2024 10:53:10 +0000 Message-ID: <09d9e479a874e8f0dc9c15f3e0610d6b7aaa3446.1707646257.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)