From patchwork Sun Feb 18 20:59: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: 60530 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 7378527BBE2; Sun, 18 Feb 2024 21:01:40 +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 5B4E927BBEC for ; Sun, 18 Feb 2024 21:01:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rboHO-0007WT-He; Sun, 18 Feb 2024 16:00:54 -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 1rboHD-0007Rh-Fv for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00: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 1rboHC-0004xw-KV for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rboHX-0002ka-8z; Sun, 18 Feb 2024 16:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH v2 01/10] gnu: go-github-com-alecthomas-chroma: Move to golang-xyz. References: <8734trmf1h.fsf@gmail.com> In-Reply-To: <8734trmf1h.fsf@gmail.com> 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, 18 Feb 2024 21:01:03 +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 , Katherine Cox-Buday , Sharlatan Hellseher X-Debbugs-Original-Xcc: Katherine Cox-Buday , Sharlatan Hellseher Received: via spool by 69238-submit@debbugs.gnu.org id=B69238.170829004710454 (code B ref 69238); Sun, 18 Feb 2024 21:01:03 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 21:00:47 +0000 Received: from localhost ([127.0.0.1]:38587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHF-0002iC-Fv for submit@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:47 -0500 Received: from mail-wm1-f46.google.com ([209.85.128.46]:53268) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHB-0002hX-VH for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:44 -0500 Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-412641511beso3289015e9.2 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 13:00:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708289955; x=1708894755; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ttJcQcaC916Ay9tuX845J2BZFXGsuFLrtviNjexuAVE=; b=dbm3xhW8FNISaF6RI/F7vJat5M4I/9JMPzYLsVFPWn75qX/92s+mxNJmX/ai8rpo/J CDXlHzFxDUZ0l0s3upWpAzTl0nrBVSZ3JYCjnOaAdY/ddUVLdV4TG+RDS8DAZfalHnLp HOsj9m7hW6OhdUZ+hUbZyu6CTc/QXObMIcDi3T+Y3Bp8DOjLBgscBMFAF3cNNz7kX9+7 +8oybAWrM7mlpCFOoSfCXpWIMUdCMXjEpqT8FZ/w80MjvUs92splbFcvPIsugKv5bTu4 dgBII3mqnz5oHWSF3BEoMZVyCT5XiBkDJq5J52tXI8cIXT4qqeqfHcXVRiTIE3JFnzew Y/ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708289955; x=1708894755; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ttJcQcaC916Ay9tuX845J2BZFXGsuFLrtviNjexuAVE=; b=iy2NtvSwEAK0pw3EUh34WpbSCmorW93dc+i8Y84mYesq4zBpgGskh/m/PQT9LmS9A5 mEfLjuF8WN4yDpCcyeDFtK2TgaDCsYKkSNrXsV0MlzpeKyuzPKSAXcRrJkxagq7BXNa0 UoQjPAa7BGdjUA4mf3Q2szQkWqsQfev6oQ0wLjtdp+O7bu/0U4NfIJEQ4oAYpDKN7I2e 8VGh7XiWZ2oqKGuqyJ4i8XH9Z2a1Xa+UlFqzP8b4XJZfRfdl5nQL6LrkcOLvtLVU491M dICLj7/yuVZxU4PaKJmGDUP21/NlQoq+3rDuWu8VccN+rXkrWM/33an08V118IIEb+np m44g== X-Gm-Message-State: AOJu0Yw+9+JvPmajdB6O6jwXcbhKhGMYvhyeY4VDdin8YckEqz9sKXI1 jsIrCFFguYU1CPYvpxhPpexfvawgbWFfg/V9WiheiHjSJifIatoKXyScxPSAqS8XVg== X-Google-Smtp-Source: AGHT+IGE/lxooRL9kU/HzFDi1zrYxjdrzWPrKaIGhKUZqHOdTfCl6vd30fD4o8nva8QtCFYBr0WhBQ== X-Received: by 2002:a05:600c:198f:b0:40f:ddc8:f804 with SMTP id t15-20020a05600c198f00b0040fddc8f804mr7267343wmq.17.1708289955464; Sun, 18 Feb 2024 12:59:15 -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 ay23-20020a05600c1e1700b004125ff0b572sm4363713wmb.8.2024.02.18.12.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 12:59:15 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 20:59:00 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 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(-) base-commit: fdbf4192f5eaa7fdb5e6e2e98ada0726c8104824 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 bde0c74859..59d0df0781 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7643,35 +7643,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")