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") From patchwork Sun Feb 18 18:39:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60514 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 ACF6827BBE2; Sun, 18 Feb 2024 18:42:23 +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,TVD_SPACE_RATIO 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 D287D27BBEC for ; Sun, 18 Feb 2024 18:42:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbm6i-00080c-Rc; Sun, 18 Feb 2024 13:41:44 -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 1rbm6h-0007zK-0B for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:43 -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 1rbm6g-0006vC-Lg for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:42 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbm71-0004Vi-8J for guix-patches@gnu.org; Sun, 18 Feb 2024 13:42:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH 02/10] gnu: go-github-com-alecthomas-chroma: Update to 0.10.0. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Feb 2024 18:42: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 Received: via spool by 69238-submit@debbugs.gnu.org id=B69238.170828169917220 (code B ref 69238); Sun, 18 Feb 2024 18:42:03 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 18:41:39 +0000 Received: from localhost ([127.0.0.1]:38200 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6c-0004Tf-Kc for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:39 -0500 Received: from mail-wr1-f49.google.com ([209.85.221.49]:43177) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6V-0004S5-Qn for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:32 -0500 Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-3394bec856fso2638140f8f.0 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=8nxWt2HRSkijw0qT+wjMlmqIQnA8gJ/VSgzhRU6gecE=; b=JZMSwZab3MwYdNlJuJKcrow+nYhlZ/nCCvjhXLvxnxvRhikU/SqM6DQS9SXnBF5470 S90/zFsasd8S0iFJxxlTsyGTRGajlhP1zynJ9nuiMd/lM1BEXXMG5aKB4ium8UOt90TD 2srhzBHVyDzlolbJH3xA116dGcLvdIOF0ORWFV67wy0dXr3sRkUZMCZvG6jnOZgklthA yPoSuKziEP98Aqpd/pBcF/hUWHWf+Gr3uwqmqIPuY5oNBjL5Jr6FrhekbBh5pZpabZkP LDoDekudycZRNiE8Ga4Hn4x++aUls3lMpE/8dbEYaSmOzkHVv7ZR1kdYEcVYD08Slp20 qghQ== 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=8nxWt2HRSkijw0qT+wjMlmqIQnA8gJ/VSgzhRU6gecE=; b=QBdqmuZu6F+bflW1fcCchWUFtXBO/zOOJwyPwDPRaYRhqAuognvePFl01/H9neyGT5 ypbPuyRKjLdzhDgDqGsmRhQd3vPN7dGkqit13mWaR0TkLISFxUhK2k9QCvSciHEPVroB cpkSOQewWzkjbnlwUUyzutYrUiT2G3ZkctqjTGAo9yKMsgbMAzFtCJOG5weYkI6wLHfI RdJe40TnDhZnMjISH3E7qeHpE46vy2TNLioEe4+gs3I8Bw1JjSBJ1lyLCgTtMujq7heK EmYEOaOwrI8Z1gQPMzmt+gn7pbc5nlBB3dWFTp6WAVzN6kkgeDn2+eQjJuUbXOLdaomm 3VlA== X-Gm-Message-State: AOJu0YxyLodGeVnw4Ab+4QcwdwolYn7GSiinPNuyCTARTmSen+lvNuwV t2Tm5smzTNzRgSpcInqzn5WEdhged0ySzyIcYoSe2cCt/40ofcwkFXIzI+6fBTg= X-Google-Smtp-Source: AGHT+IHOdIzGtYotpuyuEg+YF6GEsxbqIq9UwPztyOeg5QeLGpPFAaR0kvgpS6asetDtk0/CcoGwjA== X-Received: by 2002:a5d:5748:0:b0:33d:32f2:dcac with SMTP id q8-20020a5d5748000000b0033d32f2dcacmr2820513wrw.33.1708281605104; Sun, 18 Feb 2024 10:40: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 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:53 +0000 Message-ID: <8141791741a9f920290f16f96e3a90d9a7ef5ae2.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-xyz.scm (go-github-com-alecthomas-chroma): Update to 0.10.0. [native-inputs]: Remove go-github-com-alecthomas-assert, go-github-com-alecthomas-colour, go-github-com-alecthomas-repr, go-github-com-mattn-go-isatty, and go-github-com-sergi-go-diff; add go-github-com-stretchr-testify. Change-Id: I9d72bbdeb97a3c94545ff08d356c5e568fe173c6 --- gnu/packages/golang-xyz.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 024b38bd6e..662341bf93 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -79,7 +79,7 @@ (define-public go-github-com-a8m-envsubst (define-public go-github-com-alecthomas-chroma (package (name "go-github-com-alecthomas-chroma") - (version "0.8.0") + (version "0.10.0") (source (origin (method git-fetch) @@ -88,17 +88,13 @@ (define-public go-github-com-alecthomas-chroma (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "066a6rdmf670d3v5sc7chbn7db09ldgxjympb03pcqwk644dixb1")))) + (base32 "0hjzb61m5lzx95xss82wil9s8f9hbw1zb3jj73ljfwkq5lqk76zq")))) (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)) + go-github-com-stretchr-testify)) (home-page "https://github.com/alecthomas/chroma/") (synopsis "General purpose syntax highlighter in pure Go") (description From patchwork Sun Feb 18 18:39:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60517 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 7A1B627BBEA; Sun, 18 Feb 2024 18:42:38 +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 928CC27BBEB for ; Sun, 18 Feb 2024 18:42:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbm6j-00080m-0u; 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 1rbm6h-0007ze-CN for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:43 -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-0006vR-4D 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 1rbm71-0004Vv-NE for guix-patches@gnu.org; Sun, 18 Feb 2024 13:42:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH 03/10] gnu: go-github-com-alecthomas-chroma: Remove bundled files. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Feb 2024 18:42: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 Received: via spool by 69238-submit@debbugs.gnu.org id=B69238.170828169917236 (code B ref 69238); Sun, 18 Feb 2024 18:42:03 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 18:41:39 +0000 Received: from localhost ([127.0.0.1]:38204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6d-0004Th-2F for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:39 -0500 Received: from mail-wr1-f53.google.com ([209.85.221.53]:45163) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6V-0004S6-UJ for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:33 -0500 Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-3392b045e0aso2289016f8f.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=2FxkMJChe4hpXDRHPrVC4QPKxszpn3HYO4jdEEgRgfI=; b=bUeM/sTZAmrk9OqVgCeGShNb2JTE2TvzpS/pzOZD4LSW8gcPCs+9umN2R/Y0kW8Qk6 vplS33LlQZV3NM4sZYGOQHMJSN/PoFNEl99Kzx1srjLJs+aIA/rdmXLfed1QyDDeZGRJ vCFrWoQolLPZ/mSc0zS5G5iogYvRFEW6j6Ed/WEynEQw9N0pFc9Cv1wpcsbCrauYfSJ7 oJQs4yM0kjowrUL4K1ek3Lx9NJNsL+Ukoa6Ahud+Ge5o5Isq9YRZeSOKhJYzhvGtpunD N9Xn0h6fVCorlLlmsGwkum1rdX1pHy1ArVZTxAmxhWdRKo3r35oyNvHFmxjeFNL5gss1 ahjw== 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=2FxkMJChe4hpXDRHPrVC4QPKxszpn3HYO4jdEEgRgfI=; b=wiyu7kXiwD77XWy1DwvgviTLzuXZgynQJ3vAQRZy8yQ7OJtWGdrMx8pFusObJqZyRJ lNd30uKJZnGRDyXj1FBkAw5w1pt8U5jEkO+yUGFlzAzbExxfp7zcKp6Vaq975YDJ3Vnl eEIUftJLHahFZYRuSHiz6Jd92g7wzgzCuZbSju2+UPPLer3yEFgAS5jwLIm6FJuK3Xqu gNJUo8EA58phG5CBmh3/3qcToCGfYWU1FENDvC3k7TPVLsmgNKNZ7qL8TeMkSPCLrJLV 58lLTD7GZGJbI1bQ8jgYx1bo3H+gvN9wmIpsDb4N/uKR0m6pSZUnndH8YLrMDDcfEEUH LnPg== X-Gm-Message-State: AOJu0Yx38ZSaaNVgkoePeoAJ/CXTBwh0wEq6TDUyb2Qm8t5aah9ubUps GMVOXFCGStxJHSTe4s6nA6qqOfKD9llNHLaldKsFUTbr+pV6VJpMHQhvWoctQx0= X-Google-Smtp-Source: AGHT+IHI7s7smdhRQ1P+O+Or8IxYmrZF9lQdis1lACLe68HEEYsdUiKSeYaOSHA/DJ5Us1HrqIJrTA== X-Received: by 2002:a5d:59a8:0:b0:33d:3098:c1c with SMTP id p8-20020a5d59a8000000b0033d30980c1cmr4497458wrr.5.1708281605620; Sun, 18 Feb 2024 10:40: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 x11-20020a5d444b000000b0033b7ce8b496sm8011358wrr.108.2024.02.18.10.40.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 10:40:05 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 18:39:54 +0000 Message-ID: <9db108cc503166a72e056dfa82092f68f5ce3bc9.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-xyz.scm (go-github-com-alecthomas-chroma) [source]: Remove git submodules and generated files. Change-Id: Idafee9723b837495084aa0cd2fb454a953ff6233 --- gnu/packages/golang-xyz.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 662341bf93..60ba4c0da4 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -88,8 +88,12 @@ (define-public go-github-com-alecthomas-chroma (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hjzb61m5lzx95xss82wil9s8f9hbw1zb3jj73ljfwkq5lqk76zq")))) + (base32 "0hjzb61m5lzx95xss82wil9s8f9hbw1zb3jj73ljfwkq5lqk76zq")) + (modules '((guix build utils))) + ;; Delete git submodules and generated files by Hermit. + (snippet '(delete-file-recursively "bin")))) (build-system go-build-system) + ;; TODO: Build cmd/chroma and cmd/chromad commands. (arguments `(#:import-path "github.com/alecthomas/chroma")) (native-inputs From patchwork Sun Feb 18 18:39:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60510 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 EC0FF27BBEA; Sun, 18 Feb 2024 18:41:55 +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,TVD_SPACE_RATIO 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 D3D2527BBE9 for ; Sun, 18 Feb 2024 18:41:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbm6j-000810-Bq; 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 1rbm6h-0007zl-NS for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:43 -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-0006vW-FZ 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-0004W3-2M for guix-patches@gnu.org; Sun, 18 Feb 2024 13:42:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH 04/10] gnu: Add go-github-com-alecthomas-chroma-v2. 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.170828170017243 (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]:38206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6d-0004Ty-F0 for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:39 -0500 Received: from mail-wr1-f48.google.com ([209.85.221.48]:45546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6W-0004SA-EC for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:33 -0500 Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-33d4c11bd34so278140f8f.3 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=1708281606; x=1708886406; 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=oLLbvnShOicdBXhNVZ8inPEeQZ2KfZJqkir+IIX2lXU=; b=WgYieEgFANM5HecbES7c9CfoT7oZNabWp9RfzEqYKMZHp7YGyB0U9SZ99Rs+M2fFpr kPnrMfuam82Yyi65Cfzwmrp6T4Bt+aR0IJ0IFTqOk+lcuUPk7+bbOUKgky+8/saPCHO5 IzVC+J0KZR6MeqSJWtS/vw3qO3zP14eZe2mCDexDgUtpTOCEt7TbHZO0GDQZKaq3E2Ik xgq7LzwEh+Xk50pcjwXt3YWcxZPux24QbFfCwNMoNzd36k2Fn4wCRnU4lMB6QW0BtHZq Yg0YGXWStWahbLueJzYRSFvlzykeouD/0lbNywwKBr+ssyjGu6vzZXYQC/+Y3IlBmW1A 0oXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708281606; x=1708886406; 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=oLLbvnShOicdBXhNVZ8inPEeQZ2KfZJqkir+IIX2lXU=; b=VcxFZ/lNMErJ9dPKLu614LJMrWJ+EH0nvDw+E6WPrEw79uDZb8i5d066+Cxkbyz0kG rA5ZKKMDNhOQ4t/zxdFP1lx1Z3aGGr1c3rmHdVdLInteLvcxuw8cl8Jzckgz/palD6st 5WeToWzQp8l85/zGD8dLl4c5jG4/G+fSBkphat0dxzr4nAvB66eiORJIRQ/i/nKxgNet sSDjcooPrMRqJPmvzV9byfevlVk4DSpJzd4dgDCEdCTadN0BwQHx8/s8of3hu7GXbVmN b2NSa3VedkHFk93tg2fWIH4QxZgHwZxM6Rejq+ADL4pvbhW2udh8hQZZCg1yGdCeIk8s NGsg== X-Gm-Message-State: AOJu0YwL25AyCyLnv3TXoPy66FmzTIqB3fZLuPdzXwghHV/7jW9IEXEM MTwaaptiBEjITvnavxKyo2Ldvl1hKKdo6vByZOvzJ8ltIUDEG/Ehfoj1t01Pq9k= X-Google-Smtp-Source: AGHT+IF711VpJyp3+wsfYe0y1Px99iPiUQsUbNcwXiUpB52jH6k8bjaqp8WFvHifIWV0wQ71BbZIYg== X-Received: by 2002:a05:6000:809:b0:33d:1656:21fa with SMTP id bt9-20020a056000080900b0033d165621famr8606464wrb.24.1708281606134; Sun, 18 Feb 2024 10:40:06 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 10:40:05 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 18:39:55 +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-xyz.scm (go-github-com-alecthomas-chroma-v2): New variable. Change-Id: I883a1ca1a84fd35cf0d7fe946fd1caedafae3842 --- gnu/packages/golang-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 60ba4c0da4..c64200d365 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -106,6 +106,29 @@ (define-public go-github-com-alecthomas-chroma syntax highlighted HTML, ANSI-coloured text, etc.") (license license:expat))) +(define-public go-github-com-alecthomas-chroma-v2 + (package + (inherit go-github-com-alecthomas-chroma) + (name "go-github-com-alecthomas-chroma-v2") + (version "2.12.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 "1j9zz77ppi4r4ncnanzj84h7bsg0qdqrhgd5kkjiv09afm31jx83")))) + (arguments + (list #:go go-1.19 + #:import-path "github.com/alecthomas/chroma/v2")) + (propagated-inputs + (list go-github-com-dlclark-regexp2)) + (native-inputs + (list go-github-com-alecthomas-assert-v2 + go-github-com-alecthomas-repr)))) + (define-public go-github-com-alecthomas-participle-v2 (package (name "go-github-com-alecthomas-participle-v2") From patchwork Sun Feb 18 18:39:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60512 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 AE81E27BBEE; Sun, 18 Feb 2024 18:42:18 +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,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 BD0DE27BBE2 for ; Sun, 18 Feb 2024 18:42:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbm6k-00082D-Q8; Sun, 18 Feb 2024 13:41:46 -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-00080R-J1 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 1rbm6i-0006vq-A1 for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbm72-0004WI-TH for guix-patches@gnu.org; Sun, 18 Feb 2024 13:42:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH 05/10] gnu: go-github-com-alecthomas-assert: Depricate package. 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.170828170117258 (code B ref 69238); Sun, 18 Feb 2024 18:42:04 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 18:41:41 +0000 Received: from localhost ([127.0.0.1]:38210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6e-0004UC-Gz for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:40 -0500 Received: from mail-wm1-f52.google.com ([209.85.128.52]:51603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6X-0004SD-6w for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:35 -0500 Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-41243d19ecaso15699825e9.3 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 10:41:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708281607; x=1708886407; 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=6xBEfxW/NrKh8Xxhi2v+JgaBj7WYSNNOhH+ZLDL/9oA=; b=fXXT1lp7x3AZCs22pAY995d1Og2IFZcYJ7QgiUyCGMRx0dCEVOzOQCkpwcyCYZTj/D EEkw5rSVgvsJ32Ljg22VmvMfeTJtkuLt3+ZSTkbKlScL9gV1eCsPu9Ayb/wk+ye6uKlo lynFTDPWsBZWQkHZ4Of3qGkN9mUQlXGytGQ5Mvn3nhJSicV6rmGQzd7exHGDUrwiaUxk oo8dWBTWunnYJt6ltU918HX5FDFeUTSxO7LrSeQhfUNxkbUduESJ/AAfVd72pekp0f7Z XEA7w6I990pBgvfOMZmX3tTdkEw3Ep7hSsCIFtDcyxawy0axehYmEEXCPDxx5BiiENpb Q0bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708281607; x=1708886407; 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=6xBEfxW/NrKh8Xxhi2v+JgaBj7WYSNNOhH+ZLDL/9oA=; b=ZD37P/fLA8UszL1w5gK3mgySgfFdhVo8dBF0iYomJMAzzurJmJqdo7VoIUNmsOYjiY EckZ/fvAU7QTX9NINMfe8gGgEjwrM4krT+Qrc+jRtuqT+LpBnw3Iib/VSF1VihzSH5G4 PXF5AZXSGp1UoOHgMy7u9UgDexZfu4SW+Y7MWrzC3IQprQFHk0ufAqo/5Y2O+y1yyMcE 6uSCzakGN0Qqs94p4SFHBeAYoT0UTYLio8urgGFCiZTqWUV7wvaW8KyPOWK4w9YLlxJa csMuFGc1/UFMjLWKEEYJZsfAj1G8LWEBcmPaP/U9VUG7tVH7DnJ6GhUVnweNLqmEBUIY 5vkw== X-Gm-Message-State: AOJu0YybO6RmK3A/Uzj0wnTqNr178Lc+z0CzPsU9IdsRwLSe9z65Qocd RfvAOrSiURgdxJDY97/jSi2nAZxtoDdKE2KMPDxrhlhhYbfTwZygdQTq9ramitg= X-Google-Smtp-Source: AGHT+IEZ3u2zi8QwyshMffrqFz4sLXS7QhjcBH+omA0rC7Dw0tLGTop/MALsv59PDWO9gYjWp1k/SA== X-Received: by 2002:a5d:4704:0:b0:33d:1d2f:1fdc with SMTP id y4-20020a5d4704000000b0033d1d2f1fdcmr4003647wrq.38.1708281606763; Sun, 18 Feb 2024 10:40:06 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 10:40:06 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 18:39:56 +0000 Message-ID: <662195cd762bd4c108da297964a6f428b55e58fb.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 The package go-github-com-alecthomas-assert is succeeded by go-github-com-alecthomas-assert-v2 not in use by any others and failed to build, see . * gnu/packages/golang-check.scm (go-github-com-alecthomas-assert): Remove variable. Change-Id: Ia3f7b039c4de9b1b2956f0bfc2629d791aa9cf5a --- gnu/packages/golang-check.scm | 46 ++++++++--------------------------- 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 4874e0c9ae..64d0c68081 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -60,43 +60,8 @@ (define-module (gnu packages golang-check) ;;; Libraries: ;;; -(define-public go-github-com-alecthomas-assert - (let ((commit "405dbfeb8e38effee6e723317226e93fff912d06") - (revision "1")) - (package - (name "go-github-com-alecthomas-assert") - (version (git-version "0.0.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alecthomas/assert") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/alecthomas/assert")) - (native-inputs - (list go-github-com-alecthomas-colour - go-github-com-mattn-go-isatty - go-github-com-alecthomas-repr - go-github-com-sergi-go-diff)) - (home-page "https://github.com/alecthomas/assert/") - (synopsis "Go assertion library") - (description "Assertion library that: -@itemize -@item makes spotting differences in equality much easier -@item uses repr and diffmatchpatch to display structural differences in colour -@item aborts tests on first assertion failure -@end itemize\n") - (license license:expat)))) - (define-public go-github-com-alecthomas-assert-v2 (package - (inherit go-github-com-alecthomas-assert) (name "go-github-com-alecthomas-assert-v2") (version "2.2.2") (source @@ -108,13 +73,22 @@ (define-public go-github-com-alecthomas-assert-v2 (file-name (git-file-name name version)) (sha256 (base32 "055w46gr47rrn5g2hh7z6hj3x2b8advbcph8gs8szrpzlympyyz0")))) + (build-system go-build-system) (arguments (list #:go go-1.18 #:import-path "github.com/alecthomas/assert/v2")) (propagated-inputs (list go-github-com-alecthomas-repr go-github-com-hexops-gotextdiff)) - (native-inputs '()))) + (home-page "https://github.com/alecthomas/assert/") + (synopsis "Go assertion library") + (description "Assertion library that: +@itemize +@item makes spotting differences in equality much easier +@item uses repr and diffmatchpatch to display structural differences in colour +@item aborts tests on first assertion failure +@end itemize") + (license license:expat))) (define-public go-github-com-cheekybits-is (let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9") From patchwork Sun Feb 18 18:39:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60515 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 37E1327BBEA; Sun, 18 Feb 2024 18:42:29 +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,TVD_SPACE_RATIO 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 2BA9427BBE2 for ; Sun, 18 Feb 2024 18:42:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbm6l-00082f-Ts; Sun, 18 Feb 2024 13:41: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 1rbm6j-00080n-1c for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41: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 1rbm6i-0006vx-OT for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbm73-0004WP-Ac for guix-patches@gnu.org; Sun, 18 Feb 2024 13:42:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH 06/10] gnu: go-github-com-alecthomas-assert-v2: Update to 2.5.0. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Feb 2024 18:42:05 +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.170828170117265 (code B ref 69238); Sun, 18 Feb 2024 18:42:05 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 18:41:41 +0000 Received: from localhost ([127.0.0.1]:38212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6e-0004UJ-Vx for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:41 -0500 Received: from mail-wm1-f49.google.com ([209.85.128.49]:50349) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6X-0004SI-O7 for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:35 -0500 Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-41242d2f73cso15841225e9.0 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 10:41:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708281607; x=1708886407; 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=yYAsi1AJmt7oYYcplMza2FUAPdQVFQzZ94rJR78kYLA=; b=cQrWrGkMl/hg5DvFwTyzxGAC/JBe+yQ54b4ViuV9+Oewy0JRPUhm7uiZ6R0uwtjusu Xo5RAKMJB1GeFsb/SVt51YTaGJkOhy+/6z+BCXzzwlvVTCyYIH4BAfoPLlozCdYT0O5Q /g+PNLvmTEbZCJjUJqijUNU0vV0dgtLuejlSFJAN5cpmGh8r/LF9l7O4ODTiuUjb5cd5 Zuo7yhTip0AzhAnNA6cNiVdzmTTBhEIznEz4eOi8BE+9Qf/jz//yUtDOjIj5M+3Us9TS fjN9p0+voyb0YunMWcyuIuXtahWSmg84BRHGYrE9oVCB4Df147tuM8lUta5DLAZCA5Lq C03A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708281607; x=1708886407; 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=yYAsi1AJmt7oYYcplMza2FUAPdQVFQzZ94rJR78kYLA=; b=nq4x1sZQq77R195+IwO01fQGhZhxMjqB7blm+l8Ao9er4U+qByDBAST5lYAWSJV0af CEMW6pxeyYfcdIYSv9KykvKiesAvMIeskxgonimAA9xQcOS0O07xA6VLiAu+XpWZoYzA fOnrCmjPwCKtZcKDw552uLuoIzmAdFdPu+B6UL4NDl4NIWjKSektQ+OTP+vt0z5+aXDc vmCrGslDlcLuGFCCFYIKdAcWW20ECV1cH8nyNVH7PPlY6N2I7WVz8UiNaQV4e5n89CJN xNl0WhGVW/TJ0PEzhPXR/KID72ORlv6bvNfca4qCtrx3pgaq67AdGbxzn+Kz4XvESYdz U6/A== X-Gm-Message-State: AOJu0Yxhqp2xwIcxdvmzfMKowpFgS08ZsfUjhk73f6EWh8JTXgqJWZsM VceeCY/E3eQuTyTGPclvd3vUeO5bAOU5U8K4JcAutlH0CHKelFfGhTmcONLXqMw= X-Google-Smtp-Source: AGHT+IEKs7Jy4vWqC6M2vai77d7bvEs8qZxCrbtC+aniCz2gyRLOB9YotuuEjSt867Nr4oM8MoLIvw== X-Received: by 2002:a5d:53ce:0:b0:33d:1d42:a4d8 with SMTP id a14-20020a5d53ce000000b0033d1d42a4d8mr4558408wrw.26.1708281607290; Sun, 18 Feb 2024 10:40:07 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 10:40:07 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 18:39:57 +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-check.scm (go-github-com-alecthomas-assert-v2): Update to 2.5.0. Change-Id: Ie0a1ad0488b499092437ce56f9df83d90d1be1e9 --- gnu/packages/golang-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 64d0c68081..aaa2de33a6 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -63,7 +63,7 @@ (define-module (gnu packages golang-check) (define-public go-github-com-alecthomas-assert-v2 (package (name "go-github-com-alecthomas-assert-v2") - (version "2.2.2") + (version "2.5.0") (source (origin (method git-fetch) @@ -72,7 +72,7 @@ (define-public go-github-com-alecthomas-assert-v2 (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "055w46gr47rrn5g2hh7z6hj3x2b8advbcph8gs8szrpzlympyyz0")))) + (base32 "1ai26ncfcwzg47rqaigs5v1fzfz6i8p11ki75ni5429xkjs77riz")))) (build-system go-build-system) (arguments (list #:go go-1.18 From patchwork Sun Feb 18 18:39:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60518 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 5FCBD27BBED; Sun, 18 Feb 2024 18:42: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=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 A9D0B27BBEB for ; Sun, 18 Feb 2024 18:42:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbm6m-00082i-Da; Sun, 18 Feb 2024 13:41:48 -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 1rbm6j-00081r-V4 for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41: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 1rbm6j-0006wG-Kh for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbm74-0004We-7U for guix-patches@gnu.org; Sun, 18 Feb 2024 13:42:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH 07/10] gnu: go-github-com-songmu-gitconfig: 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:06 +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.170828170217281 (code B ref 69238); Sun, 18 Feb 2024 18:42:06 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 18:41:42 +0000 Received: from localhost ([127.0.0.1]:38216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6g-0004UY-3J for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:42 -0500 Received: from mail-wr1-f42.google.com ([209.85.221.42]:48258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6Y-0004SJ-6k for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:35 -0500 Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-33d153254b7so1536925f8f.0 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 10:41:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708281608; x=1708886408; 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=8OxSn+tY0TL4H81dG21Q6HoXNoDZFPEcpSWAZsE+/Uo=; b=LElbQPf2mibYqgQ8gBUsXrkhvB6zzzIL7Mz3+q+82m48H6NXmwArqc9qkkmucqwaA5 DJ2wOrn3JVYFJd23CWjIJiLM1x89oie9aFdImCgMgBdNExB30CuMYNupVug6ZVJJ7va5 FgbtIKqtoSGcT040u3p0bEKizV0sjDlcAZJ/qC5nNL5TSUzTSMKNv1M8CHhA1C+sOdY0 ys3E/nycMFk/B7B/+fMawawb7k7GwmdN0sB/Q0m24GSWk3gVHpxtqfbYNlbB7+3zT7Ui 01HGbYHNvxIhXLCvgcUjnmqYtO48/q27hdN9+XEFeqc5clUKMYD2Hl1VQPWko+oXchLO PYdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708281608; x=1708886408; 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=8OxSn+tY0TL4H81dG21Q6HoXNoDZFPEcpSWAZsE+/Uo=; b=Vd1mYHjJ2FG0fRdd07bJalrrMJa/c0QSx9Z7X0I4Jqc+2d+0nWaHFU8cDBfsU/QJGY Qkou/N6Zzu0QU2RY5wcrdbdh+fRBjs0xl0fb4XxWscuKeojJsT2DMbPb5JTsxn7tjSGM 0RTkhsHo37TkeTXb9vNP4cNEkmUu09GdnEsOFuJ6teEBM15E8lj54nivmYSWrvegbhXi EkTN5wIzRiZ2NexHijTcmT5GGVhU8UmmBqS/Vx0aj5tg3R8Vdxw1APobyat/G1v152lS 0F2/cLPUb5W4PMG9JFnlAVqG5BExOYt3rcTm4kES0IRhfLK+ATSxBY6ej23NVWs/fqNj AebA== X-Gm-Message-State: AOJu0Yxqjfju+/9ngpQR1Sm2RxYENiYWWG5yvJ6vHg75Z71242G0btZr 36a7DL7tQBvUYb98PbKDzXIf8Mwobc8dnlfyo459ToPMp1KL4NUkr2MN4WX2EAY= X-Google-Smtp-Source: AGHT+IHxMeloFWjX4goB3xQtsaPK5P8uWJJOW4brp6tgygVBWkB/PcUoHzlmfLVxJmwfISs9LKOANA== X-Received: by 2002:adf:e84f:0:b0:33d:20f7:a46b with SMTP id d15-20020adfe84f000000b0033d20f7a46bmr4683768wrn.52.1708281607858; Sun, 18 Feb 2024 10:40:07 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 10:40:07 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 18:39:58 +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-songmu-gitconfig): Move from here ... * gnu/packages/golang-xyz.scm: ... to here. * gnu/packages/version-control.scm: Add (gnu packages golang-xyx) module. Change-Id: Ibab2595d981d46096501bb8ab495e899d2aacf7d --- gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- gnu/packages/version-control.scm | 1 + 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index c64200d365..a6031a8354 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen @@ -1019,6 +1020,33 @@ (define-public go-github-com-songgao-water Use waterutil with it to work with TUN/TAP packets/frames.") (license license:bsd-3))) +(define-public go-github-com-songmu-gitconfig + (package + (name "go-github-com-songmu-gitconfig") + (version "0.1.0") + (home-page "https://github.com/songmu/gitconfig") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1y01h496a7pfj1g2bclls5b0nl3vnj7nz610jj1dzq9kxrwxk7fk")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/Songmu/gitconfig" + ;; Package's tests appear to be hardcoded to the author's gitconfig + ;; and require network access. + #:tests? #f)) + (propagated-inputs + (list go-github-com-goccy-yaml)) + (synopsis "Go library to get configuration values from gitconfig") + (description + "@{gitconfig} is a package to get configuration values from gitconfig.") + (license license:expat))) + (define-public go-github-com-stathat-go (let ((commit "74669b9f388d9d788c97399a0824adbfee78400e") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d877135282..5ba69b480d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8930,32 +8930,6 @@ (define-public go-github-com-tekwizely-go-parsing parsers, and related tools.") (license license:expat)))) -(define-public go-github-com-songmu-gitconfig - (package - (name "go-github-com-songmu-gitconfig") - (version "0.1.0") - (home-page "https://github.com/songmu/gitconfig") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1y01h496a7pfj1g2bclls5b0nl3vnj7nz610jj1dzq9kxrwxk7fk")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/Songmu/gitconfig" - ;; Package's tests appear to be hardcoded to the author's gitconfig - ;; and require network access. - #:tests? #f)) - (propagated-inputs - (list go-github-com-goccy-yaml)) - (synopsis "Go library to get configuration values from gitconfig") - (description "@{gitconfig} is a package to get configuration values from gitconfig.") - (license license:expat))) - (define-public go-github-com-akosmarton-papipes (let ((commit "3c63b4919c769c9c2b2d07e69a98abb0eb47fe64") (revision "0")) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 51754245d3..d7750ed269 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -110,6 +110,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages golang-check) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages groff) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) From patchwork Sun Feb 18 18:39:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60513 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 9EC8D27BBE2; Sun, 18 Feb 2024 18:42:22 +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,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 AD0EA27BBEA for ; Sun, 18 Feb 2024 18:42:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbm6l-00082c-5m; Sun, 18 Feb 2024 13:41: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 1rbm6j-000815-Ff for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41: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 1rbm6j-0006w6-7A for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbm73-0004WW-QK for guix-patches@gnu.org; Sun, 18 Feb 2024 13:42:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH 08/10] gnu: go-github-com-songmu-gitconfig: Fix build. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Feb 2024 18:42:05 +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.170828170217273 (code B ref 69238); Sun, 18 Feb 2024 18:42:05 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 18:41:42 +0000 Received: from localhost ([127.0.0.1]:38214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6f-0004UV-FH for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:41 -0500 Received: from mail-wm1-f47.google.com ([209.85.128.47]:60453) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6Y-0004SL-Mr for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:35 -0500 Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4125e435b38so9868805e9.0 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 10:41:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708281608; x=1708886408; 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=5aYD0rSGoSpdef7XKks3MEkn8ut9y37oqK8H1+mFm6Q=; b=fgUiYvfOM9kyMPBpx05DLJE9K1Y/JoLjkgZXYTGMGn0uqBsn1ouR4UTk0yoqNxk8S1 WUskUi9GGKBVDWm5U+jEynwz5NtU+fAdNp+7YAWD0nkUhdQjDeHZhFY4wYKihx7gTuhx gtmPc42/ddaHYAFc1MAKOo3ii7UJVZHh3bSwplFzGi95P+9X9AYoFbbJBsozPgppErhv y/ghP6IHqRVU3MBa8vLvDjHLhtH0Ahj0a3/V7WwTz3KihW7Eg84KlHPeQLjswo20xZz3 WRyWGlDuHOI8uyF5mYP28dKSWH4e1HS97o97arLsP1FWVJ0dtf3rkuPw7oMkEeKcqAdP 5w+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708281608; x=1708886408; 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=5aYD0rSGoSpdef7XKks3MEkn8ut9y37oqK8H1+mFm6Q=; b=H7Mv3IXBO9LPBu7ZPpZqVtas7+uGyl4aodoTFTtgP+901sgjmBMo6K8hAFdspjB+sl GNqhaMKcaHWhXiZb2uMCsMEdqcUmlvaeXgBbxpMlmlHaW1fNXjY+Ajdg7mywyKgiYGhK tqX/XvynYWVDjGV2tZLgDyqUOc1aXfxX8Ioav3UMZZDQhaf6rkDg9xsY8aLW3hph3vo3 FSytjWJdF3cb6mwnEB1kbdRG2hO7tK0l+crN0juAnAH43T5cs6jzNtzMzHHrFp3RKtym 8VdBDRolJk8SbRfvhk7a2k+wqkiZGugwl+lygzcaVC+ZeAZA8UVUPRZsjMMIkOxw7bvS 4VYQ== X-Gm-Message-State: AOJu0Ywk3mJRGqoUA0ctZx3vbexeSeHn/tC8H3Sqckv3k5/8AyjhuCRZ hYP6Fa1WF4T2kZWuo8LmopvI3uJKLT8qnWRfGyF3SqfM8ZmDF79M+yLLpmLonWA= X-Google-Smtp-Source: AGHT+IES+YwO01gXvgxmk6HnN5T2e7JP5KI5KDnyMPLiS7dB/2rt+qP3S4l1vIK1jSg3BxeNaIr2qg== X-Received: by 2002:a05:6000:1844:b0:33d:44d8:eacc with SMTP id c4-20020a056000184400b0033d44d8eaccmr1694464wri.39.1708281608387; Sun, 18 Feb 2024 10:40:08 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 10:40:08 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 18:39:59 +0000 Message-ID: <24db7997cb34efd64a441b10353c6d41137d7408.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 As seen in . * gnu/packages/golang-xyz.scm go-github-com-songmu-gitconfig: Update style. [arguments] <#:go>: Use go-1.21. Change-Id: Iea7a32b51d4bd74e99c52938307c11177ae79199 --- gnu/packages/golang-xyz.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index a6031a8354..2408916c39 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1036,10 +1036,12 @@ (define-public go-github-com-songmu-gitconfig (base32 "1y01h496a7pfj1g2bclls5b0nl3vnj7nz610jj1dzq9kxrwxk7fk")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/Songmu/gitconfig" - ;; Package's tests appear to be hardcoded to the author's gitconfig - ;; and require network access. - #:tests? #f)) + (list + ;; Package's tests appear to be hardcoded to the author's gitconfig + ;; and require network access. + #:tests? #f + #:go go-1.21 + #:import-path "github.com/Songmu/gitconfig")) (propagated-inputs (list go-github-com-goccy-yaml)) (synopsis "Go library to get configuration values from gitconfig") From patchwork Sun Feb 18 18:40:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60519 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 80C7727BBEB; Sun, 18 Feb 2024 18:42:41 +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,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 C0DCD27BBE2 for ; Sun, 18 Feb 2024 18:42:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbm6m-00082h-8p; Sun, 18 Feb 2024 13:41:48 -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 1rbm6k-000820-9B for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:46 -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 1rbm6k-0006wN-1F for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbm74-0004Wl-K7 for guix-patches@gnu.org; Sun, 18 Feb 2024 13:42:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH 09/10] gnu: ghq: Remove package labels. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Feb 2024 18:42:06 +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.170828170317288 (code B ref 69238); Sun, 18 Feb 2024 18:42:06 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 18:41:43 +0000 Received: from localhost ([127.0.0.1]:38218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6g-0004Ug-Mx for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:43 -0500 Received: from mail-wm1-f51.google.com ([209.85.128.51]:53558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6Z-0004SR-Gb for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:36 -0500 Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-41266ef4bc3so459575e9.3 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 10:41:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708281609; x=1708886409; 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=uHsjNVSY8ZdmXCGcgRiGWa0BBdUIlml+gJ8JRjRNZpw=; b=A4rxu93uqI4KP5LG7bkNsHSf/+QTcp+qD8OJQM67AwarOVUdF5m4LUQWK41t4imkoz 9xJuPs7QFiFPtALAnIRdaij9CGQD2gcEEXgsWK3ePuJLSF/EbSswv1RaSRur2VR7LYbA 0QASiDUGHAsA8+W/uasBQSCv/EQGWWSfVqTUeAtJYBFfxaXgIxIEVa9SUXO4rUgn5iR9 WXF4ZWH6E9aqBLuJVWsFVH3tBvHbSwTFCQ03p+sREZeQXSX84aVuPxdLNWqum8SaFJk2 BkdGfpknPkgm07QNfYsaHKkWvUogWzknZ9AtnFmWiIAs38ZJSco3zMGLXWK5DL54wt8L OYEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708281609; x=1708886409; 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=uHsjNVSY8ZdmXCGcgRiGWa0BBdUIlml+gJ8JRjRNZpw=; b=JQsP4kTwqKsTG+6cHyQKXHD2/hGSvoGAeBEgMCknNFTPq1OeM2xnr9yOq61cWTcb44 nl0i/r/mUJrtvrsmQF1ipEbaIjii8PE3ZXsJXjJASd6E2iHMmlCXqqmlekhfVV7MRi38 e/60GwvDxUAxjX3E88yg6TZqpCUT0r8OpLEOxFyMkX4gHZNTey6q8HzQsCWx6JSd4cNf jgGLYo8W7FizMojtRUL0vxacMvu8N1B5eBug+VXO1rczAetd34u0XlxCAmQlHiaw8GwF VHHuXCT3B6ZykYYb3vybLi5wavtpvOI+cOdQ9ZisfUodYikQO/oUNeFUIQkU5fvaRXXU pcNg== X-Gm-Message-State: AOJu0YwCv6pJj9kR8xJOFqIPDYAbUToWmPQj2fQq8j8tP8FwPK/alYRC KyUOi7B+hhNeC7LlgbSNcsxJMs2X+M2SiFhCVARK5eFoHuZlHTvF85GmmrRqd8I= X-Google-Smtp-Source: AGHT+IGfX0d5sNc0hr7iopguT43dr+tLO1BtXs/mUbZ7S2PeNbV+fGW3Kc1ohGguA5SybYuvn2prCw== X-Received: by 2002:adf:f4d0:0:b0:33b:3f43:e007 with SMTP id h16-20020adff4d0000000b0033b3f43e007mr7789914wrp.57.1708281609183; Sun, 18 Feb 2024 10:40:09 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 10:40:08 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 18:40: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/version-control.scm (ghq): Remove labels. Change-Id: Icc4b951bac4a1187c5d83a8309753d1dd842273a --- gnu/packages/version-control.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d7750ed269..b2bcca8b1e 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3738,15 +3738,15 @@ (define-public ghq (string-append zsh-completion "/_ghq")))) #t))))) (native-inputs - `(("git" ,git-minimal))) + (list git-minimal)) (inputs - `(("github.com/songmu/gitconfig" ,go-github-com-songmu-gitconfig) - ("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty) - ("github.com/motemen/go-colorine" ,go-github-com-motemen-go-colorine) - ("github.com/saracen/walker" ,go-github-com-saracen-walker) - ("github.com/urfave/cli/v2" ,go-github-com-urfave-cli-v2) - ("golang.org/x/net/html" ,go-golang-org-x-net-html) - ("golang.org/x/sync/errgroup" ,go-golang.org-x-sync-errgroup))) + (list go-github-com-songmu-gitconfig + go-github-com-mattn-go-isatty + go-github-com-motemen-go-colorine + go-github-com-saracen-walker + go-github-com-urfave-cli-v2 + go-golang-org-x-net-html + go-golang.org-x-sync-errgroup)) (synopsis "Manage remote repository clones") (description "@code{ghq} provides a way to organize remote repository clones, like From patchwork Sun Feb 18 18:40:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60520 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 EF64827BBE2; Sun, 18 Feb 2024 18:42:43 +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,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 1148D27BBEA for ; Sun, 18 Feb 2024 18:42:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbm6m-00082j-GS; Sun, 18 Feb 2024 13:41:48 -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 1rbm6k-00082H-O1 for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:46 -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 1rbm6k-0006wW-Fz for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbm75-0004Ws-2R for guix-patches@gnu.org; Sun, 18 Feb 2024 13:42:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH 10/10] gnu: ghq: Fix build. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Feb 2024 18:42:07 +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.170828170317295 (code B ref 69238); Sun, 18 Feb 2024 18:42:07 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 18:41:43 +0000 Received: from localhost ([127.0.0.1]:38220 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6h-0004Un-57 for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:43 -0500 Received: from mail-wr1-f43.google.com ([209.85.221.43]:50484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6a-0004ST-2R for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:36 -0500 Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-33d01faf711so2110540f8f.1 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 10:41:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708281610; x=1708886410; 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=Bm+6QrHO2o53VIybfLDbZhz1+emRr1u5AZMZs+zQlsw=; b=V/WbrrpLNOKmLl7Uo2Hap+jH2lnX/rkdkqQmmLWRri+p9Qx5eYmKTd+EodXMW3cVHK 1HrzR+4mbFRduBCPl85mVQA0zVAnRawWY/YiLgY04r8q6MLgv0cnz3jTex2HvXWRftnP frqEC8znu/IIUJlNGWyBIjIznCIG1QEW+XocsR2umcrLmPcOuQEQnuFJRn+X3kNGz2oa E9XyY5GZXV6hasSPO4Cco/FZaUZt4AWhQFmxOSXMf6HBl7GBCwqZR9OUiYaZddm2Go6P VEI+hPelZFFrUshPCdZeh6JMTJO9T28IvyvhrCZ6/orNq5dRQHt+pJ5qdZPcgmch/yed Dtow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708281610; x=1708886410; 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=Bm+6QrHO2o53VIybfLDbZhz1+emRr1u5AZMZs+zQlsw=; b=pwVU+qq0MLlhBk9A6xPcjsvz7IGPTOhjSM2tBVwD/vxmB9ksWLmjSpf7f9chhDGxaG jlPETtAPAxYDidOh4He46GIu7iT/YtfkUYVzzJYKDSDa0EO45LWlcgF8HHCBNnouBqBR LRO715zNxP7GEwjLp9k+CY0DBDnKHu8gqbawl14jVR8Chtn+o3tQMROU0ldspW7wffZW mjWxHCVrD6hL0UGmB2VtRHRBtORGqvN6fbl4y23c36LUofYJS9au05SnwyU6IhV7pLTh vH6widajMLgGJRJxSBSLxqsNM8dBJbBt92CWjk2eyhI7a+Jd6Feuq9DynuCxoc7zpsfw pYxg== X-Gm-Message-State: AOJu0Yz6Kte8AAmpfrvOk5Qbx3OjBxshwuUQOBx8yPDMmU8c7eEb5THZ qW8Pms7ODuHPUanLOSg85jrirMdqjTV433aMR5e26fpx6P+M9NhQwTlLLWCVBLY= X-Google-Smtp-Source: AGHT+IHfSWXMBOYcvJ0fFlldSxFIpdGOAr+dhjO9irIMkXjBqfcYp4E2iI4/DIHsCGWR+ETTwnWoUA== X-Received: by 2002:adf:f9c5:0:b0:33d:14e8:70e2 with SMTP id w5-20020adff9c5000000b0033d14e870e2mr6340541wrr.53.1708281609696; Sun, 18 Feb 2024 10:40:09 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 10:40:09 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 18:40:01 +0000 Message-ID: <99555416c787fd6d58760a281799b0cf53ca1da6.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 Fix build as seen in . * gnu/packages/version-control.scm (ghq): Use G-expressions. [arguments] <#:go>: Use go-1.21. <#:phases>: Remove trailing #t from lambda. Change-Id: Ifb1e133a2570dcd04212ef43b46c8b41c3507c88 --- gnu/packages/version-control.scm | 35 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index b2bcca8b1e..705a7facdc 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3720,23 +3720,24 @@ (define-public ghq "155sfmhmh4ia3iinm1s8fk7fxyn5dxdryad9xkbg7mr3i3ikqjwh")))) (build-system go-build-system) (arguments - '(#:install-source? #f - #:import-path "github.com/x-motemen/ghq" - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-completions - (lambda* (#:key outputs import-path #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bash-completion (string-append out "/etc/bash_completion.d")) - (zsh-completion (string-append out "/share/zsh/site-functions"))) - (with-directory-excursion (string-append "src/" import-path) - (mkdir-p bash-completion) - (copy-file "misc/bash/_ghq" - (string-append bash-completion "/ghq")) - (mkdir-p zsh-completion) - (copy-file "misc/zsh/_ghq" - (string-append zsh-completion "/_ghq")))) - #t))))) + (list + #:install-source? #f + #:go go-1.21 + #:import-path "github.com/x-motemen/ghq" + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-completions + (lambda* (#:key outputs import-path #:allow-other-keys) + (let* ((out #$output) + (bash-completion (string-append out "/etc/bash_completion.d")) + (zsh-completion (string-append out "/share/zsh/site-functions"))) + (with-directory-excursion (string-append "src/" import-path) + (mkdir-p bash-completion) + (copy-file "misc/bash/_ghq" + (string-append bash-completion "/ghq")) + (mkdir-p zsh-completion) + (copy-file "misc/zsh/_ghq" + (string-append zsh-completion "/_ghq"))))))))) (native-inputs (list git-minimal)) (inputs