From patchwork Mon Apr 1 10:43:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62422 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 A400A27BBEC; Mon, 1 Apr 2024 11:44:28 +0100 (BST) 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, 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 9467227BBEA for ; Mon, 1 Apr 2024 11:44:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrF8z-0006q0-1X; Mon, 01 Apr 2024 06:44:01 -0400 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 1rrF8x-0006pV-C4 for guix-patches@gnu.org; Mon, 01 Apr 2024 06:43:59 -0400 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 1rrF8x-0002Jx-3o for guix-patches@gnu.org; Mon, 01 Apr 2024 06:43:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrF90-0005rg-3i for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70123] [PATCH 01/12] gnu: Add go-github-com-pierrec-cmdflag. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 10:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70123@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 70123-submit@debbugs.gnu.org id=B70123.171196824022504 (code B ref 70123); Mon, 01 Apr 2024 10:44:02 +0000 Received: (at 70123) by debbugs.gnu.org; 1 Apr 2024 10:44:00 +0000 Received: from localhost ([127.0.0.1]:49647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF8x-0005qt-K8 for submit@debbugs.gnu.org; Mon, 01 Apr 2024 06:43:59 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:60563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF8v-0005qL-GW for 70123@debbugs.gnu.org; Mon, 01 Apr 2024 06:43:57 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-415515178ceso15388175e9.0 for <70123@debbugs.gnu.org>; Mon, 01 Apr 2024 03:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711968228; x=1712573028; 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=kNxOHLnT4LAMXCjeAPNGcvcBe2hKf/7XWFLLASYCY9w=; b=KE2xLS3rlkeRmPGDrKTMEzTCz9hDqPwbp5bR5YzdKsPPyX6Ey4l8rL8+OgpiSL2El6 7OBKJ+VWfgnzdZbk1dj1DKspn+0OBO0VYwS4VULwEJTGaLekvCRU+foH/CBJMQFCZDg2 fah7ecvgAIMHCsW9DLh06zhcls8NyWF7dWy2/guvp+1s32wScLZTUM4NCNb/ebPgNWVq zYltWI1ai9j5UCod58Bn9V8Qd5yxZ+zWdjzekZdiYK0OVI+gPiiLHHZdQv8NY6CWvpcP 4i94GkLAlv0xhiDsAj55XRBi7+lIngSXa7rNgkI5b5yUJ5Vfz0y7ghqAjIYTUjfgd3cd LuJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711968228; x=1712573028; 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=kNxOHLnT4LAMXCjeAPNGcvcBe2hKf/7XWFLLASYCY9w=; b=mx24aTr+qShaqeg4BoFy+BPRFY7BGQ8l5K89/9L0xj2W5pmBJQ7myu+R9EJYxf7S2v 3M7fcAuWC5XapuJeGCQGkRFKbFcDUc07SH1TsLCHY+adjLqJo8liY72PWkHKV7V9KKSU rKJ/XoYonZBN3P2EpbJJpEYrbAQDAFmJlOpAq/TFO+IksaVaVuSBhRf3BQhH86sb30M9 lr8xOb++5FA2zVBYOKMXMhnSeoN9eelbTyWMH5uL3/mppi4z6Qt7aO+eSeAL0dcHyvXA azH57RidDaz5z9D4ehQYxUKFvz3I7MoCKofbSJhQe7ZWfx5ybYB8Ql9qNdNKmflCv8Hd 90Ig== X-Gm-Message-State: AOJu0YywccLK9OAdZOlPwo1BpDpK10rLHaAWsX5F3UdtFd+AKY+s1pr7 qGIHIyM18dJ1by66kIni3wpn4LL5s3ubvbNjDuoC6e0FhgBKCEKMBTJEP2Qp1rI= X-Google-Smtp-Source: AGHT+IEKajx+5fsCQ4TOivL65sgzkI39bNCi0LRi38PhI6zBeBw9YM/8C2wZOpg3kdQkNShvLR8Otg== X-Received: by 2002:a05:600c:1913:b0:414:63da:a347 with SMTP id j19-20020a05600c191300b0041463daa347mr5213853wmq.19.1711968228087; Mon, 01 Apr 2024 03:43:48 -0700 (PDT) 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 iv16-20020a05600c549000b004146a1bf590sm17468404wmb.32.2024.04.01.03.43.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 03:43:47 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 1 Apr 2024 11:43:31 +0100 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-pierrec-cmdflag): New variable. Change-Id: If57b49b0497b622200dc82bbb921461c739ead29 --- gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index e1ac32273c..7fe750f59e 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1897,6 +1897,30 @@ (define-public go-github-com-orisano-pixelmatch included in this package.") (license license:expat))) +(define-public go-github-com-pierrec-cmdflag + (package + (name "go-github-com-pierrec-cmdflag") + (version "0.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pierrec/cmdflag") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nxmqkjwd7i3blmspvxib352vm6167h2ffqy4m9zc3fb9srvrpqc")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/pierrec/cmdflag")) + (home-page "https://github.com/pierrec/cmdflag") + (synopsis "Augment the flag package with commands") + (description + "Package @code{cmdflag} provides simple command line commands processing +on top of the standard library @code{flag} package.") + (license license:bsd-3))) + (define-public go-github-com-prometheus-client-model (let ((commit "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016") (revision "2")) From patchwork Mon Apr 1 10:43:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62424 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 9809A27BBEA; Mon, 1 Apr 2024 11:44:40 +0100 (BST) 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, 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 8CC6A27BBE2 for ; Mon, 1 Apr 2024 11:44:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrF90-0006qe-OV; Mon, 01 Apr 2024 06:44:02 -0400 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 1rrF8z-0006qA-Pz for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:01 -0400 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 1rrF8z-0002Mb-Hr for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrF92-0005sQ-Fj for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70123] [PATCH 02/12] gnu: Add go-github-com-go-logr-logr. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 10:44:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70123@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 70123-submit@debbugs.gnu.org id=B70123.171196824222546 (code B ref 70123); Mon, 01 Apr 2024 10:44:04 +0000 Received: (at 70123) by debbugs.gnu.org; 1 Apr 2024 10:44:02 +0000 Received: from localhost ([127.0.0.1]:49652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF8z-0005rV-BK for submit@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:01 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:49637) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF8v-0005qN-TU for 70123@debbugs.gnu.org; Mon, 01 Apr 2024 06:43:59 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4156c8f787eso981415e9.3 for <70123@debbugs.gnu.org>; Mon, 01 Apr 2024 03:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711968229; x=1712573029; 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=erZAWSPDHy/2zWwTnI5uxdHLQzxkNRabaRUxOHu39ws=; b=eFEJNVnmsuhLPivT8PJbaT2OaHDNz48WrZiDghYpekh1cErGYh2UmU5vX8K/kqwxi6 qYBLxZV31LjukpwdfsnOi2G2JRoGJYqI7W43dgfxBTEFf6IAdiQ8YJmf+OZpXnS9adzC rDXEdKi4M0mQpo0jzNtofshDvYFZILdHOy2V46GqlCfl+sX5/0aaEZ0+UTTTNkOHdOA+ aL/O8DAecS3m0YzKXSeChSMIHct4N4Pi2T6BSPD22e6i0Zb3nGpdcpRe5G47uimZyd2g ACutX/16FZbFSkZSRDfyVlkA6X3qJhJ5E4s14b4ydlSPu85X+TDfScAk2LPgBQ1xYqbE q/Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711968229; x=1712573029; 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=erZAWSPDHy/2zWwTnI5uxdHLQzxkNRabaRUxOHu39ws=; b=v4Cp/gPo3DCxJ/QULXWh5W1jtRGvuSr++Bv6gdbOviYMxY65IEOi2sphOtbYTkf2U1 Op0fPzWJCoeEuWftcAk9aSGbWfddxg0JQUs5TCcx9mBpTKxnNXmW6sBQhdEYyKGg89nr 40ECXbZxTvMNxEiDwaM1I3b1PvdBqPTC9Z2YtghTEeL25XzE5SCUXDF5D1/ArXkr2+ND xShbDlSJH4gv2sx8zhvCEajaglW2o4HYrkl7miDhDoC7Rm84AOqz9enSgOXseaenp10b goVUTA35wzIh2efdipfVdovYHzxCZIvJOLkG3WlhzxLSWDs1rfrD+C5PfhH/HuSOk95A PZFg== X-Gm-Message-State: AOJu0YzGupJgx5oJIXOYQptYROmXag1fwbVV84zmwCdv5L7vCXpW8Mai YNfiAwDj0H3/SU2XFHpRat3PJMMcXl4gGq7nVn+j3GjoG+Y4spgDcQxB+kHHTb4= X-Google-Smtp-Source: AGHT+IFjkiSJgfOX6wXicj+0DbUAgZMYQVxzNoZwyEY3CJo1fMYyvRr/+1jcFJSzCjpMWotFlHKnKQ== X-Received: by 2002:a05:600c:1d03:b0:415:6808:c61d with SMTP id l3-20020a05600c1d0300b004156808c61dmr992188wms.9.1711968228805; Mon, 01 Apr 2024 03:43:48 -0700 (PDT) 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 iv16-20020a05600c549000b004146a1bf590sm17468404wmb.32.2024.04.01.03.43.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 03:43:48 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 1 Apr 2024 11:43:32 +0100 Message-ID: <97358ea269b64b849a17d7cc361a784c74f57941.1711915492.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-go-logr-logr): New variable. Change-Id: I0fe5e817fa653bcdbe2fea03fe5d608ea270fa12 --- gnu/packages/golang-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 7fe750f59e..1bf296bda0 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -991,6 +991,42 @@ (define-public go-github-com-gabriel-vasile-mimetype @end itemize") (license license:expat))) +(define-public go-github-com-go-logr-logr + (package + (name "go-github-com-go-logr-logr") + (version "1.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-logr/logr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0x0q9jkk2p5pz4lii1qs8ifnsib4ib5s8pigmjwdmagl976g8nhm")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.18 + #:import-path "github.com/go-logr/logr" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-examples-and-benchmarks + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/examples")) + (delete-file-recursively + (string-append "src/" import-path "/funcr/example")) + (delete-file-recursively + (string-append "src/" import-path "/benchmark"))))))) + (home-page "https://github.com/go-logr/logr") + (synopsis "Minimal logging API for Go") + (description + "Package @code{logr} defines a general-purpose logging API and abstract +interfaces to back that API. Packages in the Go ecosystem can depend on it, +while callers can implement logging with whatever backend is appropriate.") + (license license:asl2.0))) + (define-public go-github-com-hashicorp-errwrap (package (name "go-github-com-hashicorp-errwrap") From patchwork Mon Apr 1 10:43:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62425 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 AD19D27BBE9; Mon, 1 Apr 2024 11:44:46 +0100 (BST) 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, 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 8DD2927BBE2 for ; Mon, 1 Apr 2024 11:44:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrF8z-0006q9-D4; Mon, 01 Apr 2024 06:44:01 -0400 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 1rrF8y-0006pj-KI for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:00 -0400 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 1rrF8y-0002Kp-CI for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrF91-0005s1-By for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70123] [PATCH 03/12] gnu: Add go-github-com-onsi-ginkgo-v2. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 10:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70123@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 70123-submit@debbugs.gnu.org id=B70123.171196824022517 (code B ref 70123); Mon, 01 Apr 2024 10:44:03 +0000 Received: (at 70123) by debbugs.gnu.org; 1 Apr 2024 10:44:00 +0000 Received: from localhost ([127.0.0.1]:49649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF8x-0005qv-Vm for submit@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:00 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:52470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF8w-0005qO-FG for 70123@debbugs.gnu.org; Mon, 01 Apr 2024 06:43:58 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-415644aca59so5914735e9.0 for <70123@debbugs.gnu.org>; Mon, 01 Apr 2024 03:43:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711968229; x=1712573029; 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=K7QeFyQVdeWRrcdiU6jwjWU1EFZvvJVhQYTq/EmJxAM=; b=K7mmcSBUFz6JBkrIWVjEExFpyix+TFtBhwowzoXLHXAbLi2VgT1SzI7Jj4fyOJQz+o blQmIkme6A6XAz/5uKO8xyLvWDMNcEMEFeQhLBlMkC3IFcVvuI3EBc5tnup+138H3dre Bv4WGVTNado+wXrLnKtd5YK0dj/JOgjVNnNNp66ex1u0Ua+YAuzekTLyZBTVxHwMDtTh 3oCDk8989i81ZByJDG0m7yv2I87jx5iQ9MzuPWQ/Ykijm/dYTLd+VQs+el43rfjRbZS6 HlqKXh6yVyd2uT2a5qEf1+RpS69Vmpc4qz5un34h2d6kFGlcnYhkTHtSbdiyz+3tCpOP fNTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711968229; x=1712573029; 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=K7QeFyQVdeWRrcdiU6jwjWU1EFZvvJVhQYTq/EmJxAM=; b=j8EwKLXSWJRxZTKUKSYd7GSEfwgbyYxbNHCuK+pigl0qNZa/kYWL5WTiMr1a23e0ln c3LlTYZfYkFwvYf1AOPrDKmFUSDTY3c0kVmwQOPb/c33IZ1PRirBvxok76D5OZTc7Xsw DSdzZBRNdEwaZ7ko1/fsKNRtd2mBl0y8C4qaTwOVu0r8DB/WOWEQDoCNChJfiwds3s0q orJAEwVGL+DVVKuOIaLWF3G91qqiZVF2d5He6z7InaAPpogmxbTVGjoagMeo9sIRs7c+ Q/bdR6zIhhhPWbhRw889MyCpWlfKtzRb6jXhuZwE6LUlEZyTx0LuiPDukckxDEz8rVP0 5yIw== X-Gm-Message-State: AOJu0YyR50qw6QnqAQeL6jpIMCGANXo1eaBINQ1zEhaI2tQ2yZ5dFY55 lSK50K/2ffaPn/LlYCtemUj6klibdeXTDxqQAXEM5IKh8D6hAuq74L8oey8EGic= X-Google-Smtp-Source: AGHT+IF+XWqeXNm3DqlR30LHIQxqMhq0ciJPKlh3SXV4zbKV9KNgsKXRuqZpYvE52EGTxO+zKBcNxQ== X-Received: by 2002:a05:600c:5494:b0:414:24d:7f9 with SMTP id iv20-20020a05600c549400b00414024d07f9mr7790680wmb.1.1711968229558; Mon, 01 Apr 2024 03:43:49 -0700 (PDT) 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 iv16-20020a05600c549000b004146a1bf590sm17468404wmb.32.2024.04.01.03.43.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 03:43:49 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 1 Apr 2024 11:43:33 +0100 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-onsi-ginkgo-v2): New variable. Change-Id: Ied8167b850d5e5262713d0858ef7160d5c3d74c2 --- gnu/packages/golang-check.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 1558536182..6f36615ab0 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -460,6 +460,33 @@ (define-public go-github-com-onsi-ginkgo Gomega matcher library.") (license license:expat))) +(define-public go-github-com-onsi-ginkgo-v2 + (package + (inherit go-github-com-onsi-ginkgo) + (name "go-github-com-onsi-ginkgo-v2") + (version "2.17.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/onsi/ginkgo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "089x6pz5563ldbxiwaqvd2g4dqfzlr25dflmas3gfq51ibwzh4vz")))) + (arguments + (list + #:go go-1.20 + #:import-path "github.com/onsi/ginkgo/v2")) + (propagated-inputs + (list go-github-com-go-logr-logr + ;; go-github-com-google-pprof ; not packed yet in Guix, for profiling + go-github-com-onsi-gomega + go-github-com-go-task-slim-sprig + go-golang-org-x-net + go-golang-org-x-sys + go-golang-org-x-tools)))) + (define-public go-github-com-prashantv-gostub (package (name "go-github-com-prashantv-gostub") From patchwork Mon Apr 1 10:43:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62429 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 1C6F127BBEA; Mon, 1 Apr 2024 11:44:57 +0100 (BST) 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, 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 12A9527BBE2 for ; Mon, 1 Apr 2024 11:44:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrF92-0006rZ-CC; Mon, 01 Apr 2024 06:44:04 -0400 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 1rrF90-0006qX-Bl for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:02 -0400 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 1rrF90-0002Mr-3i for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrF93-0005sk-4c for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70123] [PATCH 04/12] gnu: Add go-code-cloudfoundry-org-bytefmt. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 10:44:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70123@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 70123-submit@debbugs.gnu.org id=B70123.171196824322585 (code B ref 70123); Mon, 01 Apr 2024 10:44:05 +0000 Received: (at 70123) by debbugs.gnu.org; 1 Apr 2024 10:44:03 +0000 Received: from localhost ([127.0.0.1]:49656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF90-0005rb-0e for submit@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:03 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:42473) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF8x-0005qR-GP for 70123@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:00 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-33ddd1624beso2418720f8f.1 for <70123@debbugs.gnu.org>; Mon, 01 Apr 2024 03:43:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711968230; x=1712573030; 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=t3nqoUhoW0JCLNU5kY1rIFjI6VLWKvXD4C1C3G9ivU0=; b=VWQc9va7yZzgfghHUnUzGdv70h4GyCQ+tsifzPq33UKYs9RZlySg2FeA9eI6Opcv4r xM2nMAlajKSS8ww2svXpbv/OeY+LSpCq0xpjHMY71rwTwEcO7tiVk2uzp/lr9JBYPOjl Ni9Nz+UpBH7dsP6ImMoLDtmD0cLuz5kyiLiu7RY9EfoDbYqAoNv/s2jpWpbH8JQuSlcd f8NBHDLLYuWlc0sFkchLm3oQSaxnElZBal61393y8y2nGn4ojYUecGJZwtrGuVExAqcv 9w9tH4jLLvK2PUV1HdRrpWxIcaXs3CqrJiWMoEPi1vP5XLAgwigNT4pNbtdzsM6BgMs5 Tvng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711968230; x=1712573030; 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=t3nqoUhoW0JCLNU5kY1rIFjI6VLWKvXD4C1C3G9ivU0=; b=h0vCh3wst10TmSHnQOWz+/KVG8sEoPIQA9TftrOUE/XNaFwApF0hDTzML13rU9gouS imtQ6WdjbH+ZNM3q8wK5572WYjMSlNB3wlfLF3zj04j3xzaKQhokQTLawDq30w1L62SK /68I6yHiBxfY3lQt2ILInUOS3ytkGSztZkYC9f8sUH/7J74XkHPQzWYJJCi6yDWsyMuq ncuAITN3Ei1/3bpV9Wxle3LpHDHKBY4QWl1iCL7aaQimz+naMA3tv6EStE06AhsrY2RL zlZFxpZxDVBUvsuq6vjcZT7QJlSgFN+RVBQmVDKYC1ZH+ZcNXRL0YCeISmY4QbCcHh69 LDzg== X-Gm-Message-State: AOJu0YzEyN/GsaSNJlmLp/DBJl8HXf1s9+GlRRUzIwx/imwIDL6kmOQ4 EGH17nmF6QLXCQ+T3Ih7LHuYckmriU+7NWZf4jcTGNEsdeD23PQAoFDId0yw3b0= X-Google-Smtp-Source: AGHT+IHAsq4RQ3KD8iuAumiHSezdoOPB6NrzL0pwboa36lIIOnvCIyskJTtCsc/NpjFNY2O6Durg/w== X-Received: by 2002:a05:6000:ca:b0:341:7295:4b8b with SMTP id q10-20020a05600000ca00b0034172954b8bmr10053228wrx.1.1711968230300; Mon, 01 Apr 2024 03:43:50 -0700 (PDT) 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 iv16-20020a05600c549000b004146a1bf590sm17468404wmb.32.2024.04.01.03.43.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 03:43:49 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 1 Apr 2024 11:43:34 +0100 Message-ID: <591a8b84031204265221672d61b8fb5c80bda21e.1711915492.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-code-cloudfoundry-org-bytefmt): New variable. Change-Id: I1d77dd49987ad09b15149f244024831d26780e6e --- gnu/packages/golang-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 1bf296bda0..415233b100 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -68,6 +68,37 @@ (define-module (gnu packages golang-xyz) ;;; Libraries: ;;; +(define-public go-code-cloudfoundry-org-bytefmt + (package + (name "go-code-cloudfoundry-org-bytefmt") + (version "0.0.0-20240329144308-0c372429d24b") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cloudfoundry/bytefmt") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0aqzbiy3idddyj39i7ydkjhnmpcbwr99g094kqiw72m9flrvrnxj")) + (snippet + #~(begin (use-modules (guix build utils)) + (delete-file-recursively "vendor"))))) + (build-system go-build-system) + (arguments + (list + #:go go-1.20 + #:import-path "code.cloudfoundry.org/bytefmt")) + (native-inputs + (list go-github-com-onsi-gomega + go-github-com-onsi-ginkgo-v2)) + (home-page "https://pkg.go.dev/code.cloudfoundry.org/bytefmt") + (synopsis "Human readable byte formatter for Golang") + (description + "Package bytefmt contains helper methods and constants for converting to and from +a human-readable byte format.") + (license license:asl2.0))) + (define-public go-github-com-a8m-envsubst (package (name "go-github-com-a8m-envsubst") From patchwork Mon Apr 1 10:43:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62427 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 6954F27BBF1; Mon, 1 Apr 2024 11:44:55 +0100 (BST) 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, 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 BC3E327BBEA for ; Mon, 1 Apr 2024 11:44:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrF91-0006rC-PM; Mon, 01 Apr 2024 06:44:03 -0400 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 1rrF91-0006qk-50 for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:03 -0400 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 1rrF90-0002N2-Sr for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrF93-0005t6-Tn for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70123] [PATCH 05/12] gnu: Add go-github-com-pierrec-lz4. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 10:44:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70123@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 70123-submit@debbugs.gnu.org id=B70123.171196824422608 (code B ref 70123); Mon, 01 Apr 2024 10:44:05 +0000 Received: (at 70123) by debbugs.gnu.org; 1 Apr 2024 10:44:04 +0000 Received: from localhost ([127.0.0.1]:49662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF91-0005sE-M6 for submit@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:04 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:60739) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF8y-0005qT-40 for 70123@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:00 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4156684ee9cso3532955e9.1 for <70123@debbugs.gnu.org>; Mon, 01 Apr 2024 03:43:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711968231; x=1712573031; 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=Q4Nsc6/dC4WIByEQ1AFy/Z3654zjyratPRYVuh3aquQ=; b=m64nhM8+hCeMPDD5N9XZh3GSI28BLw2bkk9Mj0ZmUdHhMj8S27sczk/xMsPSTZoE3f wcOUir4RVrTxkdB3P+56bSPqj8SAXELyamGpnIBcvTcP+sxB2qB41hrIzMEaFKRS25Yp Ywd2tXRTamjQ/Aa/uNiVH1piGScCkAnlB/K0KGpUhIW453VhRlD4wtJBIzhk7tdea9A0 q5slx6JLGOB/Z/VgIAe2U/a/3T/Jo1rcbuB7rjel/rxbeaqovKS+lIaofEsTV9Olu4qs WQPA95pu8SaJgqZV2pDKg+SF2wgINF0Uks6+Ffj2NlzjinbMmCjt5Sk9f3KjJmjr/5wK UARw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711968231; x=1712573031; 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=Q4Nsc6/dC4WIByEQ1AFy/Z3654zjyratPRYVuh3aquQ=; b=WtFE7FhguA2aHPAhXJXwxr1VyAStHkk6a7SLVvBOfUrk1uljy9xhjQIUur5uWR86lf hsG0rYsBQhVBP66O4bmXE4D0du5CLJVTxIvp2vJ16hDyrC036MjM+KCCM2f6D9P//vBo qI/mTABZr9jfwuc4KkQaGOGGtOGWDL5Z2s4cLVBLyRyXJg/P4ab6z03khH+ihbD2Si4B q9ufXW0d17Oi2jXrRvUdBuXjhEtisXQONA4BaqBcybonSTBbDQmop+x46z3pX8/WhObO U64fYWwYZNKxqYVqSzBQwMyHVgEWldYGWs9hFBjpvGC8HHpt7Z96JuIe0cUVezBFLo9s osGA== X-Gm-Message-State: AOJu0YxqwgWnDnEAK7J3S2akvyBsOh/LXj5kdSEsnT8s9uXAk63+OZjn dpejKiQK/bz1mweeJ2amYlN4BzNOnivGEX6qGrI769lWL7J+g1KuHMlv7ZcM/X8= X-Google-Smtp-Source: AGHT+IGDMRze0H3zEyPs+z7ql63iH15elb67rA3BsQseas4PZZVqPX0BjWYuA3z1rrwcQ6KgihQ8YA== X-Received: by 2002:a05:600c:458b:b0:413:1741:28b5 with SMTP id r11-20020a05600c458b00b00413174128b5mr6822471wmo.9.1711968231062; Mon, 01 Apr 2024 03:43:51 -0700 (PDT) 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 iv16-20020a05600c549000b004146a1bf590sm17468404wmb.32.2024.04.01.03.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 03:43:50 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 1 Apr 2024 11:43:35 +0100 Message-ID: <7280842eb030696a5fe2344766d920b39980385b.1711915492.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-compression.scm (go-github-com-pierrec-lz4, go-github-com-pierrec-lz4-v4, go-lz4c): New variables. Change-Id: Ie337a1cbfbc5af2dfd258999a4edb508bd552e03 --- gnu/packages/golang-compression.scm | 71 ++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm index a1ad00f588..f40664d8f7 100644 --- a/gnu/packages/golang-compression.scm +++ b/gnu/packages/golang-compression.scm @@ -28,7 +28,8 @@ (define-module (gnu packages golang-compression) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) - #:use-module (gnu packages)) + #:use-module (gnu packages) + #:use-module (gnu packages golang-xyz)) ;;; Commentary: ;;; @@ -190,6 +191,52 @@ (define-public go-github-com-nwaples-rardecode-v2 "This package provides a library for reading RAR archives with Golang.") (license license:bsd-2))) +(define-public go-github-com-pierrec-lz4 + (package + (name "go-github-com-pierrec-lz4") + (version "2.6.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pierrec/lz4") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0vfn01gd3hcpbj6gb4ig3pw6bv0g4j5780awr0fv4kf9id8gjvyy")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/pierrec/lz4")) + (home-page "https://github.com/pierrec/lz4") + (synopsis "LZ4 compression in pure Go") + (description + "@code{lz4} provides a streaming interface to +@url{http://fastcompression.blogspot.fr/2013/04/lz4-streaming-format-final.html, +LZ4 data streams} as well as low level compress and uncompress functions for +LZ4 data blocks. The implementation is based on the reference C +@url{https://github.com/lz4/lz4, one}.") + (license license:bsd-3))) + +(define-public go-github-com-pierrec-lz4-v4 + (package + (inherit go-github-com-pierrec-lz4) + (name "go-github-com-pierrec-lz4-v4") + (version "4.1.21") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pierrec/lz4") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nc2aprbw4s6cx2mijaqdswkgnizx8fqb0mzha82wrznl3gz69ni")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/pierrec/lz4/v4")))) + (define-public go-github-com-ulikunitz-xz (package (name "go-github-com-ulikunitz-xz") @@ -216,6 +263,28 @@ (define-public go-github-com-ulikunitz-xz any dependency on any C code.") (license license:bsd-3))) +;;; +;;; Executables: +;;; + +(define-public go-lz4c + (package + (inherit go-github-com-pierrec-lz4-v4) + (name "go-lz4c") + (arguments + (list + #:install-source? #f + #:import-path "github.com/pierrec/lz4/cmd/lz4c" + #:unpack-path "github.com/pierrec/lz4")) + (native-inputs + (list go-code-cloudfoundry-org-bytefmt + go-github-com-pierrec-cmdflag + go-github-com-schollz-progressbar-v3)) + (description + (string-append (package-description go-github-com-pierrec-lz4-v4) + " This package provides an additional command line +interface tool to compress and decompress LZ4 files.")))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar From patchwork Mon Apr 1 10:43:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62428 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 CDB7827BBEA; Mon, 1 Apr 2024 11:44:56 +0100 (BST) 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, 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 0D81227BBEC for ; Mon, 1 Apr 2024 11:44:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrF92-0006s9-OX; Mon, 01 Apr 2024 06:44:04 -0400 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 1rrF91-0006rE-Pt for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:03 -0400 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 1rrF91-0002NY-H1 for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrF94-0005tJ-H5 for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70123] [PATCH 06/12] gnu: go-github-com-schollz-progressbar-v3: Move to golang-xyz. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 10:44:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70123@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 70123-submit@debbugs.gnu.org id=B70123.171196824522633 (code B ref 70123); Mon, 01 Apr 2024 10:44:06 +0000 Received: (at 70123) by debbugs.gnu.org; 1 Apr 2024 10:44:05 +0000 Received: from localhost ([127.0.0.1]:49666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF92-0005sh-Op for submit@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:05 -0400 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]:54641) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF8z-0005qV-8L for 70123@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:02 -0400 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-513d3746950so4805225e87.1 for <70123@debbugs.gnu.org>; Mon, 01 Apr 2024 03:43:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711968232; x=1712573032; 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=qqFh+ecXJHohELuHKjqPU2qAZr+KE7yfYZ84vJg+eR0=; b=C4oiIPUpj+59MMJyDooEdxcp6n0NypZ/Y3KYsrLgQwiIcvl9x8o/pB5xArBSBV67Jv k7s8K7GJM0O3HGt/LIC8v737yn+0ZkY7cAfD/ZZZfInVi6GAzhkjTajv1q+A840AJXLf Zty80FIkqBGLp1cWQGdRCmw9NEZqoXXUksOgoxhHl4SLZisggYh7MVCVFEfp/v+mwSkn B6x1ZNN4z/Z9z1T1iAkjWHTCrA3iavKodXK+uJyecfLi9iCykc+GtqE2k414MP6QGL2a InuxGMHKlGOnEO3wAxSWQtcss3JO1vYNq6Dk9AqHF0DaTL68QOAkdSDlXRXv/IjAYAgk KKlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711968232; x=1712573032; 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=qqFh+ecXJHohELuHKjqPU2qAZr+KE7yfYZ84vJg+eR0=; b=Bt7NtT4VKwmmyWhpm0UkPyrhh7IzWbNRwdjq0w9F+EGcVwlYu4pB9LfF8AeG4BIPgP Gf4iySlZzVLTIkUHU7uoi9gNDG6tJ6uKP4ZM39aGYU1f5BZ85NsAkJFpbBR66Mou6h4B HlOIFqts8vytZE+q5iZ8NdXha1pDG7TsMqp7LNb0Y22qTldZueSf+kAVOtbVCqSVafMK a080bU8dW0MIvsfc0At8ffqK5h84QlBqjKiJQglZ0nKcqH4pmF2DZIWLYkmHNrhghZnK xaN0qQ6PQG50K4M2DCJTB7vF+Rm6OiD7PO9oGke9UxZh57suvTkHw0bvlII0qTUlNiD4 KNAQ== X-Gm-Message-State: AOJu0YzH3oYti2brOgyY1PkfhPMY6V4QYXnvsbdcTkctrdzif44kSKUO TPy0iG2/MykbktOuRL3o3zYW3B0MTTTABni131BALEj6xgVeS18+nh02c4o+p0c= X-Google-Smtp-Source: AGHT+IEI6p4KyznGif+HxQUxZYfdRylYwYcNK0DHcV45o9d6vRBkmdqc2r4bPuWB1JUNzch683X1dQ== X-Received: by 2002:a05:6512:4016:b0:515:b827:8d05 with SMTP id br22-20020a056512401600b00515b8278d05mr6766235lfb.7.1711968231802; Mon, 01 Apr 2024 03:43:51 -0700 (PDT) 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 iv16-20020a05600c549000b004146a1bf590sm17468404wmb.32.2024.04.01.03.43.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 03:43:51 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 1 Apr 2024 11:43:36 +0100 Message-ID: <530d717215631a614f3a485111845b63d8debefb.1711915492.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-schollz-progressbar-v3): Move from here ... * gnu/packages/golang-xyz.scm: ... to here. * gnu/packages/android.scm: Add (gnu packages golang-xyz) module. Change-Id: Id40397b4f3323670847d8e46f5d8fc6ffea61c84 --- gnu/packages/android.scm | 1 + gnu/packages/golang-xyz.scm | 46 +++++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 45 ------------------------------------ 3 files changed, 47 insertions(+), 45 deletions(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 902bc31faf..b6f37732b4 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -50,6 +50,7 @@ (define-module (gnu packages android) #:use-module (gnu packages gcc) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages image) #:use-module (gnu packages java) #:use-module (gnu packages linux) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 415233b100..c62fab949f 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2023 Sergey Trofimov ;;; Copyright © 2023 Thomas Ieong ;;; Copyright © 2023 Timo Wilken ;;; Copyright © 2024 Artyom V. Poptsov @@ -2048,6 +2049,51 @@ (define-public go-github-com-rcrowley-go-metrics (home-page "https://github.com/rcrowley/go-metrics") (license license:bsd-2)))) +(define-public go-github-com-schollz-progressbar-v3 + (package + (name "go-github-com-schollz-progressbar-v3") + (version "3.13.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/schollz/progressbar") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hjahr5r52i7w6iyvl3rpzr46iignhfdh4694fl7m2b4gkaw9gd6")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/schollz/progressbar/v3" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-examples + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/examples")))) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + ;; The full test suite requires Internet access, so only + ;; run the short tests. + (invoke "go" "test" "-test.short" import-path))))))) + (propagated-inputs + (list go-github-com-davecgh-go-spew + go-github-com-mattn-go-isatty + go-github-com-mattn-go-runewidth + go-github-com-mitchellh-colorstring + go-github-com-stretchr-testify + go-golang-org-x-term)) + (home-page "https://github.com/schollz/progressbar") + (synopsis "Simple command-line interface (CLI) progress bar") + (description + "This package provides a very simple thread-safe progress bar. The +@code{progressbar} implements an @code{io.Writer} so it can automatically +detect the number of bytes written to a stream, so you can use it as a +@code{progressbar} for an @code{io.Reader}. When @code{progressbar}'s length +is undetermined, a customizable spinner is shown.") + (license license:expat))) + (define-public go-github-com-shirou-gopsutil (package (name "go-github-com-shirou-gopsutil") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 385da42eda..711c007138 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9640,51 +9640,6 @@ (define-public go-github-com-mitchellh-colorstring "Colorstring provides functions for colorizing strings for terminal output.") (license license:expat))) -(define-public go-github-com-schollz-progressbar-v3 - (package - (name "go-github-com-schollz-progressbar-v3") - (version "3.13.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/schollz/progressbar") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1hjahr5r52i7w6iyvl3rpzr46iignhfdh4694fl7m2b4gkaw9gd6")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/schollz/progressbar/v3" - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'remove-examples - (lambda* (#:key import-path #:allow-other-keys) - (delete-file-recursively - (string-append "src/" import-path "/examples")))) - (replace 'check - (lambda* (#:key tests? import-path #:allow-other-keys) - (when tests? - ;; The full test suite requires Internet access, so only - ;; run the short tests. - (invoke "go" "test" "-test.short" import-path))))))) - (propagated-inputs - (list go-golang-org-x-term - go-github-com-stretchr-testify - go-github-com-mitchellh-colorstring - go-github-com-mattn-go-runewidth - go-github-com-mattn-go-isatty - go-github-com-davecgh-go-spew)) - (home-page "https://github.com/schollz/progressbar") - (synopsis "Simple command-line interface (CLI) progress bar") - (description - "This package provides a very simple thread-safe progress bar. The -@code{progressbar} implements an @code{io.Writer} so it can automatically -detect the number of bytes written to a stream, so you can use it as a -@code{progressbar} for an @code{io.Reader}. When @code{progressbar}'s length -is undetermined, a customizable spinner is shown.") - (license license:expat))) - (define-public go-git-sr-ht-emersion-go-scfg (package (name "go-git-sr-ht-emersion-go-scfg") From patchwork Mon Apr 1 10:43:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62431 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 0D72127BBE2; Mon, 1 Apr 2024 11:45:01 +0100 (BST) 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, 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 4116127BBEB for ; Mon, 1 Apr 2024 11:44:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrF94-0006t6-5n; Mon, 01 Apr 2024 06:44:06 -0400 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 1rrF92-0006rl-EJ for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:04 -0400 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 1rrF92-0002OB-4c for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrF95-0005te-5G for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70123] [PATCH 07/12] gnu: go-github-com-schollz-progressbar-v3: Adjust inputs. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 10:44:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70123@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 70123-submit@debbugs.gnu.org id=B70123.171196824622647 (code B ref 70123); Mon, 01 Apr 2024 10:44:07 +0000 Received: (at 70123) by debbugs.gnu.org; 1 Apr 2024 10:44:06 +0000 Received: from localhost ([127.0.0.1]:49671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF93-0005t2-O4 for submit@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:06 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:58595) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF8z-0005qW-Ea for 70123@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:02 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4156abbcc02so2163065e9.0 for <70123@debbugs.gnu.org>; Mon, 01 Apr 2024 03:43:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711968232; x=1712573032; 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=IOkSsh+dbgJciFAfnIFSb8JYF9ZxwUAFzXf7G3i1QLw=; b=LI6yAwRQPq4QE3xsDFZexWkYaL9vhe9+fLmvn7X31gFg1FXWXPSPpnqMSm+K/zhSFC 1FBAM9poAPCOo0K0rpbz2JXvEFxTHJskA63ng8orQKtCPtp5eBa7GEqgp5TkzIHM6flh 1f6MPmNf3j9/IXWUA54z4PSLFqDud2c0+ok2MjHMV9J/Z07FOdML8g/1iQfYb5pPKiNG XjEs4OXVIUIXL7SuXWCubUJmCy62Gz5uEhC5YG9Pptcz0EGaVyWGpasrFlCeqvTtYbNP Z8sLoZFB+7kZOc7pXG+XMv+bIF/tGjDV6P93eaJxFtgmEGD2xQhWVGZnvFYdmoqFMjCH jp+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711968232; x=1712573032; 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=IOkSsh+dbgJciFAfnIFSb8JYF9ZxwUAFzXf7G3i1QLw=; b=h+8DPzx7YFHkk9+eIepDP2eHiVgfKM1ojkUI6H4cuchkf8H4P9M57u/D5KuvI3MTTH TYd0oLubYh5AFWzkB4ktgrFswfwZR5z2AmRhP/EwNv1Xk8s9EzmzwYpEeFGS0guHPoxA 5ISmsSgGyVBDDlHPNOz+90Z+MCDT0+LHGn1F4yfW9vk/XPG/A+KMHyJxf3gIsbmpc7Jd lsWEMrKMn2IBQGkgud77pjIWI2iKWN7hEmYG73NEN0YfA3awRb8uF5UQL2iZms10UKo5 F8zuuEvzAIC+Y/xgQbhSEPDNUG3a63AS8HxtE6sQpFXXc3WwVaxLavT7ms7Hh/OrieCk kpkg== X-Gm-Message-State: AOJu0Yx4U9ZROHBBqGFVGhX+JizlBwlmbYE23chSPNyLFCFtTB0pHg50 1iBBzMfUCZ/aEMEsKMA0mCgZwjCp9xH/s9GQx7Nhw1YD7bT3GpmcEaR7F7t0/hI= X-Google-Smtp-Source: AGHT+IFro3ccfMYyxHfXehhrPQI729aEhEjlDJo9sxqLxbrY3/1FXGWjsu8pYty8VFA5BzBocjY3Ug== X-Received: by 2002:a05:600c:1913:b0:414:6172:8366 with SMTP id j19-20020a05600c191300b0041461728366mr7589356wmq.15.1711968232564; Mon, 01 Apr 2024 03:43:52 -0700 (PDT) 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 iv16-20020a05600c549000b004146a1bf590sm17468404wmb.32.2024.04.01.03.43.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 03:43:52 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 1 Apr 2024 11:43:37 +0100 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-schollz-progressbar-v3): Adjust inputs. [propagated-inputs]: Remove go-github-com-davecgh-go-spew, go-github-com-mattn-go-isatty, and go-github-com-stretchr-testify. [native-inputs]: Add go-github-com-stretchr-testify. Change-Id: I8a1e24d6570ce36812d08e196f415b81e8ec7bda --- gnu/packages/golang-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index c62fab949f..9b0f67de6f 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -2077,12 +2077,11 @@ (define-public go-github-com-schollz-progressbar-v3 ;; The full test suite requires Internet access, so only ;; run the short tests. (invoke "go" "test" "-test.short" import-path))))))) + (native-inputs + (list go-github-com-stretchr-testify)) (propagated-inputs - (list go-github-com-davecgh-go-spew - go-github-com-mattn-go-isatty - go-github-com-mattn-go-runewidth + (list go-github-com-mattn-go-runewidth go-github-com-mitchellh-colorstring - go-github-com-stretchr-testify go-golang-org-x-term)) (home-page "https://github.com/schollz/progressbar") (synopsis "Simple command-line interface (CLI) progress bar") From patchwork Mon Apr 1 10:43:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62426 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 4E0DC27BBEE; Mon, 1 Apr 2024 11:44:51 +0100 (BST) 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, 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 3A65227BBE2 for ; Mon, 1 Apr 2024 11:44:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrF94-0006t5-0N; Mon, 01 Apr 2024 06:44:06 -0400 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 1rrF92-0006sD-SD for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:04 -0400 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 1rrF92-0002OP-JJ for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrF95-0005ts-L1 for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70123] [PATCH 08/12] gnu: go-github-com-onsi-ginkgo: Refresh package style. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 10:44:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70123@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 70123-submit@debbugs.gnu.org id=B70123.171196824722666 (code B ref 70123); Mon, 01 Apr 2024 10:44:07 +0000 Received: (at 70123) by debbugs.gnu.org; 1 Apr 2024 10:44:07 +0000 Received: from localhost ([127.0.0.1]:49674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF94-0005tF-D2 for submit@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:06 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:42087) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF90-0005qY-79 for 70123@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:03 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4156201223bso4618295e9.0 for <70123@debbugs.gnu.org>; Mon, 01 Apr 2024 03:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711968233; x=1712573033; 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=5NIm1u6slcICN4yfbgBaZMRc9dGJ8csoNlfJiR+AT1U=; b=NMDECj7Ag8edOvGdcdtA9n6+9adUjlrx6gHdcTYD1dngGJokJs3FUk1lkVvHfqcqcy fL//pr07dT2zQVKLQzg6aSUZi/GmMpW/pYflcF4Mb/MTncLOLNYkXMyI+Bb66ZK5Js3b 1TQZv82mimmM2jeheaC6/8YfVWzrJhpd8m8DysDYw0gchJn95/qGnhZddvJOlofF9CHJ B7WgVvcH7ewkiteHKesBEVh2pufkk1lMPOEvKSAu0wyf6hfGPopOl669gxmLYUbvfIxC 6l2/BbTvYafmfQI4apV8zAVkt0HLYWnB++lI8KU/LSd5lolC0itGmGZmDUvWq4AIN5f4 Ss5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711968233; x=1712573033; 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=5NIm1u6slcICN4yfbgBaZMRc9dGJ8csoNlfJiR+AT1U=; b=vqlZDwSswWoF5Gk0XRXyId6/088PhdsUWUGugoniPDmXZaDmaH+pTha8aSy/jyvEsW U6dwL/tjce3W0X5xtKS+sXKejvGEzkthElXA2snxOjg5W02nHrb0O0kIt8m88OIPt2NF i/WAaLGgQvSg+6QdyzrS5vtb1TwLKxagCnxQpRFfbZeSxO9kEVP4dsXpQSGl3ABQGsAt 32tSygkrk3rpM/bp0Qkyyj2trYt48v92KnarXOpzl9mjHBqkoxJOcdlBLaPYYR5ZxXcO dYhf3nhOsBoC76nZ+S+Mr9XZfjemFbiiBMPzrS/ZlcHbgmoct5FMLB9g5jrEt3HjFgBV ppGA== X-Gm-Message-State: AOJu0YwbxFHF7Fo5P9GB95AXaMWCB1uDykAGiGoAe24ui/8FH0rPM5k5 +/7ophsAbIbbdCDLBKKfrtQxUPRuoiAt+kxDhROyAN8KfoMIAjR+M71CT7suMNc= X-Google-Smtp-Source: AGHT+IH25D3ocvmoZ2oNWr+ADNKssF/joeCU/e6ASaSDm1S692moTdu/kNjfOxclOKCfz1fmE26MJA== X-Received: by 2002:a05:600c:35d1:b0:415:431d:7747 with SMTP id r17-20020a05600c35d100b00415431d7747mr9674678wmq.7.1711968233240; Mon, 01 Apr 2024 03:43:53 -0700 (PDT) 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 iv16-20020a05600c549000b004146a1bf590sm17468404wmb.32.2024.04.01.03.43.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 03:43:52 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 1 Apr 2024 11:43:38 +0100 Message-ID: <834964486162cfc072739dc57ad3c27bce78404a.1711915492.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-onsi-ginkgo) [arguments]: Place <#:import-path> on new line. [propagated-inputs]: Sort inputs alphabetically. Change-Id: I70b7f1838c8d8fc6744ad724ed4b79fdd645f6c4 --- gnu/packages/golang-check.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 6f36615ab0..8ea0c45ff8 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -441,17 +441,17 @@ (define-public go-github-com-onsi-ginkgo (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1hh6n7q92y0ai8k6rj2yzw6wwxikhyiyk4j92zgvf1zad0gmqqmz")))) + (base32 "1hh6n7q92y0ai8k6rj2yzw6wwxikhyiyk4j92zgvf1zad0gmqqmz")))) (build-system go-build-system) (arguments - (list #:import-path "github.com/onsi/ginkgo")) + (list + #:import-path "github.com/onsi/ginkgo")) (propagated-inputs - (list go-golang-org-x-sys - go-golang-org-x-tools - go-github-com-go-task-slim-sprig + (list go-github-com-go-task-slim-sprig go-github-com-nxadm-tail - go-github-com-onsi-gomega)) + go-github-com-onsi-gomega + go-golang-org-x-sys + go-golang-org-x-tools)) (home-page "https://github.com/onsi/ginkgo") (synopsis "BDD-style testing framework for Go") (description From patchwork Mon Apr 1 10:43:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62430 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 ED00327BBE2; Mon, 1 Apr 2024 11:44:59 +0100 (BST) 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, 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 4FCD127BBEE for ; Mon, 1 Apr 2024 11:44:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrF94-0006tD-Cz; Mon, 01 Apr 2024 06:44:06 -0400 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 1rrF93-0006si-JB for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:05 -0400 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 1rrF93-0002PG-As for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrF96-0005uA-A8 for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70123] [PATCH 09/12] gnu: go-github-com-onsi-gomega: Move to golang-check. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 10:44:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70123@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 70123-submit@debbugs.gnu.org id=B70123.171196824722679 (code B ref 70123); Mon, 01 Apr 2024 10:44:08 +0000 Received: (at 70123) by debbugs.gnu.org; 1 Apr 2024 10:44:07 +0000 Received: from localhost ([127.0.0.1]:49677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF94-0005tY-Tk for submit@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:07 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:58598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF90-0005qZ-Rn for 70123@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:04 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4156abbcc02so2163165e9.0 for <70123@debbugs.gnu.org>; Mon, 01 Apr 2024 03:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711968234; x=1712573034; 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=tVIL2Y8JA3hFrkzCNxHYukZiDx1kwVFUbcv5J50Sa28=; b=GM5lx1woocY4W16CAhtBuq2qovG7m0Ff5zxlQBRcK91vuIGHv4p6wsaUfj6UTZwKaT eaQSno6nxaf25izYTbvEy5KtYn7sZB1T8ywZC4H1AQEQtaVd4W9kO0SzXIwnxBHQ3zoo XzTH4yAZxyvvRlF7AjRDfAxbC41IjjN2W7+LfjpegtXYuP7JuIH7XOV2AWilGV9zs+g5 TMEJds9p6/KBzNtSkiKU8WrNVlUOAjU8DL69DI4q1OmkM49ImCE4uN1RdQFsl/sp9EK9 Kx7TmKDwbci9WGdGZCZmwOD+8TS4BuaIKEyRLW2ITF9+exNTvkY0u5vRzoXV2S2oa5gt L3hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711968234; x=1712573034; 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=tVIL2Y8JA3hFrkzCNxHYukZiDx1kwVFUbcv5J50Sa28=; b=Ui+xWZ+FKG4w0J0lenIofcpw9RmmHS3cba/MGaa4tvt6/HbX2e5yKII6jbtm4PPnYd C5eATj5inExZ16xFzC0dghLqVhDY/dmU8dqbVVm60IHesfoemFCmiQNfMw/K5Mxcq0i/ gqjydDQSRSUKXCUY+jkJabm835FFj+T6l4Ibu8hFiIKxM+UMBEunk1cLWpfpwcvu0Bb1 Hfx0Q1o7Vx8hcCgJy+euX6nxRbXQeFfBaDG9w2axiCBxhRJ9ViJblgNmRn0X/qfF/8hL EpWTn8n5xTyn0NN5LwmxmgHsL/IEv2mQjspbPnzRZVAf1JDG7VKg/l44a6TpT3fKb4Ga pdNg== X-Gm-Message-State: AOJu0Yx9jREOgxbOcd3XSYBIGFLRbKKJjZ643srssarcom4lpf0ogHrq upGxyBbJPqDTJbkPIE+oFBdABt2YbSzzSWG210MORAnUzlQ9trANB9QI1ql5DVs= X-Google-Smtp-Source: AGHT+IG9k/09U75YXBlYCkvZKudDy0BWgcYhNf/2esniVUQVxco/IERmEoHUY5BB5tq68JcDvs+Z7A== X-Received: by 2002:a7b:cbd4:0:b0:415:611c:cb31 with SMTP id n20-20020a7bcbd4000000b00415611ccb31mr2560144wmi.11.1711968233975; Mon, 01 Apr 2024 03:43:53 -0700 (PDT) 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 iv16-20020a05600c549000b004146a1bf590sm17468404wmb.32.2024.04.01.03.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 03:43:53 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 1 Apr 2024 11:43:39 +0100 Message-ID: <397b362c1c189c1f85d861b74818c26b985723b4.1711915492.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-onsi-gomega): Move from here ... * gnu/packages/golang-check.scm: ... to here. Change-Id: Ia9a7d0e88ebda2fcfb3fe623163e270756900e94 --- gnu/packages/golang-check.scm | 33 +++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 31 ------------------------------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 8ea0c45ff8..dd91bf23bc 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -487,6 +487,39 @@ (define-public go-github-com-onsi-ginkgo-v2 go-golang-org-x-sys go-golang-org-x-tools)))) +(define-public go-github-com-onsi-gomega + (package + (name "go-github-com-onsi-gomega") + (version "1.19.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/onsi/gomega") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "092phwk97sk4sv0nbx5pfhqs6x3x1lnrjwyda1m6b6zwrfmq5c6i")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/onsi/gomega" + ;; Unless we disable the tests, we have a circular dependency on + ;; ginkgo/v2. + #:tests? #f)) + (propagated-inputs + (list go-github-com-golang-protobuf-proto + go-golang-org-x-net + go-golang-org-x-sys + go-golang-org-x-text + go-google-golang-org-protobuf + go-gopkg-in-yaml-v2)) + (home-page "https://github.com/onsi/gomega") + (synopsis "Matcher library for Ginkgo") + (description + "Gomega is the preferred matcher/assertion library for the Ginkgo test +framework.") + (license license:expat))) + (define-public go-github-com-prashantv-gostub (package (name "go-github-com-prashantv-gostub") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 711c007138..3c3d9c7222 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10271,37 +10271,6 @@ (define-public go-github-com-lithammer-fuzzysearch library bevacqua/fuzzysearch.") (license license:expat))) -(define-public go-github-com-onsi-gomega - (package - (name "go-github-com-onsi-gomega") - (version "1.19.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/onsi/gomega") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "092phwk97sk4sv0nbx5pfhqs6x3x1lnrjwyda1m6b6zwrfmq5c6i")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/onsi/gomega" - ;; Unless we disable the tests, we have a circular dependency on - ;; ginkgo/v2. - #:tests? #f)) - (propagated-inputs (list go-github-com-golang-protobuf-proto - go-golang-org-x-net - go-golang-org-x-sys - go-golang-org-x-text - go-google-golang-org-protobuf - go-gopkg-in-yaml-v2)) - (home-page "https://github.com/onsi/gomega") - (synopsis "Matcher library for Ginkgo") - (description - "Gomega is the preferred matcher library for the Ginkgo test framework.") - (license license:expat))) - ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar From patchwork Mon Apr 1 10:43:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62421 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 DBAC427BBED; Mon, 1 Apr 2024 11:44:26 +0100 (BST) 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, 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 F1B2527BBEC for ; Mon, 1 Apr 2024 11:44:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrF95-0006tg-M3; Mon, 01 Apr 2024 06:44:07 -0400 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 1rrF94-0006tE-GV for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:06 -0400 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 1rrF94-0002PS-8G for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrF97-0005uQ-8V for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70123] [PATCH 10/12] gnu: go-github.com-jessevdk-go-flags: Adjust variable name. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 10:44:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70123@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 70123-submit@debbugs.gnu.org id=B70123.171196824722695 (code B ref 70123); Mon, 01 Apr 2024 10:44:09 +0000 Received: (at 70123) by debbugs.gnu.org; 1 Apr 2024 10:44:07 +0000 Received: from localhost ([127.0.0.1]:49680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF95-0005tp-En for submit@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:07 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:53306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF91-0005qg-IZ for 70123@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:04 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-341cf77b86dso3827570f8f.2 for <70123@debbugs.gnu.org>; Mon, 01 Apr 2024 03:44:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711968235; x=1712573035; 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=fSxhuSXbObhg4aObmSUZazkBpdU93RZosJVkAf8lYB0=; b=C9NJ6noPrLfoD+XdWmkWcDqflmcfzyMgXs1HiLZYUXxBxfKXu2t7KxLRtSQJnLo1uT KuBN85HgbS/3a7T21teLA9/Q6fG478/EvXDaGAzdS43NS6Czfeslhz9EbIBamvNlIPou CihZM54ChFmdyypj+0a1m1t1P+N9P7373gArwOTkG+2NUrTW3vb/90+xuW5UByarzX7O lzBPllxv7ge19J4pewd/od1m2IZi8CK1olD/3vfXyaDc35ovNySrDL8nqjZgJwI/MQ9e gzuZQ+aRqnqcWDJ1ZjYDT9fwqelzZNfB0Xoon3oxdP0NhRzQepNIUFQs3rICP++QJDVM ELeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711968235; x=1712573035; 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=fSxhuSXbObhg4aObmSUZazkBpdU93RZosJVkAf8lYB0=; b=j+KeKeU94QCJcpg9iu9vn381xFiB7f49lrm2kl3nutcG3iKLWLXFWogFx1j9YWpThq PDnXiEWA01EkHxAtiGX7sIl3ibr9wFzNTGlZgeI9T9udMNqKNY/1kK+PPVud8XOfzdWx JZjQkcUjP8DJZQ1TE8IVGDUjuSSQMyPTJksFdY335LP13EDk8PH1j7umIfNnYZ6iHEt6 ZOLn+KTZsessNgl539GxlrLoF1bcfUAT+JyLsKvvhwyKlfIVvN7E0Qtca8dbs+weBoIk LbfekQ8AyZceiLBfZO/YCWMqahjqlVaEwCA+MHaEYGa7M4ZJzUrMBLNiWYZ7pofTOLYn rQyQ== X-Gm-Message-State: AOJu0YwFCV1Y1CRO9ZSQm38gB4yihbJydB2fE/BbNLOZUeR8PpoiCIqp H8qaP0eEEz8zHRqU8jou3Pk9LiiL2a6tTvWjkYIn9eXBzlCtwpl4GraOaEH03NI= X-Google-Smtp-Source: AGHT+IGOgsGMheSWtLqCzZPxoc6T8trJ+CS5fo9poM1o5reF6Ovwm8nJAaO3SuS68YPAwlRA4/J63g== X-Received: by 2002:a05:6000:228:b0:33e:cf33:65bf with SMTP id l8-20020a056000022800b0033ecf3365bfmr7258399wrz.35.1711968234699; Mon, 01 Apr 2024 03:43:54 -0700 (PDT) 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 iv16-20020a05600c549000b004146a1bf590sm17468404wmb.32.2024.04.01.03.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 03:43:54 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 1 Apr 2024 11:43:40 +0100 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-jessevdk-go-flags): Rename to go-github-com-jessevdk-go-flags to follow go import naming convention. * gnu/packages/golang.scm (go-github-com-dhowett-go-plist) [inputs]: Remove go-github.com-jessevdk-go-flags, add go-github-com-jessevdk-go-flags. Change-Id: I6fc977b11e5044b8e6cab2baa4c107967baedb59 --- gnu/packages/golang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3c3d9c7222..0f36c6b696 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1881,7 +1881,7 @@ (define-public go-github-com-dhowett-go-plist (build-system go-build-system) (arguments `(#:import-path "howett.net/plist")) (inputs - (list go-github.com-jessevdk-go-flags go-github-com-kr-pretty + (list go-github-com-jessevdk-go-flags go-github-com-kr-pretty go-gopkg-in-check-v1 go-gopkg-in-yaml-v2)) (home-page "https://github.com/DHowett/go-plist") (synopsis "Apple property list transcoder") @@ -2839,9 +2839,9 @@ (define-public go-github-com-leodido-go-urn specified by @uref{https://tools.ietf.org/html/rfc2141, IETF RFC 2141}.") (license license:expat))) -(define-public go-github.com-jessevdk-go-flags +(define-public go-github-com-jessevdk-go-flags (package - (name "go-github.com-jessevdk-go-flags") + (name "go-github-com-jessevdk-go-flags") (version "1.5.0") (source (origin (method git-fetch) From patchwork Mon Apr 1 10:43:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62420 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 2F0DD27BBEE; Mon, 1 Apr 2024 11:44:24 +0100 (BST) 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, 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 538BD27BBE2 for ; Mon, 1 Apr 2024 11:44:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrF96-0006uY-Tk; Mon, 01 Apr 2024 06:44:08 -0400 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 1rrF95-0006tQ-3E for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:07 -0400 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 1rrF94-0002Pb-Ra for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrF97-0005uf-Rh for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70123] [PATCH 11/12] gnu: fiano: Refresh package style. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 10:44:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70123@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 70123-submit@debbugs.gnu.org id=B70123.171196824822713 (code B ref 70123); Mon, 01 Apr 2024 10:44:09 +0000 Received: (at 70123) by debbugs.gnu.org; 1 Apr 2024 10:44:08 +0000 Received: from localhost ([127.0.0.1]:49683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF95-0005u0-SL for submit@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:08 -0400 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]:57600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF92-0005qo-OB for 70123@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:05 -0400 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-513d4559fb4so4704730e87.3 for <70123@debbugs.gnu.org>; Mon, 01 Apr 2024 03:44:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711968236; x=1712573036; 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=ghZsEnrQQy924LP7FJprk4qtNtlRxl9WGqnU2pWvqiE=; b=eOroVX56BhyRD5SWbFGj8Qe9yKZEyx7YvxLyvP03/vY9JNi1o6OG0/BHBUimkK1USY YhZ28ltG9J4CS7hjbVuO5+MU+Ot6DhJ+SJmx1HOxKt/JcH+ltK18bbACyZ7I294LAAGe xA9JC+DnJ5bY7shugF6belYFxFcHa1V0r3e1zVGeY5Y8jLmmPsVzuB+nNO9vXt82nTsP kQXqDxEOO8yTzOV1CDZznaLtxZV5xpLdFkUh5DJbXZkwQxJ47fNnh1XsiLWpqI3sXQwq yRbPhCeHoJ3puKdy5KW1K51HVCh6c6X9BM8rxWjCw+obZOmreGPgGH3E8cDeGLhYQ7Vp ILrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711968236; x=1712573036; 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=ghZsEnrQQy924LP7FJprk4qtNtlRxl9WGqnU2pWvqiE=; b=gWH82NX6sivTUmlmE5ZSwK2J1ANMEfdjv1+yisMkBAKGWpd//PkEzDvrK0mMIK3KKO hamgs33wduPFbIdJwy2+Uw8BhtOu0bPVyvyV5dWo9CH3Jz4t5labVi39Mr9cHFxfuttI 7gdDAlW67rwyg7Z5j2QAL2aaJ36sQmjIdVfkmmppXsHNu8FA/yShHsO+ZNR8sQcf5vPr aTXu4cdRWW7vZDzbOAUya6tqr1EL2QVCuh3lG+UTt5ZJB1m2J8kTk/IVD287T1H+EC7d aC7/4TZgsEJLXkTEe82yEWwj5yAjoaygkXqQf4cCcGc8wNAbj6OOXvraCKa9hhWAx0mh fjyg== X-Gm-Message-State: AOJu0Yz+Fy4fOkMBpWyEppT9Pm8/HIdQSGgJu3Mt/8ROocTagHZ70OUT 9BP2KVKJ/PB6oyWtD6SEztLPzdrtQ2buaHotmgOc2L20iGBwHq2y+UJsB2JRydk= X-Google-Smtp-Source: AGHT+IHOJsn3y8wWN50Xv7d1xn93fGKeL+9yxp7pegbSrY6XrgatN5aQxDqXy2Cd6c4XGQPflt/tow== X-Received: by 2002:a05:6512:3f1c:b0:513:c9a6:46ce with SMTP id y28-20020a0565123f1c00b00513c9a646cemr8243368lfa.9.1711968235471; Mon, 01 Apr 2024 03:43:55 -0700 (PDT) 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 iv16-20020a05600c549000b004146a1bf590sm17468404wmb.32.2024.04.01.03.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 03:43:55 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 1 Apr 2024 11:43:41 +0100 Message-ID: <58c0c7e846eaadbb1806dc2a2443576648a4b122.1711915492.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/admin.scm (fiano): Refresh package style. [source]: Remove trailing #t from the snippet. [arguments]: Use list style. [inputs]: Remove labels and use list style. [home-page]: Place before synopsis. Change-Id: I896c59d4be14c7ed16bc1978e0d9996bd7b93c17 --- gnu/packages/admin.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2b94b1e17a..78e5e355d6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5160,7 +5160,7 @@ (define-public atop `((release-monitoring-url . "https://www.atoptool.nl/downloadatop.php"))) (license license:gpl2+))) -;; TODO: Unvendor u-root (pkg: forth, golang, testutil). +;; TODO: Pack u-root for: forth, and some tests. (define fiano (package (name "fiano") @@ -5170,28 +5170,26 @@ (define fiano (uri (git-reference (url "https://github.com/linuxboot/fiano.git") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "03ihdwwhb7g6bihx141cn0924sjs5ps6q3ps58pk1cg0g0srrr9h")) (modules '((guix build utils))) (snippet - '(begin - (delete-file-recursively "vendor/golang.org") - (delete-file-recursively "vendor/github.com") - #t)))) + #~(begin + ;; Remove all vendored sources. + (delete-file-recursively "vendor"))))) (build-system go-build-system) (arguments - `(#:import-path "github.com/linuxboot/fiano" - #:unpack-path "github.com/linuxboot/fiano")) - (native-inputs - `()) + (list + #:import-path "github.com/linuxboot/fiano" + #:unpack-path "github.com/linuxboot/fiano")) (inputs - `(("go-golang-org-x-text" ,go-golang-org-x-text) - ("go-github-com-ulikunitz-xz" ,go-github-com-ulikunitz-xz))) - (synopsis "UEFI image editor") - (description "This package provides a command-line UEFI image editor.") + (list go-golang-org-x-text go-github-com-ulikunitz-xz)) (home-page "https://github.com/linuxboot/fiano") + (synopsis "UEFI image editor") + (description + "This package provides a command-line UEFI image editor.") (license license:bsd-3))) (define-public fiano-utk From patchwork Mon Apr 1 10:43:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62423 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 86A9627BBEA; Mon, 1 Apr 2024 11:44:29 +0100 (BST) 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, 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 30C4327BBE2 for ; Mon, 1 Apr 2024 11:44:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrF97-0006uq-Bo; Mon, 01 Apr 2024 06:44:09 -0400 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 1rrF95-0006ta-Gv for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:07 -0400 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 1rrF95-0002Ph-8s for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrF98-0005un-Af for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70123] [PATCH 12/12] gnu: fiano: Update to 1.2.0. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 10:44:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70123@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 70123-submit@debbugs.gnu.org id=B70123.171196824922727 (code B ref 70123); Mon, 01 Apr 2024 10:44:10 +0000 Received: (at 70123) by debbugs.gnu.org; 1 Apr 2024 10:44:09 +0000 Received: from localhost ([127.0.0.1]:49686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF96-0005uI-HQ for submit@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:09 -0400 Received: from mail-lj1-x22c.google.com ([2a00:1450:4864:20::22c]:48198) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF93-0005r2-Es for 70123@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:06 -0400 Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2d48d75ab70so56137441fa.0 for <70123@debbugs.gnu.org>; Mon, 01 Apr 2024 03:44:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711968236; x=1712573036; 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=jBicrpfBdiKv5owMQ5u/Bucvozzqjihy/pgVQmrBx+A=; b=jQis/xXSgtQJfvVD8VY5IlFKHhhi8oknkuL7SKo+5auy0tQkZrknJe0euKPcEj+L5Q QpWdfMs9i2y12HUjW5b3A8W10ooOazPHLDaZ4MiZItiRUsgBHBFLYPkNdaLxjMWreqfL K3kRAvvcWWyb1elmW0QRXSFGAm0O+Od/aIEtRlMT3zww2T2ZJbNOOqsQHhcjT7QT/5sa 5X/3zhe1fcw146cMfi08RMYPDj5yPRYmwKZSEJ3WSGvsbTh51eXIG2DNl29qeK2Mi+Fs PyQvNQrJ2I470ZJkjt7Xyfc6MJgSc0KnjMfaPQgr1Az4LS5BiUgQinu8hb8TJ1+jK5ry Humg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711968236; x=1712573036; 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=jBicrpfBdiKv5owMQ5u/Bucvozzqjihy/pgVQmrBx+A=; b=iu9p4cQHPFrczknNGfb+Sn0bzDtgx9b/3xcSIoH275kBRg/gkjRVoBuDwI2iQIRf73 8kZKDOqpR7hJztZ9EX1joCHEVjyXZPnEbi4jeL2F03Wa3og6qasYoFJpPK4Z6w9Vyjko /RgxrD8kxBhDXPdaP3WKUN+Y+5j5VpPF/XeIg9gzbPH5yjG2yDxgSEETRMxU1iRmB1BL nOIgmeIzJ0Pw+1g+zKyS/DxDwgj1NUL9z4LvF0TogD/RddUHwOhusWHLeqJKFQZGQemA 6ybFX62gkMaxbqOP/Ve4CqILHnD7jue6bcBTBc6QQn6wl7YYBfciZl2MJ+XCy6wdjXhO yRzQ== X-Gm-Message-State: AOJu0YzrRmX5mfgWGuIxrcVmdNfjEDOBafGzyf9WUGCR+dYTPe3yWhll IvGRsySfH8orwzvB5QBKn3+5+9DfYn03twBQP0GSBl8qVMxYbjj+O8ZCYdTHwHc= X-Google-Smtp-Source: AGHT+IFPCYo1ay4lKLq1ZVD/DAiICouuwIhHFa14s80FfdN4S7M8JzI5R+CYneF/wdpLvL3oSWFrDQ== X-Received: by 2002:a2e:9d9a:0:b0:2d6:f545:5e13 with SMTP id c26-20020a2e9d9a000000b002d6f5455e13mr5561468ljj.46.1711968236247; Mon, 01 Apr 2024 03:43:56 -0700 (PDT) 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 iv16-20020a05600c549000b004146a1bf590sm17468404wmb.32.2024.04.01.03.43.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 03:43:55 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 1 Apr 2024 11:43:42 +0100 Message-ID: <900f5467d3196f4baed9c7938904748e4ececf95.1711915492.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 version style has been changed from v7.0.2 starting v1.0.3. This change may cause guix refresh to detect incorrect latest version, see . This changes consolidate building all commands directly from the fiano package. * gnu/packages/admin.scm (fiano): Make variable public, update to 1.2.0. [source]: Remove snippet, there is no longer 'vendor' directory in a new release. [arguments] <#:phases>: Add custom 'build, 'check and 'install phases to cover complex package structure and produce all provided commands. [inputs]: Add go-github-com-dustin-go-humanize, go-github-com-hashicorp-errwrap, go-github-com-hashicorp-go-multierror, go-github-com-jessevdk-go-flags, go-github-com-pierrec-lz4, and go-github-com-spf13-pflag. [description]: Highlight which commands are included in the package. * gnu/packages/admin.scm (fiano-utk, fiano-fmap): Delete variables. Change-Id: I4b7573e20953ba52c9736e7f64c6b6347221fc72 --- gnu/packages/admin.scm | 126 +++++++++++++++++++++++++++++++---------- 1 file changed, 97 insertions(+), 29 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 78e5e355d6..e5a4895dc9 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -135,6 +135,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-compression) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages groff) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) @@ -5161,10 +5162,12 @@ (define-public atop (license license:gpl2+))) ;; TODO: Pack u-root for: forth, and some tests. -(define fiano - (package - (name "fiano") - (version "5.0.0") +(define-public fiano + (package + (name "fiano") + ;; The versioning count has been changed since commit <2021-12-01> + ;; 1eb599564549691603589219c2be34f966a32ff1. + (version "1.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -5173,41 +5176,106 @@ (define fiano (file-name (git-file-name name version)) (sha256 (base32 - "03ihdwwhb7g6bihx141cn0924sjs5ps6q3ps58pk1cg0g0srrr9h")) - (modules '((guix build utils))) - (snippet - #~(begin - ;; Remove all vendored sources. - (delete-file-recursively "vendor"))))) + "0s5fx4lhgb68qbx4ql34rcm678qdf0c4xl97bgc8dx9xwwqifza1")))) (build-system go-build-system) (arguments (list + #:install-source? #f #:import-path "github.com/linuxboot/fiano" - #:unpack-path "github.com/linuxboot/fiano")) + #:unpack-path "github.com/linuxboot/fiano" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Replace this part when it's implemented in go-build-system. + (replace 'build + (lambda* (#:key import-path #:allow-other-keys) + (for-each + (lambda (cmd) + (invoke "go" "build" "-v" "-x" "-ldflags=-s -w" "-trimpath" + (string-append import-path "/cmds/" cmd))) + (list "cbfs" + "create-ffs" + ;; TODO: Not packed yet in guix, long jorney: + ;; - github.com/tjfoc/gmsm + ;; + ;; "fittool" + "fmap" + "fspinfo" + "glzma" + "guid2english" + "microcode" + "utk")))) + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (for-each + (lambda (dir) + (invoke "go" "test" "-v" + (string-append import-path dir "/..."))) + (list "/pkg/bytes" + ;; TODO: Not packed yet in Guix, long jorney: + ;; - github.com/jedib0t + ;; + ;; "/pkg/amd" + "/pkg/cbfs" + "/pkg/compression" + "/pkg/fmap" + "/pkg/fsp" + "/pkg/guid" + "/pkg/guid2english" + ;; TODO: Not packed yet in Guix, long jorney: + ;; - github.com/tjfoc/gmsm + ;; + ;; "/pkg/intel" + "/pkg/knownguids" + "/pkg/log" + "/pkg/uefi" + "/pkg/unicode" + "/pkg/utk" + "/pkg/visitors" + "/cmds/cbfs" + "/cmds/create-ffs" + ;; TODO: Not packed yet in Guix, long jorney: + ;; - github.com/u-root/u-root + ;; + ;; "/cmds/fmap" + ;; "/cmds/fittool" + "/cmds/fspinfo" + "/cmds/glzma" + "/cmds/guid2english" + "/cmds/microcode" + "/cmds/utk"))))) + (replace 'install + (lambda _ + (let ((bindir (string-append #$output "/bin"))) + (for-each + (lambda (cmd) + (install-file cmd bindir)) + (list "cbfs" + "create-ffs" + ;; "fittool" + "fmap" + "fspinfo" + "glzma" + "guid2english" + "microcode" + "utk")))))))) (inputs - (list go-golang-org-x-text go-github-com-ulikunitz-xz)) + (list go-github-com-dustin-go-humanize + go-github-com-hashicorp-errwrap + go-github-com-hashicorp-go-multierror + go-github-com-jessevdk-go-flags + go-github-com-pierrec-lz4 + go-github-com-spf13-pflag + go-github-com-ulikunitz-xz + go-golang-org-x-text)) (home-page "https://github.com/linuxboot/fiano") (synopsis "UEFI image editor") (description - "This package provides a command-line UEFI image editor.") + "This package provides a command-line UEFI image editor, including cbfs, +create-ffs, fmap, fspinfo, glzma, guid2english, microcode and utk CLI +utilities.") (license license:bsd-3))) -(define-public fiano-utk - (package - (inherit fiano) - (name "fiano-utk") - (arguments - `(#:import-path "github.com/linuxboot/fiano/cmds/utk" - #:unpack-path "github.com/linuxboot/fiano")))) - -(define-public fiano-fmap - (package - (inherit fiano) - (name "fiano-fmap") - (arguments - `(#:import-path "github.com/linuxboot/fiano/cmds/fmap" - #:unpack-path "github.com/linuxboot/fiano")))) - (define-public novena-eeprom (package (name "novena-eeprom")