From patchwork Sun Feb 18 18:39:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60516 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 155E427BBEC; Sun, 18 Feb 2024 18:42:34 +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=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 C41DF27BBE2 for ; Sun, 18 Feb 2024 18:42:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbm6j-00080z-Az; Sun, 18 Feb 2024 13:41:45 -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 1rbm6i-000800-4k for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:44 -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 1rbm6h-0006vi-Rp for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbm72-0004WA-Eg for guix-patches@gnu.org; Sun, 18 Feb 2024 13:42:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH 01/10] gnu: go-github-com-alecthomas-chroma: Move to golang-xyz. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Feb 2024 18:42:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69238 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69238@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 69238-submit@debbugs.gnu.org id=B69238.170828170017251 (code B ref 69238); Sun, 18 Feb 2024 18:42:04 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 18:41:40 +0000 Received: from localhost ([127.0.0.1]:38208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6d-0004U4-RJ for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:40 -0500 Received: from mail-wm1-f44.google.com ([209.85.128.44]:51315) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6W-0004S7-49 for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:34 -0500 Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-4125ea5d913so6956405e9.2 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 10:41:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708281605; x=1708886405; 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=vuRgy3GXheCvp4UICsGfoen5upKl5hNfPVUJJXL0voo=; b=dKyspG116ayjsZ8gisR7/eV0BsxpzX7Jzj095P0hmEmgJgtOn0bwZNoQtnRlxffg2U M0wwC/cXLrN9AQVxgS/qlOTyyaWsAcOmnoub9bhv/biuxT/utd0ERf3+Wvvo+VVfwNTF vkZO1UZZO/TyKmVGPmi8zXYT+oUMWuF1UPDQIfOVtGJq3dW4vbBqsXMQNiJLhF7dDMlP Og2Nt/7YSnY2OvOy4Dmg1xFndb0EPXoUSBdEnmKt4acC1BinSNHWh2QaaSjzqYKwOJoH /tD6plofi2TXRmgAkdIH03bnu7vuDxgkjwkSr7lEh1a+mJ5A4NgqTp57YhDVmOOFvUiW j5MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708281605; x=1708886405; 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=vuRgy3GXheCvp4UICsGfoen5upKl5hNfPVUJJXL0voo=; b=cIm30QsJRjlrpNHcBpsbih+jcvxPWQbXux1vYnv344TMux3sWZ5mdjL8Q0eAxFdtUd 0AVLe/UGUmMRcm85OU+IpxcyM2TXd+qyQjIXrRYmo4yBOcNxXEi9BwLwXrIhlb7I8sXo s87IrgFxAzLJ7yhi8VzBwz/4FeCItZX1tG97H8YDSukpurwzSb/K3L9LYRHQplageYmY WFjNyjweYkaBs1fnL65yVxP3i9uKIznjboqLspCXx/xeKygwDK+sB0Xv0ndU7dIH13fT +OLJcruoiBLg0jE40t6uYEw5Bs/UktST8nRedAHa2d5DxhcJgKCLvrwXOeSxlHaHFFaq R3MQ== X-Gm-Message-State: AOJu0Yymwen3pwmZj/LMTbDq6SvxtmLYr6q8PPn0cgduI9hNarjcTcta 6HUHOV7/q+BcGRNPoPKCgNeHqE1mrprFEDD1+YnaP9/F3EwVN9i/ojW4XXk1tCM= X-Google-Smtp-Source: AGHT+IH+Wfizi9y/VXo5Vicb3lF9zPqZNx+fcQwtdW+MEolCTEqdsmaOJsBC9gotv/Dtd+3OLfhn1A== X-Received: by 2002:adf:e450:0:b0:33b:5725:e516 with SMTP id t16-20020adfe450000000b0033b5725e516mr7009795wrm.51.1708281604549; Sun, 18 Feb 2024 10:40:04 -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 x11-20020a5d444b000000b0033b7ce8b496sm8011358wrr.108.2024.02.18.10.40.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 10:40:04 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 18:39:52 +0000 Message-ID: <3961dc26b001f96986279a0039f926c20b326203.1708155311.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-alecthomas-chroma): Move from here ... * gnu/packages/golang-xyz.scm: ... to here. * gnu/packages/configuration-management.scm: Add (gnu packages golang-xyz) module. Change-Id: I0f5f7068f530b282f3636678e9edc4fad6c8c94a --- gnu/packages/configuration-management.scm | 1 + gnu/packages/golang-xyz.scm | 33 ++++++++++++++++++++++- gnu/packages/golang.scm | 29 -------------------- 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 6632f429e2..d0105ea75c 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -23,6 +23,7 @@ (define-module (gnu packages configuration-management) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-web) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages version-control) #:use-module (gnu packages textutils) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index b0a5955405..024b38bd6e 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -3,15 +3,16 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Dominic Martinez ;;; Copyright © 2023 Benjamin ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Katherine Cox-Buday -;;; Copyright © 2023, 2024 Sharlatan Hellseher ;;; Copyright © 2023 Thomas Ieong ;;; Copyright © 2023 Timo Wilken +;;; Copyright © 2023, 2024 Sharlatan Hellseher ;;; Copyright © 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. @@ -75,6 +76,36 @@ (define-public go-github-com-a8m-envsubst substitution.") (license license:expat))) +(define-public go-github-com-alecthomas-chroma + (package + (name "go-github-com-alecthomas-chroma") + (version "0.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/chroma") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "066a6rdmf670d3v5sc7chbn7db09ldgxjympb03pcqwk644dixb1")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/alecthomas/chroma")) + (native-inputs + (list go-github-com-dlclark-regexp2 + go-github-com-alecthomas-assert + go-github-com-alecthomas-colour + go-github-com-alecthomas-repr + go-github-com-mattn-go-isatty + go-github-com-sergi-go-diff)) + (home-page "https://github.com/alecthomas/chroma/") + (synopsis "General purpose syntax highlighter in pure Go") + (description + "Chroma takes source code and other structured text and converts it into +syntax highlighted HTML, ANSI-coloured text, etc.") + (license license:expat))) + (define-public go-github-com-alecthomas-participle-v2 (package (name "go-github-com-alecthomas-participle-v2") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 527b63d160..d877135282 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7620,35 +7620,6 @@ (define-public go-github-com-sergi-go-diff @end itemize\n") (license license:expat))) -(define-public go-github-com-alecthomas-chroma - (package - (name "go-github-com-alecthomas-chroma") - (version "0.8.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alecthomas/chroma") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "066a6rdmf670d3v5sc7chbn7db09ldgxjympb03pcqwk644dixb1")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/alecthomas/chroma")) - (native-inputs - (list go-github-com-dlclark-regexp2 - go-github-com-alecthomas-assert - go-github-com-alecthomas-colour - go-github-com-alecthomas-repr - go-github-com-mattn-go-isatty - go-github-com-sergi-go-diff)) - (home-page "https://github.com/alecthomas/chroma/") - (synopsis "General purpose syntax highlighter in pure Go") - (description "Chroma takes source code and other structured text and -converts it into syntax highlighted HTML, ANSI-coloured text, etc.") - (license license:expat))) - (define-public go-github-com-muesli-reflow-wordwrap (package (name "go-github-com-muesli-reflow-wordwrap")