From patchwork Mon Feb 12 18:48:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60245 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 8BC8227BBE9; Mon, 12 Feb 2024 18:58:17 +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 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 A817B27BBE2 for ; Mon, 12 Feb 2024 18:58:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZbUx-0001x9-LZ; Mon, 12 Feb 2024 13:57: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 1rZbUv-0001wO-Sr for guix-patches@gnu.org; Mon, 12 Feb 2024 13:57: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 1rZbUv-0008Vz-JI for guix-patches@gnu.org; Mon, 12 Feb 2024 13:57:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZbVC-0002E5-Fz; Mon, 12 Feb 2024 13:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69042] [PATCH v2 11/30] gnu: go-github-com-burntsushi-toml: Move to 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: Mon, 12 Feb 2024 18:58: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.17077642418368 (code B ref 69042); Mon, 12 Feb 2024 18:58:02 +0000 Received: (at 69042) by debbugs.gnu.org; 12 Feb 2024 18:57:21 +0000 Received: from localhost ([127.0.0.1]:49847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbUX-0002As-1w for submit@debbugs.gnu.org; Mon, 12 Feb 2024 13:57:21 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:54640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZbUU-0002AF-PR for 69042@debbugs.gnu.org; Mon, 12 Feb 2024 13:57:19 -0500 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-33b670d8a74so2351115f8f.1 for <69042@debbugs.gnu.org>; Mon, 12 Feb 2024 10:57:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707764216; x=1708369016; 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=JnmMfy5QzjzbWPkmAJCZz5izUZSNZiY/kWFLc3oTLcq00NUCG61tN4P/5eLkdm+fH/ Dxl6C0ifRT/PaLfhNu0v2TD5owT6D4vG81/b5UF9Xgp2ZCpJCz7UTFJf9wjZdoLOd/6V GzliiQxpUskYmXBMv2Ajk3UwPxiRPbbuIAlXlzwaWpl1kSynMZ5kCiM9+Lwn4TTIA+W3 qs6AtWgob9BQL66fUqAKaJBTXRI6uYhMOMOOSwQwgiWZv4CZGwU71E/SbQ0SWWNNOYRO SQYzmO+Wl2DCeZzzX6oh6VlNL6VXediI68xMYokUsllSSZzCGU63oQlcAZK+VHyyLUlR Fw4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707764216; x=1708369016; 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=Qr64O1+PgECAQlZgjVbtrkMQ42/ct9l8ZeuN8jQvcdHUCt/usmo8/ybkj6NKDkjSyj X6dkaYz41lW1MF/12PHvinuF7gs5J+rJO0XslxuOCcDK8jy2Ulsor2meRwZyyZabE2Xn aQ2/6ZiAfDPhWtPDLSZIcE4anTWUIKRiUnsWBIwJ2XfaAEwTXCv6a4JZBikBTJyQjT9P oNyMH99uRuIWAxnWlBerAAQ0eFiQeNMM3srxdCwVi6g24djy3j0uH26qaHhcYyg3CXek QxQmIVID+4O1pu+HD7TBkMIhFNIQHH72EGnraNaW3uzYMIIrJzjAK1I9vJfp48CzZ6Ad 9l8A== X-Gm-Message-State: AOJu0YzjwfvYR9lOD0o8abqJRv14qQC6hwu6mcjLN0lJ8dD400rnpR4Z sg1Z57Z8xEI6P8zBQQ1iruwH0TKVj6G8hOuVXef6SGM4Cd7a/dMQzpnz2PJA9qk= X-Google-Smtp-Source: AGHT+IGtvyS+VrhEEp7iRLqxiY1bokeg00jB3Al0yYzFyHemkW8oBsr664/qm60ERkDkvwdX/1CUTw== X-Received: by 2002:a5d:6c6c:0:b0:33b:4ebd:1462 with SMTP id r12-20020a5d6c6c000000b0033b4ebd1462mr7028765wrz.40.1707763745248; Mon, 12 Feb 2024 10:49:05 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 10:49:04 -0800 (PST) From: Sharlatan Hellseher Date: Mon, 12 Feb 2024 18:48:28 +0000 Message-ID: <738bfdf889ad773577d6fac378ad65bd881ecacb.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-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)