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") From patchwork Sun Feb 18 20:59: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: 60522 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 F2D5827BBE9; Sun, 18 Feb 2024 21:01:03 +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 673FA27BBE2 for ; Sun, 18 Feb 2024 21:01:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rboHL-0007U5-Fg; Sun, 18 Feb 2024 16:00:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rboHD-0007Rj-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-0004xv-89 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 1rboHW-0002kT-T7 for guix-patches@gnu.org; Sun, 18 Feb 2024 16:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH v2 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 21:01:02 +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.170829004510431 (code B ref 69238); Sun, 18 Feb 2024 21:01:02 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 21:00:45 +0000 Received: from localhost ([127.0.0.1]:38584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHF-0002i5-0P for submit@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:45 -0500 Received: from mail-wm1-f48.google.com ([209.85.128.48]:52531) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHC-0002hY-Ja for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:43 -0500 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-41260f946d9so5360465e9.1 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=1708289956; x=1708894756; 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=j6noC4CSERlqfWtO3UjzlS1nWqCHHc/P4RJmwCWoQKz7aSMidDjR4jyQY7pjrYY3Wf 18SeYQJLokLjDofnJMRpO4nq0hD5Bb72QJrgtYXUUxVBX/gQvVILQWTU9uK7xv0vrgeR 5MJYGcPNor7zszue+RLa4oPOoBFuZU/nC9iJpiQ3EiG0wn0/LQMHtSe4+LegwYYRGwW1 8iICQ0r+0A/190KlWisgskt/6syKXM/I8O8pzWB7mO0GUdUAJhPQcrVFSiIkYgc8GXAI oesmCenrjC/PiWBdIMIjYXf2jueD8VLgdhS4VaWrtVRgHDCDBovIjGfy5gaXYkPjJSwe wtxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708289956; x=1708894756; 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=us2BJFJ2meXlVhluyAH8pGjQMNlReqVtAKP2+21BhAyIKIi7uF5xvG5s6q9XrMZFGW RYBgWh2eZVEyauu7BIF0EZpizq6TXWOUk5K6tQwIYB63mwxVumt7+hoPaL6BPvEA37XD ja0VQpN97sg80D4G8uSansCdxiPk2sS1jxd9dRkSKGxTxcDW3N0t8aYqhXfEasPW7+nS u+vNFgqnRvv++igUZ8HeN3Z4QE3wX7PpTgqwvtje0brDN3t3R170hCbagiFnDJBydvQS nwANkNXGPb//rGzpFcYDH9zIXJuA6tSmEs+e8fBbiCvisMoOdWxRlcyeTJ1s3ps0EIyB tseQ== X-Gm-Message-State: AOJu0Yx6sNkOfbIjUvEkR3Nto4Lm6J2WAsRpNYCcbMt/8xNoPt4qSS8u /acVHaNffwlI7GKGIbeiOeFEnqyHnNRat2G629oOjeevA4lPDk+nFLqB9YP2y8eGbQ== X-Google-Smtp-Source: AGHT+IEXrEhCUqhrU+P4orw32QMQYoiYh+dA0B9Q/AMIk4dEDkF3veMbDMKNbbzeMsQWW52VpEsVkw== X-Received: by 2002:a05:600c:1e09:b0:412:457f:70b6 with SMTP id ay9-20020a05600c1e0900b00412457f70b6mr4941415wmb.26.1708289956135; Sun, 18 Feb 2024 12:59:16 -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:01 +0000 Message-ID: <31d6eafba4bbd94d06ff88945551485245ca4035.1708289807.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 20:59:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60523 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 DB9A027BBE9; Sun, 18 Feb 2024 21:01:08 +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 362CC27BBEA for ; Sun, 18 Feb 2024 21:01:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rboHL-0007Tn-DI; Sun, 18 Feb 2024 16:00:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rboHD-0007Rg-Fj 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 1rboHD-0004xy-1D 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-0002kj-Lg for guix-patches@gnu.org; Sun, 18 Feb 2024 16:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH v2 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 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 Received: via spool by 69238-submit@debbugs.gnu.org id=B69238.170829004810471 (code B ref 69238); Sun, 18 Feb 2024 21:01:03 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 21:00:48 +0000 Received: from localhost ([127.0.0.1]:38592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHH-0002iZ-G5 for submit@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:48 -0500 Received: from mail-wm1-f41.google.com ([209.85.128.41]:60840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHD-0002ha-70 for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:44 -0500 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-41260f94858so7574455e9.1 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 13:00:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708289957; x=1708894757; 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=jD+xjPpgIqgtoHn4h+v17/QQz2SgUEKVJlkyVu5FZz8xqjqP0w1y3MBEr3xeeG1yOz sn3sLvSyk/dQt1mE4EEdAjOWEy16A6bOJY91cBKLrjrtviKNF1H6nOMKhu/Y0pKuCzST VLexxy1uUJ5kgcttd7sowwcQiQPOQmsgHgBxAak4G3anUwrZEsPdwYBHV/gKx+e4/N73 sZurGYSYyk/r5svhNDVqcLF1qQEjExLpMqnQhdaZyBn0rc+Sd2LB+lEAefyewf7lqXls JFZhlODxWcQkEgsTqNARwpHnDoju3rk0R1XQLnejtThVag894EXtJWxOhcEE/bn3hGiO /SlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708289957; x=1708894757; 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=O0ZX08gKU7WV/lWi3Uh6TqlYXaaB2xSUUnGN3tC0k2BdZs5YbzgTpaKjn6qLwxCvcd AG2gKjmH9Kzk0YzHZHopZ1ceTaBMVa8On+bzk0tMSGXYXYZafEG93uIkF2ur5Vm+7i0k nv6LJ0g3NsaDK0+Gf6p9oPHHNnlmsBssjwlsW72dawV4oqKplb9umL/Ab3ajUQGJn3RT 5iL/bjwJkr95RyZ9V07ShvK3mkymAQDDYsclD4kC0F5tj4GrgXhia/4tbeXLh/lDyioP zYryoq0igNKNwErZ4F6JCI1JrnspIgwy3KiLLGrjg/w/eUhZ38q5AOOJt2YbUiuirTC+ DZkQ== X-Gm-Message-State: AOJu0YzXXwu6Aek5F8dVlaw1fUoq6X2P+slZHGCjVAr/ovYHJBnMPBbR kDIHOZcus1A19GVOtmqtG5XMLNVXy1QxRtOc+c5+wcJ8x2vwyP3Hm8+FoXSXIUy6sw== X-Google-Smtp-Source: AGHT+IGHQ+c/DYVXFZbXYVmG+dzP9UGeD+B0xLz4CwmfePJ84vnY3zWpK7ENL4Nr9OXp9vkYOQmHxQ== X-Received: by 2002:a05:600c:4ece:b0:412:64eb:538 with SMTP id g14-20020a05600c4ece00b0041264eb0538mr1118312wmq.9.1708289956851; Sun, 18 Feb 2024 12:59:16 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 12:59:16 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 20:59:02 +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) [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 20:59:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60526 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 3D4E527BBEA; Sun, 18 Feb 2024 21:01:21 +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 C3A4827BBE2 for ; Sun, 18 Feb 2024 21:01:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rboHS-0007Xc-5w; Sun, 18 Feb 2024 16:00:58 -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 1rboHJ-0007T7-8C for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:50 -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 1rboHF-0004yL-86 for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rboHY-0002l5-TX for guix-patches@gnu.org; Sun, 18 Feb 2024 16:01:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH v2 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 21:01: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.170829005510511 (code B ref 69238); Sun, 18 Feb 2024 21:01:04 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 21:00:55 +0000 Received: from localhost ([127.0.0.1]:38599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHP-0002jL-59 for submit@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:55 -0500 Received: from mail-wm1-f42.google.com ([209.85.128.42]:44511) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHD-0002hb-Ts for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:46 -0500 Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-41265d2f7acso2107475e9.1 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 13:00:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708289957; x=1708894757; 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=KbhozHPKyXbkpLGQdBzuQV+1QKPQkk5ZxZxwVt9qQ9eDx5Zkz2aZzx/LoX1TKwFuRl pqKvlEq+pB4wa3pUMNkAysZpt7OC9kGapRF7SRJvSpwWqD2O6kTGSon6E6F6zgb9jTg/ DBFRydbm3wSKp8xIMmwnZ+CbGKEKOHx/I3/MQkZDvdUrxD/rI3HN1JCLm4KB9StlJH5T svUiAnkOtw/olEoSlI74qA7dXtQ++oiwS1IXD1shJNGIkwx2CJQdMDOuYxxDfWuhdR6o Aqn52vuejIZc4d5+BU1UOlhwn67yUSL1u78tSReymEXTIi9xBVUZFPjQVzUwexjY8QYl mXEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708289957; x=1708894757; 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=DTW7LABagvQLKIQXMfewe8leR4n98Cpjx0i5HY83rQ8uOTzNSwHyh4gqL4U5fqNZ69 MbqLubU+JOSpTaM1tDcO0/IEy2oynk4H/perdK60pEfGaIpn7gm63YaDNMCXQ36HuY44 Tvz4Ca36yUbQYDwQC7BPlfrXla0eNV0Xsma0LcfWJCRxFHFIR2XUnXRD+a0A+a1sysep OI497bAHnfrGg2A8MAJhVS4vev1zME1BZHrpzHZO2mPjncS2gw7Z/Ti/JWzuZ6SGr8Je eiPAkCRU45u8G2nVd0ARxT5B/d2UsWvjYugXxiV93oohasBvZMb/cDkwBR1MLr5ENd4n hmGg== X-Gm-Message-State: AOJu0YxpcWCFrQrpPEOKXDbDrvxF+cjK2e5YTV0RzzrlGNns6K+bzjEw qfZOILFKsyLOML0vbsrjgwFOcf0X/DQOZyJ/RGtNm3tEREOkFAjNGHZAu6QrrU9Cgg== X-Google-Smtp-Source: AGHT+IH57uKM1E8ml5v5gJ6zZmas9GCy7eyC3wKEj3eJf7LD8ZeaqndSKRkez1ThlRuvdEgg2V6hTg== X-Received: by 2002:a05:600c:4448:b0:412:6250:7179 with SMTP id v8-20020a05600c444800b0041262507179mr1857756wmn.32.1708289957516; Sun, 18 Feb 2024 12:59:17 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 12:59:17 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 20:59:03 +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 20:59:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60525 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 8704927BBEA; Sun, 18 Feb 2024 21:01:14 +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 BA02327BBE2 for ; Sun, 18 Feb 2024 21:01:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rboHQ-0007Wo-LZ; Sun, 18 Feb 2024 16:00:56 -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 1rboHJ-0007T3-75 for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:50 -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 1rboHD-0004yG-EQ for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rboHY-0002kq-3S for guix-patches@gnu.org; Sun, 18 Feb 2024 16:01:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH v2 05/10] gnu: go-github-com-alecthomas-assert: Deprecate package. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Feb 2024 21:01: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.170829005410495 (code B ref 69238); Sun, 18 Feb 2024 21:01:04 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 21:00:54 +0000 Received: from localhost ([127.0.0.1]:38595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHO-0002jC-Da for submit@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:54 -0500 Received: from mail-wm1-f47.google.com ([209.85.128.47]:53631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHE-0002hd-Ir for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:45 -0500 Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-41266ef4bc3so965025e9.3 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 13:00:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708289958; x=1708894758; 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=SzAir+J4rsXVuyhfVyMaRTyhNZuwHbwYJIv5Cl2LkUiOa3/h1BniAA4l+FvfO4jy2c ntqwQTueCWF7Vz7ca06E8O310etxSgp38TVQlUC6xynXMDJYSTGJ1B1CGztHsDEGC4pL GNSQCuGy3eq8wC7KXw7DUQU8TayeJpVAM502vi8gwx1pMUohpceWsciYkPbKki0sBhC9 s0heyVUXWAmNdXupn66yI3G5f61CfjiAcNdP3A+xlslObZNXiZgA7Yup/Thf4FX3GVuT 5UpZ4K359VVV2NufwYjjlviS1NZx3AnLFwqlVU2+UZBmbC64vrL0Uqqjnvs4zdNWTemo XkAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708289958; x=1708894758; 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=c+jT2tcwl6jVFWV+Dky+nVBVf6/8ZiIMuR0YBusW/iG1TLKnWPXnxH/WJFtDmjNXld cCTD3GHIannEYKONV7b44Pk8kBnu+uMVMRGkjRuTLcSZq3CArQeuQQ2hhFPcYXTBYvdV mjuVW+QL4K7p3otvAjZ33ovOWmCeLk5kWowHtNAH5jVQs/mEeqSLfPvck4XVvRkuhRJZ bh2oSJLUcK7VBoJ9EmE2j3NxaJjWO/uc9tymcqB+DMkIgO0PqZOGy8wbGxkhTq26xRHF aeYP0tDrwcwXLIm3mV8NNtU/V0dvPG9ivuI5W9QlKlu3IhMrd+PElUWOE143dYkV8Z42 JNgg== X-Gm-Message-State: AOJu0Yxy5LASzk02lv6UwW38IIdsZ4gtNwoJjH56J70/ZjgHfygpYwpF k17evNAzJbBiH9/XsjopZK3QOOuFjhcvSFdDrV2TwDfNiphTZyysfLqm0VgEX4pTcA== X-Google-Smtp-Source: AGHT+IHLTRfV5xqSpG3pKsb7v4SEypbRxpHwoj8umo+bL4O/kFBsImlE33uhkCtppx/Ky01Nb2+RQA== X-Received: by 2002:a05:600c:4713:b0:412:616d:cb with SMTP id v19-20020a05600c471300b00412616d00cbmr1634447wmo.0.1708289958240; Sun, 18 Feb 2024 12:59:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 12:59:17 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 20:59:04 +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 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 20:59:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60528 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 E4F3927BBEA; Sun, 18 Feb 2024 21:01:37 +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 6BFD727BBE9 for ; Sun, 18 Feb 2024 21:01:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rboHR-0007XT-Mu; Sun, 18 Feb 2024 16:00:57 -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 1rboHJ-0007T5-7p for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:50 -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 1rboHD-0004yK-Rv for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rboHY-0002kx-FT for guix-patches@gnu.org; Sun, 18 Feb 2024 16:01:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH v2 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 21:01: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.170829005510502 (code B ref 69238); Sun, 18 Feb 2024 21:01:04 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 21:00:55 +0000 Received: from localhost ([127.0.0.1]:38597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHO-0002jE-Rp for submit@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:55 -0500 Received: from mail-wm1-f50.google.com ([209.85.128.50]:46200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHF-0002hf-BR for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:46 -0500 Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-412605d6723so7736445e9.0 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 13:00:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708289959; x=1708894759; 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=i7RoK29lFQUfxkk6fdbNb/wcxqzKhfu5IecFC1kPIavUdvx6cOQ5Y+Vb/gTVj2nCVx rOhBOo7K8R+HJGOYD2aJ4Fs99+djnfrt0s4VCZ96yNnY8M03OX0mKZYKYiR9UKJbT+fs QCPq+CDmxgrl5Ob1veJOtvowYaIeo2JA3szijUGpV6cHzkDO1j5pAhyI4CI3NmcWoBfG n+wdPEWsrE3cxFShnULbMP02XsILMwR6wMyTIiBW/ypD8JyQxAStBf0ZelRiVAFf3rnY NSHO+Tf3hwsmXNaJipf8luvUV0qSkSGKxMDE8a16f0sU2CDOtMkEwsj6yALfFwNADEB+ vdxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708289959; x=1708894759; 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=ZiMhZXZOlFQANIboIYu1qbfNRMBel/XapS2Utx0CaMsY/2z7WNml5JwfiQK06cJc06 TjeLHOHxqGA3NRZqrIqCFVggp1L5HUdv18R0KKyesoEoJQcG9QFGqasVvzLyJ51MKa8f jy9cyAiad57J12Gge5kTx0ocoveowX/BVLHsGZGT9JJ3ahsciSHiQvonW2qs+czV3OgR fpJ9XXvsi3Zfr5249OHy/2PlI/32Yk0cpmoNdfh+WzdozvqGZyC0AGK903Fcg4qZWz1S yhnPFjiaSdeD9Snc8VmvIUCkzMZo1RMvgexxpDYSQzGTKnGfdD7RXgk0hyaxYBlZUVmC 9Y1w== X-Gm-Message-State: AOJu0Yz2knyX+4QOTd3krTOd+8Amrg3VoU2/99xxw7pU/gD8IGmaX3wZ W6nP6QK/6IImTRNgObdp06mNdNyFjMTO9f++SJHVrr8HZqF8XLJ60HWQueuf+ZFdGg== X-Google-Smtp-Source: AGHT+IFoMaCVs8UjQqLDIsQGmmIa7M4WVL2thOqXiCewoxrN7CgndwpaKuLjLYEN+KfV7dv0D1AgAA== X-Received: by 2002:a7b:cd8a:0:b0:412:a6b:d572 with SMTP id y10-20020a7bcd8a000000b004120a6bd572mr7304975wmj.34.1708289958925; Sun, 18 Feb 2024 12:59:18 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 12:59:18 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 20:59:05 +0000 Message-ID: <371be67cbd9e1ffa67cad96384e9e93c2b7d7265.1708289807.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-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 20:59:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60531 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 ECA9B27BBEA; Sun, 18 Feb 2024 21:01: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 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 1C11327BBE2 for ; Sun, 18 Feb 2024 21:01:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rboHO-0007WV-JI; 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 1rboHJ-0007T8-8L for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:50 -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 1rboHF-0004yO-48 for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rboHZ-0002lK-Mn for guix-patches@gnu.org; Sun, 18 Feb 2024 16:01:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH v2 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 21:01: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.170829005710526 (code B ref 69238); Sun, 18 Feb 2024 21:01:05 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 21:00:57 +0000 Received: from localhost ([127.0.0.1]:38603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHQ-0002jb-8x for submit@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:57 -0500 Received: from mail-wm1-f48.google.com ([209.85.128.48]:49390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHF-0002hg-UB for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:47 -0500 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-41264eca78bso2803595e9.2 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 13:00:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708289959; x=1708894759; 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=6nERXom9v31NzGcc7HU/7LwGzuoEbo3uQ5hOEbPKryQ=; b=IfugIsy8lfmu5IcTSp0KVlZ4jWnu9OE7DZnqDG6qbGakJ4/guvuGtexzZYusSAuMP1 Tr/a5r+c6utLl9YmRLNd6EnH2ama0PCtCHi1wLbsy8pV9M2SEqr9ITzOEpGpKWVxVzkN jX24dGYznao6fHansQnhA7EUDpSU5M70jC8jYII4eiEMe2WOUkHhn/sRPAL0I8tO4dnq eoHVkH12q8QZRc1XBqdfAo2tgUZJZ8dtzvrNbhPzupoYGty24irUDgDMocJH4gLOL5PW mN+nZGLsp2QsHIltaIGG62JWjG68tkNW3QSGGnf96rvG/l2CxKEcF1KUHX5uMBs2dAmE 4IVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708289959; x=1708894759; 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=6nERXom9v31NzGcc7HU/7LwGzuoEbo3uQ5hOEbPKryQ=; b=tdco35+Cu63d5CI8CaOsXsYp0OLTV/yFzwjBG6dk/V/F1phlE0EA3A3xmJFqmmhC8Z G2WhrG1adDTlekg0XA7551izt/WwSqnL9lhwsB1Y1XORVcRvQUlsDAdCIOyeLu4hRsFf JF/oClK5FisBTVDuo3GFohrKLOFlE2e/tqwaVCRF9ZTexQWo1hbQyYN35KxVwAc4/O1q ik3LBvVAe209ywRIWbmTI6h4gWNyYCSBdtS5IbnBZKZIsBtQ3QRt3s9xj7lBoBM0Rt2v dBjijSF256SZUm9qK7UsdKjzY2Q0Z2ROFO+JrTZfn2vOpKAFZYq+uhzxUxs81ojIeaFE /Zug== X-Gm-Message-State: AOJu0YwCmSPpcxWrNTwdxRaee534fG5hTaluxgQhVZkb472XStgxrAYD CwqwRBwKBmxbchLPw5o384XzyncnsdicEnuAPz9S2FTUoEZ+01WUIM6Ea5BODx5cPA== X-Google-Smtp-Source: AGHT+IG18NUPd8E+JbJ/ckaSnrEcyeQwsR7Oq6kSNQQMFf4RceO4TXXmwXyvjZPrSuPzQzvuFz48rQ== X-Received: by 2002:a05:600c:45c7:b0:412:63fc:1c4b with SMTP id s7-20020a05600c45c700b0041263fc1c4bmr1299886wmo.10.1708289959646; Sun, 18 Feb 2024 12:59:19 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 12:59:19 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 20:59:06 +0000 Message-ID: <21cdd9d73e2bfa79a1df93884b617fded0619d8f.1708289807.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-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 59d0df0781..51f1c4d954 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8953,32 +8953,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 afef900bbb..a7ac89b7d9 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 20:59:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60532 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 E9F0E27BBEA; Sun, 18 Feb 2024 21:01:46 +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 6B50727BBE2 for ; Sun, 18 Feb 2024 21:01:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rboHR-0007XU-Tg; Sun, 18 Feb 2024 16:00:57 -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 1rboHJ-0007T9-8u for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:50 -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 1rboHE-0004yM-KT for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rboHZ-0002lC-9Z for guix-patches@gnu.org; Sun, 18 Feb 2024 16:01:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH v2 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 21:01: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.170829005610518 (code B ref 69238); Sun, 18 Feb 2024 21:01:05 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 21:00:56 +0000 Received: from localhost ([127.0.0.1]:38601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHP-0002jV-SV for submit@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:56 -0500 Received: from mail-wm1-f54.google.com ([209.85.128.54]:53277) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHG-0002hi-KU for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:47 -0500 Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-412641511beso3289355e9.2 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 13:00:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708289960; x=1708894760; 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=XYqaI4XoiMnn1C7ltpT43MFtw6GfCkG+8gZzXM+gUHB4v9Obqtr8BlVHrKMDQRc13A 8qS6vNim+7Oe+UwYc+tKv7xRfAJtInTVeZTUv+BbEj+J/x0hxRAmgN5vSpoCjrX7mfsH Gvusa+p3Z0Za3IhXoosM2b2RQhSNpp+k5e/UdW3c4TLiKZPdFZZ4OuTokVt3/s6iymam LvWvV14dMHkZTW1tsnz1QrzbyLaa82s6kuIEINrwXuXIc7TS/RYdP9uke7aYWswy+/JA AP2SqDh/SxFJ/k7BQxnx9Bo+dGTfFpd+Nq1rafD3gTWodnaXexo2ZXkgAajwK3QdYG5n CARQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708289960; x=1708894760; 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=NURkyM796YhJAeXJk4y5nL2MFW2E/fJkDQRX5dsHkI7zIVvnBsUkaomue0Lw1UJw/Z UnJ5ywEzSh033VvIRZuG9Mpf1Q1YC/tcJ+83g2QaAq/pHvG3tyE4thANlZB5xeithA1v dA3VhPCJq/qT4uFL2NVQagced5IeRQ5qnGWw7FrGtdqoGBCcuCnOfyJFwt3m2AD2Gvsc PhZUlQ2OEmMVc3knoc8t8NeDIRkMUb9t89V4axQJfsZYMJR/wJ5bn0yDz0phv9DeZIk3 w6gLvtDMnJz7zrQVvXFXLwNa/MRSt/5wmQs4SUzUCOoZykIeb3HI8ByL9x0F/F8EFW6j Zk4w== X-Gm-Message-State: AOJu0Ywi5fe5kKBWAXke+okneYKS/GGsPvnT1eiOTBJ0uvJleTancnu6 /ooPq8ynGpFQRwkSudGVMocxgB29jAQomaSXJnpY0EH96PjVsStCuhUqToHaDD6igg== X-Google-Smtp-Source: AGHT+IFL3YyeZK4CvxoXHR+kONmHxJYI80SuTxfGdsUHY4k+DuqV6fTRHR08GDnRYrjhnkPlhduP/Q== X-Received: by 2002:a05:600c:190b:b0:40f:225:c607 with SMTP id j11-20020a05600c190b00b0040f0225c607mr7467058wmq.14.1708289960303; Sun, 18 Feb 2024 12:59:20 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 12:59:20 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 20:59:07 +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 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 20:59:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60527 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 2960527BBE2; Sun, 18 Feb 2024 21:01:26 +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=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 8A7CF27BBE9 for ; Sun, 18 Feb 2024 21:01:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rboHQ-0007Wm-Ds; Sun, 18 Feb 2024 16:00:56 -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 1rboHJ-0007T4-76 for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:50 -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 1rboHF-0004yP-IM for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rboHa-0002lR-6Y for guix-patches@gnu.org; Sun, 18 Feb 2024 16:01:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH v2 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 21:01: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.170829005710533 (code B ref 69238); Sun, 18 Feb 2024 21:01:06 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 21:00:57 +0000 Received: from localhost ([127.0.0.1]:38605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHR-0002jj-5f for submit@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:57 -0500 Received: from mail-wm1-f45.google.com ([209.85.128.45]:54737) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHH-0002hj-BF for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:48 -0500 Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-40fd72f7125so30754795e9.1 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 13:00:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708289961; x=1708894761; 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=W4+UBPysjOI7aKB3786Y6eN9SYJzpVK2b3IIn4h/0l4=; b=Ddwtr6jRwveyF1fv/b+RES9a5lEluglXG74IlLkqQvT/LSWP383JtlMGNib7SIMaWA bxp7BJYsZ4SFvpcoRUdIdsaQSgL2prtlaNiGK+Okq/vXtNa6LU6fUNXohWOTn86Av+4h Ht/mUbZ9mPlE5q7O3kQK9hwkUmPua8qu0cWGWaHPe1SrVaByVKO6rfcdi1Ro3HbQlB7d YkTFXPtuISTmogebe10Sqs5pWkHu0gd4fTjz34VbgBMqlu4sGDiA9Ra9+Xxwp2o39iMx q3D3TnIS2eHHhsHxB56Hv2STWWgDDx7d5Rnlx+DYcf7WEhN49e6chpCUf2GJOPtvyXjr qYBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708289961; x=1708894761; 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=W4+UBPysjOI7aKB3786Y6eN9SYJzpVK2b3IIn4h/0l4=; b=ROuU/UtjkxPthqU+B/afthTOz9Nlf5YFi30g4K7ljVMhoJyQpAxzQHAd1iByzO1Ku6 +LXrlnvP5+S8Cx9gtW5ZXayTfEJH43pXmiQp+MNZIzhoJ4wsDHUlAfezzy6v2f6dwjbf kdgx7thiWMzHjnhsS39pNWpwbOXIZyCLXHamO+aZC7G+BLlpvSekVyXP7aBrFWlD4Y4n 6Aqc6GmCIV1nmFlrtMPK/mtSo6PwKr+HFhy4y2FE5FRzuIbpGPis6TCnMVn7BZBitF7z 0M2h4MtVVKMQBubXroFNoCwYLQ0tQoHlARXh64y25BsUK87D3pVWZYGS1t2kxuSMCvT4 AsSQ== X-Gm-Message-State: AOJu0YyI5atIC2/DUW68/JdgnNQhyoKTGcem/p3UMQD8plnZFmP5A+OG FJZrCgoikL1qGu/IIuGyM7y7FYxSvC64UQuam8SYjHZGviYv9cME8TNEfmStQ0U4Mw== X-Google-Smtp-Source: AGHT+IF9hqiDbZd6ikKBrQeHyA4DCXRMPARRmDC98Wu+O/ZX3lCYj9T0xW8k0foo+/KafVzghmf5vA== X-Received: by 2002:a05:600c:310c:b0:412:65e3:f3f2 with SMTP id g12-20020a05600c310c00b0041265e3f3f2mr627704wmo.2.1708289961016; Sun, 18 Feb 2024 12:59:21 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 12:59:20 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 20:59:08 +0000 Message-ID: <45099e5bde4bea700ce44d91bb73d228d0f94297.1708289807.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/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 a7ac89b7d9..242c2bf093 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 20:59:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60524 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 6C8F927BBE9; Sun, 18 Feb 2024 21:01:09 +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=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 888FE27BBE2 for ; Sun, 18 Feb 2024 21:01:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rboHQ-0007Wx-Vs; Sun, 18 Feb 2024 16:00:57 -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 1rboHJ-0007T6-8G for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:50 -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 1rboHF-0004yQ-VU for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rboHa-0002lY-K4 for guix-patches@gnu.org; Sun, 18 Feb 2024 16:01:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH v2 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 21:01: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.170829005810540 (code B ref 69238); Sun, 18 Feb 2024 21:01:06 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 21:00:58 +0000 Received: from localhost ([127.0.0.1]:38607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHR-0002jq-LA for submit@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:58 -0500 Received: from mail-wm1-f52.google.com ([209.85.128.52]:59903) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHI-0002hl-3Z for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:52 -0500 Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-41267d9d6faso120215e9.3 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 13:00:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708289962; x=1708894762; 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=0MGqrtWOuZgh/f6TC/v9dDzvfmVs8j06Xq4kAxI+mBQ=; b=DSh+/CrOUq2L9VjA6xRBtjXKpuq079LrvAxbB9GuCy378lvlSlgqZbsg7JPCLZLb+p YURSbyQgmlHlhJDUN7FDLgzJ/YGnwTJgQI19l+2XvRYxpcBpJOXtaW4E1kZ9uwLl8yBL IwROAcxbUEaiI1B8Ri2dCd3OV2RmM/WOk4eTb2wGpG5TPiFdY1iodU4/4Y3D7jQO056W RpGbCb5/+g47Ppb5sGfOy7P7l5PS44QuXnmt3zSrhbVXRkOtFUVuFW/8/KYOlcUEDp/0 FxjWBUKDkSWhIvvuHRtNjUII+9je55wtc9SR0TcEpp22hNGDTJP53BwvyLtUPIaa/jHW B2yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708289962; x=1708894762; 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=0MGqrtWOuZgh/f6TC/v9dDzvfmVs8j06Xq4kAxI+mBQ=; b=e43wEWmVDBwC0fwLkTYPLsB/XTFeij5aCc/f8+gyOGuvaCkAKJnebiI0Sz/gBCaYAf Zrz8wnfVJX0J8e9RWrJAm20i28Ou0iTGuRbfRVdHDmsqKINGbH74uVAyLyuFuNG8Dici ojVgcywiOTkKg3qyl4EeE8qbERnhqxOWRYOr/pYVhxB/3uurWCE5jUOqOsYtI1vO532L z69cUbsNcS3Y4zyYma+n9CpjnOpfEytGCV3IsXJQYQLhsBRj7rq7JMdXIKUiKmICmpDv JwH4lC0chiwddD1HQbCuJMg1atSTBFw0fsyVzbu7ZvARZKt4fc/XX5g1CcOgk/bmqSJ9 x3oQ== X-Gm-Message-State: AOJu0YwAcTMonBrgaRyazIIw7CEj34cycOIroB8cacySi85on8VdrOua Rdh85/rJmP6Rs4HhKwMamaHLgyJo2Yia9LNIrGXpkjMy+rnYIMXTd6D8dugnUgLyjg== X-Google-Smtp-Source: AGHT+IHOc0cGSNz4qct7KpKKr5N9qFigqJX8w4GbH4fH8purpMArmvOKeyB7DIKEPOUy+licN2w/gQ== X-Received: by 2002:a05:600c:458d:b0:412:6404:45d2 with SMTP id r13-20020a05600c458d00b00412640445d2mr1205565wmo.28.1708289961767; Sun, 18 Feb 2024 12:59:21 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 12:59:21 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 20:59:09 +0000 Message-ID: <03988e68eab5fd487fccaaae2f1fae4e46e9b9c3.1708289807.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 242c2bf093..3c43effbd1 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