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")