From patchwork Sun Feb 11 10:53:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60032 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 3D22F27BBE2; Sun, 11 Feb 2024 11:00:28 +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 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 D7BE327BBEA for ; Sun, 11 Feb 2024 11:00:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZ7Yt-0005HA-Nn; Sun, 11 Feb 2024 05:59:51 -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 1rZ7Yr-0005G5-Hv for guix-patches@gnu.org; Sun, 11 Feb 2024 05:59:49 -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 1rZ7Yr-0006Yb-AT for guix-patches@gnu.org; Sun, 11 Feb 2024 05:59:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZ7Z7-0005fQ-E4; Sun, 11 Feb 2024 06:00:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69042] [PATCH 11/30] gnu: go-github-com-burntsushi-toml: Move to (gnu packages golang-xyz). 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:05 +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.170764919321687 (code B ref 69042); Sun, 11 Feb 2024 11:00:05 +0000 Received: (at 69042) by debbugs.gnu.org; 11 Feb 2024 10:59:53 +0000 Received: from localhost ([127.0.0.1]:38710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ7Yv-0005dh-16 for submit@debbugs.gnu.org; Sun, 11 Feb 2024 05:59:53 -0500 Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]:59819) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ7Ys-0005dG-Mm for 69042@debbugs.gnu.org; Sun, 11 Feb 2024 05:59:51 -0500 Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2d0cdbd67f0so31926461fa.3 for <69042@debbugs.gnu.org>; Sun, 11 Feb 2024 02:59:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707649168; x=1708253968; 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=UkTwkUJnv9m4ib5AsiW6gd9HfgYZVQhWiXP5/GK0yyU=; b=ZO2Ll3+T8Stp6rBA1kRLDe6lz3u8Q8o2pS+gl9wa27DibAJcAJL29c1CCVtq8L9PBi RAUXkKRSuP+2An0PTeh3Jl8UoHppvZFWts6RXQ4OW2tz00m1YtxzBu+GMWmhn4sAD+fU LXepTYpegGmVk0YqKMZP3G1ifzDPTrbB8TzHPLv0H8nismQEgKXVSzH4oIxs13rP0W5X 0ltOS55qN+Hhc59p92OJWWK5q/NhJ2Ywoq552RVDAmBJ86S9skaUbyNgCfjD62VyDX43 s5n04gVbI8HDjHcZ3T6s4KA3X/sh++F/AU108VN0DTs9EwRFH44DI2Cec+YZm/wHcqgF 6EjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707649168; x=1708253968; 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=UkTwkUJnv9m4ib5AsiW6gd9HfgYZVQhWiXP5/GK0yyU=; b=mV1TPj1qGtWisopdWFYHvkUv8NisJHZJYVvKTBkYyRtFvua5LZxIS75FzyW4KHmK/x 5/mcnbHanb03C4VXdP8f7T90L1XWcsEPTLkL8fOFlMHSs252EBskgCT3kS7CjajeE2HP jtH7xV8P98uHYOyWzRjrSXauQedvdnvixg12sBfNpBlTr+fVxrf9S478rmOHb55W9kIa ZurGk17qIb6phHGjcCMo1VmLXWOIAh+ddbFxa5qsGly8Mj9GZpRcDO65MdGe0MJs482k 55tRJVw3g3y4zQM4qRvQkTOUzSmg7IidkFg3tIKQn3UUBqn7ENCTtiPoqiIWUQonev4J R/iw== X-Gm-Message-State: AOJu0YxJLlc87kk9bluKxJR7KbxR0KnP4Om2+/wb7PvejkVc2upBkqV0 XVYYAGRJsn5/W8EisdzyAlsyxsV9fgyFPg4l8LumyG9ywYOz4Pc+K5F2L3lzSOY= X-Google-Smtp-Source: AGHT+IGYlluHJCtJKZ82SakqHqV1f/3dQW8UychvjjeX12eNVAdTM0SRbsuVr/TuY7O2eHlr044GVg== X-Received: by 2002:a05:6512:ba0:b0:511:6f79:46e2 with SMTP id b32-20020a0565120ba000b005116f7946e2mr3398347lfv.64.1707648816939; Sun, 11 Feb 2024 02:53:36 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 02:53:36 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Feb 2024 10:53:00 +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-github-com-burntsushi-toml): Move from here ... * gnu/packages/golang-xyz.scm: ... to here. * gnu/packages/golang-check.scm: Add (gnu packages golang-xyz) module. * gnu/packages/golang.scm: As above. * gnu/packages/shellutils.scm: As above. Change-Id: If8a645431a1fb17159681daae70db49fd21b37c1 --- gnu/packages/golang-check.scm | 3 ++- gnu/packages/golang-xyz.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 24 +----------------------- gnu/packages/shellutils.scm | 1 + 4 files changed, 30 insertions(+), 24 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index c5e30f7fe1..8ce85421e9 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -42,7 +42,8 @@ (define-module (gnu packages golang-check) #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages golang) - #:use-module (gnu packages golang-build)) + #:use-module (gnu packages golang-build) + #:use-module (gnu packages golang-xyz)) ;;; Commentary: ;;; diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 1999aab7fb..9d2b43b86c 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1,5 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2019 Leo Famulari ;;; Copyright © 2023 Benjamin +;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023 Thomas Ieong ;;; Copyright © 2024 Artyom V. Poptsov @@ -41,6 +44,29 @@ (define-module (gnu packages golang-xyz) ;;; ;;; Code: +(define-public go-github-com-burntsushi-toml + (package + (name "go-github-com-burntsushi-toml") + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/BurntSushi/toml") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/BurntSushi/toml")) + (home-page "https://github.com/BurntSushi/toml") + (synopsis "Toml parser and encoder for Go") + (description + "This package is toml parser and encoder for Go. The interface is +similar to Go's standard library @code{json} and @code{xml} package.") + (license license:expat))) + (define-public go-github-com-djherbis-atime (package (name "go-github-com-djherbis-atime") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 903f2126c4..5f8a550b15 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -86,6 +86,7 @@ (define-module (gnu packages golang) #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages lua) #:use-module (gnu packages mail) #:use-module (gnu packages mp3) @@ -3807,29 +3808,6 @@ (define-public go-golang-org-x-mod loading algorithms.") (license license:bsd-3)))) -(define-public go-github-com-burntsushi-toml - (package - (name "go-github-com-burntsushi-toml") - (version "1.2.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/BurntSushi/toml") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/BurntSushi/toml")) - (home-page "https://github.com/BurntSushi/toml") - (synopsis "Toml parser and encoder for Go") - (description - "This package is toml parser and encoder for Go. The interface -is similar to Go's standard library @code{json} and @code{xml} package.") - (license license:expat))) - (define-public go-github-com-hashicorp-go-uuid (package (name "go-github-com-hashicorp-go-uuid") diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 00352dc327..48c5250c8c 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -51,6 +51,7 @@ (define-module (gnu packages shellutils) #:use-module (gnu packages check) #:use-module (gnu packages flex) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages libunistring) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre)