From patchwork Sat Aug 5 07:00:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fries X-Patchwork-Id: 52513 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 6FA1B27BBE2; Sat, 5 Aug 2023 09:54:27 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, 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 0FC1427BBE9 for ; Sat, 5 Aug 2023 09:54:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSD27-0003Mz-Hp; Sat, 05 Aug 2023 04:53:11 -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 1qSD24-0003Lu-Vs for guix-patches@gnu.org; Sat, 05 Aug 2023 04:53:09 -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 1qSD24-0007IK-Nr for guix-patches@gnu.org; Sat, 05 Aug 2023 04:53:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSD24-0007LG-Ix for guix-patches@gnu.org; Sat, 05 Aug 2023 04:53:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65075] [PATCH 01/13] gnu: Add go-github-com-chyzer-logex Resent-From: Fries Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Aug 2023 08:53:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65075 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65075@debbugs.gnu.org Cc: Fries X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169122557328018 (code B ref -1); Sat, 05 Aug 2023 08:53:08 +0000 Received: (at submit) by debbugs.gnu.org; 5 Aug 2023 08:52:53 +0000 Received: from localhost ([127.0.0.1]:55468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSD1o-0007Hl-RO for submit@debbugs.gnu.org; Sat, 05 Aug 2023 04:52:53 -0400 Received: from lists.gnu.org ([2001:470:142::17]:59418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSBHB-0001r5-Lg for submit@debbugs.gnu.org; Sat, 05 Aug 2023 03:00:38 -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 1qSBH5-0006Wl-S8 for guix-patches@gnu.org; Sat, 05 Aug 2023 03:00:31 -0400 Received: from mail-4324.protonmail.ch ([185.70.43.24]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qSBH3-0004sF-Tp for guix-patches@gnu.org; Sat, 05 Aug 2023 03:00:31 -0400 Date: Sat, 05 Aug 2023 07:00:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1691218827; x=1691478027; bh=/2I7OEMM2OaeqJgRP99/a4FTlXcb/r4C4qGCuI7PyOQ=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=MPLBdW0i2GWeM0QK89mk4jOcw5EGI5KHpEKXIlZfqxEvgF3Sbnpe/mMMTXHuwbDd6 hMBg2pjMKmJ7XLjOlKwHaaN6/rIQWUtp/e3KWa3tsVDhVH1L+e2JifWFNfXQNmMks9 VVmcpjUe59d2rS0TT49Eo16SCP8DFzHBnk1PKx8x+mehONJQDtwU69iZlVT29vfokU tmKKjifaRkuRIq3cjFPbRZqlppWUIs4dYml91Ymz54jHFbhP+kbKXYYiZE/3q54SdJ 7a4WtxQU2WmellSaV8Y1vLpt4mID3f7x0m5RBd9qE57q0CDFkU81rrC04mtgx5cklL 5kNu9lc+DcOZA== Message-ID: <2d85819290ef06485588ac5f4ba8a79c69d5e196.1691218710.git.fries1234@protonmail.com> In-Reply-To: References: Feedback-ID: 42759890:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.24; envelope-from=fries1234@protonmail.com; helo=mail-4324.protonmail.ch X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 05 Aug 2023 04:52:39 -0400 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: , Reply-to: Fries X-ACL-Warn: , Fries via Guix-patches X-Patchwork-Original-From: Fries via Guix-patches via From: Fries 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-chyzer-logex): New variable. * gnu/packages/patches/go-github-com-chyzer-logex-fix-tests.patch: New file. --- gnu/packages/golang.scm | 28 +++++++++++++++++++ ...go-github-com-chzyer-logex-fix-tests.patch | 28 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 gnu/packages/patches/go-github-com-chzyer-logex-fix-tests.patch diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ea6aadbe80..d99f76dc7d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2022 Christopher Howard ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Timo Wilken +;;; Copyright © 2023 Fries ;;; ;;; This file is part of GNU Guix. ;;; @@ -2112,6 +2113,33 @@ (define-public go-github-com-dhowett-go-plist types.") (license license:giftware)))) +(define-public go-github-com-chzyer-logex + (package + (name "go-github-com-chzyer-logex") + (version "1.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chzyer/logex") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0c9yr3r7dl3lcs22cvmh9iknihi9568wzmdywmc2irkjdrn8bpxw")) + (patches (search-patches + "go-github-com-chzyer-logex-fix-tests.patch")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/chzyer/logex" + #:phases (modify-phases %standard-phases + ;; Tests are completely broken on this package. + (delete 'check)))) + (home-page "https://github.com/chzyer/logex") + (synopsis "Golang log library") + (description "A Golang log library that supports tracing and log levels +that works by wrapping the standard log library.") + (license license:expat))) + (define-public go-github-com-blanu-dust (package (name "go-github-com-blanu-dust") diff --git a/gnu/packages/patches/go-github-com-chzyer-logex-fix-tests.patch b/gnu/packages/patches/go-github-com-chzyer-logex-fix-tests.patch new file mode 100644 index 0000000000..2a9b7a228b --- /dev/null +++ b/gnu/packages/patches/go-github-com-chzyer-logex-fix-tests.patch @@ -0,0 +1,28 @@ +From bb4921ff5ab77a047ae46d3da0f35abbe3f01f41 Mon Sep 17 00:00:00 2001 +From: Fries +Date: Fri, 4 Aug 2023 20:06:20 -0700 +Subject: [PATCH] fix logex tests + +--- + logex_test.go | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/logex_test.go b/logex_test.go +index e6027f2..4c07d45 100644 +--- a/logex_test.go ++++ b/logex_test.go +@@ -46,9 +46,9 @@ func TestLogex(t *testing.T) { + + except := []string{ + ".test:logex_test.go:19]aa", +- ".test:logex_test.go:20][INFO] b", ++ ".TestLogex:logex_test.go:42][INFO] b", + ".test:logex_test.go:21][INFO] c", +- ".test:logex_test.go:22][ERROR] ec", ++ ".TestLogex:logex_test.go:42][ERROR] ec", + ".(*S).hello:logex_test.go:11][WARN] warn in hello", + } + +-- +2.41.0 +