From patchwork Mon Sep 26 16:55:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 42982 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 EDF8B27BBEA; Mon, 26 Sep 2022 18:45:06 +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_INVALID, DKIM_SIGNED,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 4194D27BBE9 for ; Mon, 26 Sep 2022 18:45:06 +0100 (BST) Received: from localhost ([::1]:55252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocsAC-0004dU-VR for patchwork@mira.cbaines.net; Mon, 26 Sep 2022 13:45:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocrPl-0003YX-LV for guix-patches@gnu.org; Mon, 26 Sep 2022 12:57:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52530) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocrPl-0003Dg-Ef for guix-patches@gnu.org; Mon, 26 Sep 2022 12:57:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ocrPl-0001S3-A9 for guix-patches@gnu.org; Mon, 26 Sep 2022 12:57:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55903] [PATCH v11 09/41] gnu: go-golang-org-colorful: Rename to go-github-com-lucasb-eyer-go-colorful. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Sep 2022 16:57:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55903 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55903@debbugs.gnu.org Cc: "\(unmatched-parenthesis" Received: via spool by 55903-submit@debbugs.gnu.org id=B55903.16642113935274 (code B ref 55903); Mon, 26 Sep 2022 16:57:05 +0000 Received: (at 55903) by debbugs.gnu.org; 26 Sep 2022 16:56:33 +0000 Received: from localhost ([127.0.0.1]:51549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocrPE-0001Mi-Kb for submit@debbugs.gnu.org; Mon, 26 Sep 2022 12:56:33 -0400 Received: from knopi.disroot.org ([178.21.23.139]:42310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocrP0-0001KQ-6k for 55903@debbugs.gnu.org; Mon, 26 Sep 2022 12:56:18 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 892844C2B1; Mon, 26 Sep 2022 18:56:17 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with UTF8SMTP id cMZ4NK7EXGYf; Mon, 26 Sep 2022 18:56:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664211364; bh=CXSZSGv1SUlGTohV1R+SD8b/G4W8x7ULbqXhRtTnmHM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lIFWyd6FWG9XsSWhPK6miD9Xf9B5ZYUgl0hxIibBhfUbAJtj+4oxLDGKVif/Oyl/r 7zeCyzt0oul5bt2+VgZWMGaX5vqbxWwpNVzABSKHTxzSVyi4zn5fCwEYopK3PBl57X w5X6RSEtJFS/sTk/Sk53FsqYOfI5mmrk3f/tnsm8qGKpbwqbWkHSVyI15S4ktSQ8dm O+MFpj5Ue7z8hr9uJLacQTrpV7w3SO7en37Qj3O8o+uNjstPkHeKkZ5iLHHi/M86Pv L4ecAynHgyXmgEpsZOs1scld3VIeD3omPLUixgTUlwInz+H02plp6pSRspE0XVP3aK AmLzStcmRF1ag== Date: Mon, 26 Sep 2022 17:55:20 +0100 Message-Id: <20220926165552.27970-9-paren@disroot.org> In-Reply-To: <20220926165552.27970-1-paren@disroot.org> References: <20220926165552.27970-1-paren@disroot.org> 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" Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" X-getmail-retrieved-from-mailbox: Patches From: "(unmatched-parenthesis" * gnu/packages/golang.scm (go-golang-org-colorful): Rename to... (go-github-com-lucasb-eyer-go-colorful): ...this. --- gnu/packages/configuration-management.scm | 2 +- gnu/packages/golang.scm | 34 +++++++++++++---------- gnu/packages/image-viewers.scm | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index c64b937fe5..3ebb6957c8 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -76,7 +76,7 @@ (define-public chezmoi go-github-com-muesli-reflow-padding go-github-com-muesli-termenv go-github-com-google-goterm - go-golang-org-colorful + go-github-com-lucasb-eyer-go-colorful go-github-com-mattn-go-isatty go-github.com-mattn-go-runewidth go-github-com-olekukonko-tablewriter diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 10a4de82f3..1c4e983374 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5770,9 +5770,9 @@ (define-public go-github-com-go-sql-driver-mysql golang's database/sql package.") (license license:mpl2.0))) -(define-public go-golang-org-colorful +(define-public go-github-com-lucasb-eyer-go-colorful (package - (name "go-golang-org-colorful") + (name "go-github-com-lucasb-eyer-go-colorful") (version "1.2.0") (source (origin (method git-fetch) @@ -5784,15 +5784,15 @@ (define-public go-golang-org-colorful (base32 "08c3fkf27r16izjjd4w94xd1z7w1r4mdalbl53ms2ka2j465s3qs")))) (build-system go-build-system) + (propagated-inputs (list go-golang-org-x-image)) (arguments - '(#:import-path "github.com/lucasb-eyer/go-colorful")) - (native-inputs - (list go-golang-org-sql-mock)) - (synopsis "Convert between colorspaces and generate colors") - (description "This package implements Go's @code{color.Color} interface -and provides a means of converting colors stored as RGB to various -colorspaces.") + (list #:import-path "github.com/lucasb-eyer/go-colorful")) (home-page "https://github.com/lucasb-eyer/go-colorful") + (synopsis "Library for playing with colors in Go") + (description + "The colorful package provides a library for using colors in Go. +It stores colors in RGB and provides methods for converting these to +various color spaces.") (license license:expat))) (define-public go-github-com-gdamore-encoding @@ -5842,8 +5842,10 @@ (define-public go-github-com-gdamore-tcell (arguments `(#:import-path "github.com/gdamore/tcell")) (inputs - (list go-github.com-mattn-go-runewidth go-golang-org-colorful - go-golang-org-x-text go-github-com-gdamore-encoding)) + (list go-github.com-mattn-go-runewidth + go-github-com-lucasb-eyer-go-colorful + go-golang-org-x-text + go-github-com-gdamore-encoding)) (home-page "https://github.com/gdamore/tcell") (synopsis "Provide a cell-based view for text terminals") (description "This package includes a full parser and expander for @@ -7569,8 +7571,10 @@ (define-public go-github-com-muesli-termenv (arguments `(#:import-path "github.com/muesli/termenv")) (native-inputs - (list go-github-com-google-goterm go-golang-org-colorful - go-github-com-mattn-go-isatty go-github.com-mattn-go-runewidth)) + (list go-github-com-google-goterm + go-github-com-lucasb-eyer-go-colorful + go-github-com-mattn-go-isatty + go-github.com-mattn-go-runewidth)) (home-page "https://github.com/muesli/termenv/") (synopsis "Advanced styling options on the terminal") (description "termenv lets you safely use advanced styling options on the @@ -7699,7 +7703,7 @@ (define-public go-github-com-charmbracelet-glamour go-github.com-mattn-go-runewidth go-github-com-muesli-termenv go-github-com-google-goterm - go-golang-org-colorful + go-github-com-lucasb-eyer-go-colorful go-github-com-mattn-go-isatty go-github-com-olekukonko-tablewriter go-github-com-yuin-goldmark @@ -9449,7 +9453,7 @@ (define-public go-github-com-charmbracelet-bubbletea ("github.com/mattn/go-runewidth" ,go-github.com-mattn-go-runewidth) ("go-github-com-muesli-reflow-indent" ,go-github-com-muesli-reflow-indent) ("go-github-com-muesli-reflow-ansi" ,go-github-com-muesli-reflow-ansi) - ("go-golang-org-colorful" ,go-golang-org-colorful) + ("go-github-com-lucasb-eyer-go-colorful" ,go-github-com-lucasb-eyer-go-colorful) ("github.com/containerd/console" ,go-github-com-containerd-console) ("go-github-com-muesli-reflow-truncate" ,go-github-com-muesli-reflow-truncate) ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 77979e8b8f..037c141065 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -532,7 +532,7 @@ (define-public pixterm '(#:import-path "github.com/eliukblau/pixterm/cmd/pixterm" #:unpack-path "github.com/eliukblau/pixterm")) (inputs (list go-github-com-disintegration-imaging - go-golang-org-colorful + go-github-com-lucasb-eyer-go-colorful go-golang-org-x-crypto go-golang-org-x-image)) (home-page "https://github.com/eliukblau/pixterm")